core: fix TA memory reference parameters mapping

This change fixes the TA buffer parameter mapping that gets clobbered
when a parameter of lower index relates to nonsecure memory while
a parameter o

core: fix TA memory reference parameters mapping

This change fixes the TA buffer parameter mapping that gets clobbered
when a parameter of lower index relates to nonsecure memory while
a parameter of higher index relates to a secure memory area.

Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

mm: fix the user L1 mmu entries calculation

Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Zeng Tao <prime.zeng@hisilicon.co

mm: fix the user L1 mmu entries calculation

Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Zeng Tao <prime.zeng@hisilicon.com>

show more ...

mtk: map entire MEM_AREA_NSEC_SHM area

Running MTK8173 panics in tee_entry_std just after mapping the
arguments. The reason for this is because only 1MB out of 2MB has been
mapped and therefore leav

mtk: map entire MEM_AREA_NSEC_SHM area

Running MTK8173 panics in tee_entry_std just after mapping the
arguments. The reason for this is because only 1MB out of 2MB has been
mapped and therefore leaving a gap between MEM_AREA_NSEC_SHM and
MEM_AREA_TA_RAM. I.e.,

DEBUG: [0x0] TEE-CORE:init_mem_map:398: type va 4
0xbc000000..0xbc0fffff pa 0xbdf00000..0xbdffffff size 0x100000

DEBUG: [0x0] TEE-CORE:init_mem_map:398: type va 3
0xbc200000..0xbdffffff pa 0xbe200000..0xbfffffff size 0x1e00000

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

plat-stm: introduce b2260 (96boards/cannes)

Flavored 'b2260'.
Default no GDB boot, lock pl310, specific DDR size and UART instance.

Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (b2120/

plat-stm: introduce b2260 (96boards/cannes)

Flavored 'b2260'.
Default no GDB boot, lock pl310, specific DDR size and UART instance.

Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (b2120/b2260)
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

plat-stm: fix platform

fix PL310 iomem mapped unsecure.
fix rng against nonflat mapping.

Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (stm-b2120)
Signed-off-by: Etienne Carriere <etien

plat-stm: fix platform

fix PL310 iomem mapped unsecure.
fix rng against nonflat mapping.

Tested-by: Etienne Carriere <etienne.carriere@linaro.org> (stm-b2120)
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

crypto: fix incorrect algo passed to cipher.final()

Fix an error in function tee_svc_cipher_update_helper, and add assert
in function cipher_final to prevent it being called by an algorithm
that is

crypto: fix incorrect algo passed to cipher.final()

Fix an error in function tee_svc_cipher_update_helper, and add assert
in function cipher_final to prevent it being called by an algorithm
that is not a symmetric cipher.

Signed-off-by: lackan <liang.guanchao@linaro.org>
[Reword commit subject]
Signed-off-by: Jerome Forissier <jerome.forissier@.linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: add support for paging of user TAs

Enables support for paging of user TAs if CFG_PAGED_USER_TA is y

Acked-by: David Brown <david.brown@linaro.org>
Tested-by: Jerome Forissier <jerome.forissie

core: add support for paging of user TAs

Enables support for paging of user TAs if CFG_PAGED_USER_TA is y

Acked-by: David Brown <david.brown@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU 7)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: arm: kern.ld.S: consistent 8 bytes alignment

Replace the last 4 bytes alignment statements with 8 bytes alignment to
avoid implicit padding when linking the binary.

Implicit padding following

core: arm: kern.ld.S: consistent 8 bytes alignment

Replace the last 4 bytes alignment statements with 8 bytes alignment to
avoid implicit padding when linking the binary.

Implicit padding following the .data section doesn't work with the
pager.

Acked-by: David Brown <david.brown@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

hikey: 32-bit: use -mcpu=cortex-a53 instead of cortex-a15

Use the proper CPU architecture when building 32-bit binaries for HiKey.
Note: this triggers a compiler warning:
CC out/arm-plat-hik

