Commit Graph

227 Commits

Author SHA1 Message Date
Adrian Danis
b001bc4489 Merge branch 'master' into 'arm_hyp'
Conflicts:
	Kconfig
	libsel4/tools/syscall_stub_gen.py
	src/plat/exynos5/machine/hardware.c
	src/plat/tk1/machine/Makefile
	src/plat/tk1/machine/hardware.c
2016-06-02 10:57:12 +10:00
Hesham Almatary
46698d5383 Merge pull request #192 in SEL4/sel4 from ~HALMATARY/sel4:feature/syscall_bench2 to master
* commit 'bcf0a235b114fe8c24c3a187f55c67c373f259d3':
  SELFOUR-446 Unify code base for trace points and track feature
  SELFOUR-446 Benchmark: Track interrupts and user/vm faults
  Fix: move seL4_LogBufferSize to the correct file
  SELFOUR-446 Benchmark: Track syscall feature
2016-06-02 00:53:20 +00:00
Hesham Almatary
bcf0a235b1 SELFOUR-446 Unify code base for trace points and track feature 2016-06-02 10:49:25 +10:00
Hesham Almatary
7cbaeb8ed0 SELFOUR-446 Benchmark: Track interrupts and user/vm faults 2016-05-31 08:54:57 +10:00
Yanyan Shen
4b357744e0 Merge pull request #199 in SEL4/sel4 from ~YSHEN/sel4k:feature/arm_hyp_tk1 to arm_hyp
* commit 'eee71654b2c7e13ff282109845073794b337b060':
  arm-hyp/tk1: add ARM_HYP as a dependency
  arm-hyp/tk1: remove unnecessary check
  arm-hyp/tk1: make style
  arm-hyp/tk1: address review comments.
  arm-hyp/tk1: address review comments.
  arm-hyp/tk1: should trap SMC from guest kernel
  arm-hyp/tk1: remove const number
  arm-hyp/tk1: make style
  arm-hyp/tk1: add default SMMU translation for VM
  arm-hyp/tk1: enable SMMU interrupts
  arm-hyp/tk1: reserve the SMMU interrupt
  arm-hyp/tk1: fix bugs found during testing
  arm-hyp/tk1: add the missing return
  arm-hyp/tk1: put iospace caps to bootinfo
  arm-hyp/tk1: disable/enable SMMU in secure mode
  arm/tk1: connect objects with SMMU invocations
  arm/tk1: a checkpoint for iospace.c
  arm/tk1: a checkpoint for SMMU implementation
2016-05-27 06:16:04 +00:00
Hesham Almatary
9ec83284c4 Fix: move seL4_LogBufferSize to the correct file 2016-05-25 13:48:43 +10:00
Hesham Almatary
fc1feb670e SELFOUR-446 Benchmark: Track syscall feature
Benchmark feature that currently:
- Keeps track of system calls info
- Start time
- Duration
- Capability type
- Invocation tag
- Log the number of invocations of each system call*
- Log the number of invocations for each capability type per syscall.
- Has 3 new syscalls (dump, reset, get size).
- This new feature uses the existing log buffer (which is 1MiB for x86
and ARM). Since the number of syscall invocations is not
deterministic, the logged number of invocations is limited by the size
of the buffer. I suggested to enable the users to pass their own
user-level buffer, to enable more flexibility, later.
- ENABLE_BENCHMARKS is now a parent config option of trace points and
system call track features, they can't be used at the same time.
2016-05-25 13:47:49 +10:00
Adrian Danis
56f7b3fc8d libsel4: arm: Reintroduce -O0 warning 2016-05-25 10:37:27 +10:00
Yanyan Shen
11720f23ad arm-hyp/tk1: fix bugs found during testing 2016-05-20 00:00:46 +10:00
Adrian Danis
1287590e97 Correct separation of printing and debug builds
Fixes some build issues with 541289a326
as well as further allowing debugging (via the capdl interface) to
happen when printing is turned off.
2016-05-17 15:10:08 +10:00
Hesham Almatary
e7c6140cf0 Benchmarks: Add definition of seL4_LogBufferSize to x86
Updates SELFOUR-446
2016-04-27 12:07:46 +10:00
Adrian Danis
f2771c004c libsel4: Define SEL4_MAPPING_LOOKUP_NO_PT for ARM_HYP 2016-04-04 11:45:53 +10:00
Adrian Danis
6932e6a725 Merge branch master into arm_hyp 2016-03-22 16:48:52 +11:00
Anna Lyons
603484f958 SELFOUR-114: trivial - add missing types to x86 2016-03-03 11:30:11 +11:00
Anna Lyons
289bf92bf0 SELFOUR-114: remove bootinfo.h duplication 2016-03-01 17:25:22 +11:00
Adrian Danis
6523fe40e4 Correct previous merge 2016-02-22 16:37:34 +11:00
Adrian Danis
22623be2f8 Merge branch master into arm_hyp
Conflicts:
	include/arch/arm/arch/32/mode/object/structures.h
	libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.h
	src/arch/arm/32/model/statedata.c
2016-02-22 15:55:31 +11:00
Adrian Danis
30e5b5948d trivial: style 2016-02-10 17:02:06 +11:00
Adrian Danis
5349282478 x86/libsel4: Rename ia32->x86
Rename all functions, constants and types in libsel4 that are in the
general x86 architecture to have an X86 name instead of an IA32 name.
As libsel4 and the kernel share names this requires changing those
in the kernel as well.

All the original IA32 names can still be used for the moment, but are
marked as deprecated.
2016-02-10 16:50:49 +11:00
Adrian Danis
cfcaf49c2d SELFOUR-399: object sizes and globals frame addr should come from the same source 2016-02-10 09:13:16 +11:00
Adrian Danis
d1eb5a12ec Correct previous merge 2016-02-02 15:00:05 +11:00
Adrian Danis
95c33147c0 Merge branch master into arm_hyp
Conflicts:
	Kconfig
	include/arch/arm/arch/fastpath/fastpath.h
	include/arch/arm/arch/machine.h
	include/arch/arm/arch/machine/hardware.h
	include/arch/arm/arch/machine/registerset.h
	include/arch/arm/arch/model/statedata.h
	include/arch/arm/arch/object/structures.bf
	include/arch/arm/arch/object/structures.h
	libsel4/arch_include/arm/sel4/arch/exIPC.h
	libsel4/arch_include/arm/sel4/arch/types.h
2016-02-01 14:57:37 +11:00
Adrian Danis
be67fdb0bc libsel4: Move arm object types from aarch32/objecttype.h back to arm/objecttype.h
Moving the section and super section objects to the aarch32 mode headers caused the
object orders to be reordered, which breaks verification. This commit undoes this
until it can either be verified or refactored a different way.
2016-01-20 09:26:11 +11:00
amrzar
1a1110a094 Modify Kconfig and Makefile for aach32 as sel4_arch
libsel4: updates to include aarch32 as sel4_arch
2016-01-19 15:37:52 +11:00
Adrian Danis
380697ab5c Fixes for recent merge with master branch 2016-01-19 11:30:30 +11:00
Anna Lyons
6c6a925233 SELFOUR-406: fix message length used by seL4_Signal in libsel4 2016-01-12 10:33:16 +11:00
Adrian Danis
44a522dce2 libsel4: Generate libsel4 definitions from the current ARCH as well as the SEL4_ARCH 2016-01-08 10:16:30 +11:00