hikey: 32-bit: use -mcpu=cortex-a53 instead of cortex-a15

Use the proper CPU architecture when building 32-bit binaries for HiKey.
Note: this triggers a compiler warning:
CC out/arm-plat-hikey/core/tee/tee_svc_cryp.o
{standard input}: Assembler messages:
{standard input}:632: Warning: IT blocks containing 32-bit Thumb instructions are deprecated in ARMv8
(compiler is gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux).
This seems to be harmless and is registered as a compiler bug [1].

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67591

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: Add default CFG_CORE_HEAP_SIZE

Adds a CFG_CORE_HEAP_SIZE replacing the defined HEAP_SIZE in each
platform_config.h. Default value is defined in mk/config.mk as 64 kB.
This is larger than most

core: Add default CFG_CORE_HEAP_SIZE

Adds a CFG_CORE_HEAP_SIZE replacing the defined HEAP_SIZE in each
platform_config.h. Default value is defined in mk/config.mk as 64 kB.
This is larger than most of the previous values at 24 kB or just above.

Platforms with a previous heap size defined larger than 64 kB overrides
the mk/config.mk setting with a $(platform-dir)/conf.mk setting using the
previous value.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (Hikey pager)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU v7 pager)
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (FVP Aarch32 pager)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: add default CFG_CORE_TZSRAM_EMUL_SIZE

Adds a CFG_CORE_TZSRAM_EMUL_SIZE replacing the previous value directly
defined in TZSRAM_SIZE in each platform_config.h. Default value is
defined in core/

core: add default CFG_CORE_TZSRAM_EMUL_SIZE

Adds a CFG_CORE_TZSRAM_EMUL_SIZE replacing the previous value directly
defined in TZSRAM_SIZE in each platform_config.h. Default value is
defined in core/arch/arm/arm.mk as 300 kB. This is larger than most of
the previous values.

Platforms with TZSRAM_SIZE defined larger than 200 kB overrides the
core/arch/arm/arm.mk setting with a $(platform-dir)/conf.mk setting
using the previous value.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

Add the i.MX6 Quad SABRE board support (PLATFORM=imx)

Signed-off-by: Yan Yan <yan.yan@windriver.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome.for

Add the i.MX6 Quad SABRE board support (PLATFORM=imx)

Signed-off-by: Yan Yan <yan.yan@windriver.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Peng Fan <peng.fan@nxp.com>

show more ...

syscall storage_obj_seek: fix sign extension

Fixes problem with sign extension (or lack thereof) for the syscall
storage_obj_seek. Updates the general rules of arguments for syscalls to
use signed 3

syscall storage_obj_seek: fix sign extension

Fixes problem with sign extension (or lack thereof) for the syscall
storage_obj_seek. Updates the general rules of arguments for syscalls to
use signed 32-bit parameters when a signed parameter is needed.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Suggested-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU and FVP)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

ltc: remove test related source files

Test related source files have not been built into OP-TEE image all the
time, so we remove them permanently.

Signed-off-by: Matt Ma <matt.ma@linaro.org>
Review

ltc: remove test related source files

Test related source files have not been built into OP-TEE image all the
time, so we remove them permanently.

Signed-off-by: Matt Ma <matt.ma@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

show more ...

Fix 64-bit compile error in tee_sql_fs.c

$ make PLATFORM=hikey CFG_SQL_FS=y CFG_ARM64_core=y
[snip]
core/tee/tee_sql_fs.c: In function ‘sql_fs_read’:
core/tee/tee_sql_fs.c:740:41: error: comparison

Fix 64-bit compile error in tee_sql_fs.c

$ make PLATFORM=hikey CFG_SQL_FS=y CFG_ARM64_core=y
[snip]
core/tee/tee_sql_fs.c: In function ‘sql_fs_read’:
core/tee/tee_sql_fs.c:740:41: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]
if ((fdp->pos + len) < len || fdp->pos > fdp->meta.length)
^
cc1: all warnings being treated as errors

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: bugfix reading beyond end of file

Bugfix for reading beyond end of a persistent object when the file
position is larger the the size of the data stream. Applies to both REE
FS and SQL FS.

Rev

core: bugfix reading beyond end of file

Bugfix for reading beyond end of a persistent object when the file
position is larger the the size of the data stream. Applies to both REE
FS and SQL FS.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

plat-rpi3: Initial support for RPi3

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro

plat-rpi3: Initial support for RPi3

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org>

show more ...

storage: SQL FS concurrency

Allow concurrent access by multi-session/multi-instance TA.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@lin

storage: SQL FS concurrency

Allow concurrent access by multi-session/multi-instance TA.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

storage: REE FS concurrency

Allow concurrent access by multi-session/multi-instance TA.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@lin

storage: REE FS concurrency

Allow concurrent access by multi-session/multi-instance TA.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

storage: protect TA directory with a mutex

There is a race condition in the code that creates and deletes trusted
storage. If multiple threads invoke a multi-session TA to create and
delete differen

storage: protect TA directory with a mutex

There is a race condition in the code that creates and deletes trusted
storage. If multiple threads invoke a multi-session TA to create and
delete different files (such as xtest 6016), the following can occur:

Thread 1 (create file1) | Thread 2 (delete file2)
|
| unlink("/TA_dir/file2");
mkdir("/TA_dir"); |
| rmdir("/TA_dir");
create("/TA_dir/file1"); |
=> ENOENT |

Add a mutex to prevent this race condition.

Note: the bug is currently not triggered by xtest 1016 because the test
is run for RPMB FS only, and because directory operations are no-ops in
the RPMB implementation. The fix will be needed when enabling single-TA
concurrency with the REE and SQL backends.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: arm: add no-map property to res mem

Adds a "no-map" property to the optee@xxx node. Before this patch the node
looked like:
optee@78000000 {
reg = <0x78000000 0x800000>;
};
With this patch

core: arm: add no-map property to res mem

Adds a "no-map" property to the optee@xxx node. Before this patch the node
looked like:
optee@78000000 {
reg = <0x78000000 0x800000>;
};
With this patch it becomes:
optee@78000000 {
reg = <0x78000000 0x800000>;
no-map;
};

This makes it clear to the Linux kernel that it must leave it to the
OP-TEE driver to map the reserved memory.

Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

hikey: increase heap size from 24 KiB to 32 KiB

The current heap size is not enough to run `xtest` when the newly
added SQLite FS is enabled (CFG_SQL_FS=y). Let's increase it a bit.

Signed-off-by:

hikey: increase heap size from 24 KiB to 32 KiB

The current heap size is not enough to run `xtest` when the newly
added SQLite FS is enabled (CFG_SQL_FS=y). Let's increase it a bit.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

show more ...

tee_mm_get_pool_stats(): fix reset of max_allocated

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jens Wiklan

tee_mm_get_pool_stats(): fix reset of max_allocated

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: add heap allocation failure statistics

Adds the following statistics to the heap allocator and export then via
the static TA `core/arch/arm/sta/stats.c` (all of them can be reset):

- num_all

core: add heap allocation failure statistics

Adds the following statistics to the heap allocator and export then via
the static TA `core/arch/arm/sta/stats.c` (all of them can be reset):

- num_alloc_fail: number of calls to malloc()/calloc()/realloc() that
returned NULL
- biggest_alloc_fail: the size in bytes of the largest allocation
request that resulted in a failure
- biggest_alloc_fail_used: the number of bytes that were allocated at
that time

Depends on CFG_WITH_STATS=y.

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

core: add support for kernel address sanitizer

Adds support for kernel address sanitizer.
Currently only for plat-vexpress-qemu_virt.

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Tes

core: add support for kernel address sanitizer

Adds support for kernel address sanitizer.
Currently only for plat-vexpress-qemu_virt.

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU v7)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...