RPMB: make device ID configurable

Introduce CFG_RPMB_FS_DEV_ID (default value: 0), so that the eMMC
device used by the RPMB filesystem is easily configurable.
For instance, set CFG_RPMB_FS_DEV_ID=1

RPMB: make device ID configurable

Introduce CFG_RPMB_FS_DEV_ID (default value: 0), so that the eMMC
device used by the RPMB filesystem is easily configurable.
For instance, set CFG_RPMB_FS_DEV_ID=1 for /dev/mmcblk1rpmb.

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

show more ...

core: stack unwinding

Adds support for stack unwinding, currently only done for fatal aborts
from kernel mode if CFG_CORE_UNWIND = y

The ARMv7/Aarch32 implementation uses -funwind-tables to generat

core: stack unwinding

Adds support for stack unwinding, currently only done for fatal aborts
from kernel mode if CFG_CORE_UNWIND = y

The ARMv7/Aarch32 implementation uses -funwind-tables to generate frame
unwinding information which is quite large. Enabling stack unwinding
currently consumes ~8 KiB. The code to parse the frame unwind
information is imported from FreeBSD.

The Aarch64 implementation takes advantage of the frame pointer and has
minimal overhead. The core code to unwind the stack is imported from
FreeBSD.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey 32/64)
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU, FVP)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

Introduce CROSS_COMPILE32 and CROSS_COMPILE64

Currently, to build a 64-bit TEE core (as well as mixed 32- and 64-bit
TA libraries, which are automatically enabled in this case), one has to
set too m

Introduce CROSS_COMPILE32 and CROSS_COMPILE64

Currently, to build a 64-bit TEE core (as well as mixed 32- and 64-bit
TA libraries, which are automatically enabled in this case), one has to
set too many compiler variables:

$ make PLATFORM=hikey CFG_ARM64_core=y \
CROSS_COMPILE_core=aarch64-linux-gnu- \
CROSS_COMPILE_ta_arm64=aarch64-linux-gnu-

This commit introduces two variables, CROSS_COMPILE32 and
CROSS_COMPILE64. They take appropriate default values, so that the
above line may be simplified as:

$ make PLATFORM=hikey CFG_ARM64_core=y

The change remains compatible with previous builds, i.e., CROSS_COMPILE
can still be used to define the 32-bit compiler because CROSS_COMPILE32
defaults to $(CROSS_COMPILE). Similarly, CROSS_COMPILE_core and
CROSS_COMPILE_ta_arm{32,64} are still used so they may be overridden
too.

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

show more ...

arm: add TA hard-float support

Adds support for hard-float in TAs. Hard-float is enabled by default for
all platforms which are capable, currently all. Soft-float is still
available if needed.

Revi

arm: add TA hard-float support

Adds support for hard-float in TAs. Hard-float is enabled by default for
all platforms which are capable, currently all. Soft-float is still
available if needed.

Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU, FVP)
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

Compiles user library using conf.h

Compilation of user libraries now includes conf.h
This makes the definition of CFG_xxx macro more reliable, without
the need of adding specific -D directives in ta

Compiles user library using conf.h

Compilation of user libraries now includes conf.h
This makes the definition of CFG_xxx macro more reliable, without
the need of adding specific -D directives in ta/ta.mk

Note that conf.h and conf.mk are no more generated in the out/core
directory.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>

show more ...

Replace CFG_TEE_IMPL_VERSION with TEE_IMPL_VERSION

Replaces CFG_TEE_IMPL_VERSION with TEE_IMPL_VERSION to avoid updating
<out-dir>/core/include/generated/conf.h each time description of the current

Replace CFG_TEE_IMPL_VERSION with TEE_IMPL_VERSION

Replaces CFG_TEE_IMPL_VERSION with TEE_IMPL_VERSION to avoid updating
<out-dir>/core/include/generated/conf.h each time description of the current
git commit is changed.

This avoids full recompiles that can't even be cached just because some
files has changed in an updated commit.

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

show more ...

core config: generate conf.mk preserves CFG_xxx=n

The generated conf.mk configuration file no more replaces
CFG_xxx=n with commented configuration settings "# CFG_xxx is
not set" and preserve the CF

core config: generate conf.mk preserves CFG_xxx=n

The generated conf.mk configuration file no more replaces
CFG_xxx=n with commented configuration settings "# CFG_xxx is
not set" and preserve the CFG_xxx=n setting.

This allows one to fully reuse the generated conf.mk as an
input configuration to regenerate the firmware with the
same configuration directive.

Reviewed-by: Etienne CARRIERE <etienne.carriere@st.com>
Tested-by: Etienne CARRIERE <etienne.carriere@st.com>
Reviewed-by: Pascal BRAND <pascal.brand@st.com>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU)

show more ...

libutils: provide aeabi functions using softfloat

Configures Softfloat to be used with aeabi function to provide floating
point support for user TAs. CFG_TA_FLOAT_SUPPORT is set to y for arm32
platf

libutils: provide aeabi functions using softfloat

Configures Softfloat to be used with aeabi function to provide floating
point support for user TAs. CFG_TA_FLOAT_SUPPORT is set to y for arm32
platforms to indicate that floating support is enabled.

Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

show more ...

Secure Storage: Added a flag to turn Block Cache off

Introduce a new flag CFG_FS_BLOCK_CACHE (default off) to
turn block cache on and off.

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: SY

Secure Storage: Added a flag to turn Block Cache off

Introduce a new flag CFG_FS_BLOCK_CACHE (default off) to
turn block cache on and off.

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: SY Chiu <sy.chiu@linaro.org> (QEMU,MT8173_EVB)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

show more ...

debug: enable bget memory leak detection

This patch enables memory leak detection in bget_malloc.c.
This is very helpful to find memory leakage issue in teecore
or user TA. To enable it in teecore,

debug: enable bget memory leak detection

This patch enables memory leak detection in bget_malloc.c.
This is very helpful to find memory leakage issue in teecore
or user TA. To enable it in teecore, build optee_os with
`CFG_TEE_CORE_MALLOC_DEBUG=y`. For user TA, build optee_os
with `CFG_TEE_TA_MALLOC_DEBUG=y`.

Then, add the following statement at some point of your
code that might frequently been triggered:

mdbg_check(1);

It will dump allocated memory blocks and the holders of
them. If you find a memory block appears multiple times
after the system runs a period of time, it is very likely
the source of memory leakage.

Here is an example output:

ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 0 bytes core/tee/tee_svc_storage.c:260
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 104 bytes core/tee/tee_svc_storage.c:444
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 18 bytes core/tee/tee_pobj.c:119
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 56 bytes core/tee/tee_pobj.c:110
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 192 bytes core/arch/arm/mm/tee_mmu.c:93
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 32 bytes core/arch/arm/mm/tee_mmu.c:241
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 24 bytes core/arch/arm/mm/tee_mm.c:75
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 24 bytes core/arch/arm/mm/tee_mm.c:75
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 224 bytes core/arch/arm/kernel/tee_ta_manager.c:573
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 72 bytes core/arch/arm/kernel/tee_ta_manager.c:1202
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 7 bytes lib/libutils/isoc/strdup.c:34
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 7 bytes lib/libutils/isoc/strdup.c:34
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 7 bytes lib/libutils/isoc/strdup.c:34
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 7 bytes lib/libutils/isoc/strdup.c:34
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 32 bytes core/kernel/handle.c:70
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 24 bytes core/arch/arm/mm/tee_mm.c:48
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 24 bytes core/arch/arm/mm/tee_mm.c:48
ERR TEE-CORE:mdbg_check:720: Orphaned buffer: 24 bytes core/arch/arm/mm/tee_mm.c:48
ERR TEE-CORE:mdbg_check:720: Ignore buffer: 16 bytes lib/libutils/isoc/bget_malloc.c:794

You can see the buffer hold by strdup.c:34 appears 4 times,
so it's very likely to be the source of memory leakage.

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)
Tested-by: SY Chiu <sy.chiu@linaro.org> (MT8173 EVB)

show more ...

Make compilation of lib/libutils/isoc configurable again

Commit c3e0bd74e4cf ("Delete libutil_with_isoc") wrongly assumed that
the code in lib/libutils/isoc is mandatory for any OP-TEE build. This i

Make compilation of lib/libutils/isoc configurable again

Commit c3e0bd74e4cf ("Delete libutil_with_isoc") wrongly assumed that
the code in lib/libutils/isoc is mandatory for any OP-TEE build. This is
not true for some non-upstream platforms which can find the functions in
external libraries.

Therefore, this commits makes the thing configurable again through
CFG_LIBUTILS_WITH_ISOC (default: y).

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

show more ...

mk/checkconf.mk: Add optional reason text to the 'force' macro

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Pascal Bra

mk/checkconf.mk: Add optional reason text to the 'force' macro

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

show more ...

libutee: Optionally replace TEE_Panic() with macro

Help debugging by replacing TEE_Panic() with a macro that does an EMSG()
and then calls panic function (__TEE_Panic()).

Signed-off-by: Jens Wiklan

libutee: Optionally replace TEE_Panic() with macro

Help debugging by replacing TEE_Panic() with a macro that does an EMSG()
and then calls panic function (__TEE_Panic()).

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

show more ...

plat-*/conf.mk cleanup

- Do not set CFG_ values that do not change the default
- Remove a few useless -D<flag>
- Always use '?=' as opposed to ':=' for consistent behavior with
'CFG_FOO=y make' an

plat-*/conf.mk cleanup

- Do not set CFG_ values that do not change the default
- Remove a few useless -D<flag>
- Always use '?=' as opposed to ':=' for consistent behavior with
'CFG_FOO=y make' and 'make CFG_FOO=y'
=> Use this form when both enabled and disabled are valid options
- Add macro: $(call force,CFG_FOO,y) to set a variable and make
sure it does not conflict with external values that may be given
on the command line or in the environment
=> Use this form when the variable can only have the specified value
(any other value would be invalid). 'override CFG_FOO := y' would
be correct, too, but would not detect conflicting values.
- Always include mk/conf.mk last so that the platform definitions
always take precedence over the global configuration

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

show more ...

checkconf.mk: fix cfg-enable-all-depends

If a configuration variable is given as an argument to make (such as:
'make CFG_FOO=n'), the 'override' keyword is required in order to
change its value.

Fi

checkconf.mk: fix cfg-enable-all-depends

If a configuration variable is given as an argument to make (such as:
'make CFG_FOO=n'), the 'override' keyword is required in order to
change its value.

Fixes the following issue (2nd warning shows that CFG_CRYPTO_AES is
actually not enabled):
$ make -j8 all -s PLATFORM=vexpress-qemu_virt CFG_CRYPTO_{AES,DES}=n
core/lib/libtomcrypt/sub.mk:51: Warning: Enabling CFG_CRYPTO_AES
[required by CFG_ENC_FS]
core/lib/libtomcrypt/sub.mk:58: Warning: Disabling CFG_CRYPTO_ECB
[requires (one of) CFG_CRYPTO_AES CFG_CRYPTO_DES]

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

show more ...

lib.mk: make sure archive file contains only specified objects

The recipe for archive (.a) files is updated so we won't try to append
objects to an existing archive left over from a previous build.

lib.mk: make sure archive file contains only specified objects

The recipe for archive (.a) files is updated so we won't try to append
objects to an existing archive left over from a previous build.

This fixes the following build error:
$ make -s PLATFORM=hikey
$ make -s PLATFORM=hikey CFG_ARM64_core=y \
CROSS_COMPILE_core=aarch64-linux-gnu-
[...]libtomcrypt.a: error adding symbols: File in wrong format

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

show more ...

TA as ELF + signature

Changes format of TA to use the ELF format instead. This patch also adds
signature checking of the TA. The format of the TA is:
<Signed header>
<ELF header>
<Program header> (p

TA as ELF + signature

Changes format of TA to use the ELF format instead. This patch also adds
signature checking of the TA. The format of the TA is:
<Signed header>
<ELF header>
<Program header> (part of ELF spec, pointing out segments to load)
<Sections>

A struct ta_head is placed in the first section of the first segment
to carry flags and other properties of the TA.

elf32.h, elf64.h and elf_common.h are imported from FreeBSD.

In addition to the R_ARM_RELATIVE relocation type, adds support for
R_ARM_ABS32 relocations. Since a symbol table is needed to process this
relocation type a separate program header is added in the TA ELF
containing the sections .dynamic, .dynsym, .dynstr and .hash. These
sections are only needed during relocation and could be released once
the TA is relocated.

A default signing key has been generated with
openssl genrsa -out key.pem
and added as keys/default_ta.pem

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Jens Wiklander <jens.wiklander@linaro.org> (QEMU, FVP)
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU platform)
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (HiKey)

show more ...

Secure Storage: Implement block-based encrypted file system

- Meta file encryption/decryption is enforced
- Block file encryption/decryption is optional

Signed-off-by: James Kung <james.kung@linaro

Secure Storage: Implement block-based encrypted file system

- Meta file encryption/decryption is enforced
- Block file encryption/decryption is optional

Signed-off-by: James Kung <james.kung@linaro.org>
Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: James Kung <james.kung@linaro.org> (QEMU, MT8173 EVB)
Tested-by: SY Chiu <sy.chiu@linaro.org> (QEMU)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

show more ...

Secure Storage: Implemented block-based file operations

This patch represent a TEE file by many small REE files
and single meta file, which is used to describe the TEE
file. This approach can be use

Secure Storage: Implemented block-based file operations

This patch represent a TEE file by many small REE files
and single meta file, which is used to describe the TEE
file. This approach can be used as basis to support atomic
operation and enhance encrypt fs performance.

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: SY Chiu <sy.chiu@linaro.org> (QEMU)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

show more ...

Build for PLATFORM=vexpress-qemu_virt by default

Also, for STM platforms, set CROSS_COMPILE=arm-linux-gnueabihf-
by default (which is a more standard prefix for the 32-bit
compiler).

Signed-off-by:

Build for PLATFORM=vexpress-qemu_virt by default

Also, for STM platforms, set CROSS_COMPILE=arm-linux-gnueabihf-
by default (which is a more standard prefix for the 32-bit
compiler).

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

show more ...

Enhancing Secure Storage

- Implement encrypted file system key manager
* Key generation for SSK, FEK
* Provide helper APIs to do file encryption/decryption
* Finished key manager test cases fo

Enhancing Secure Storage

- Implement encrypted file system key manager
* Key generation for SSK, FEK
* Provide helper APIs to do file encryption/decryption
* Finished key manager test cases for file encryption/decryption tests

- Implements encrypted file system operations file-based operation
* file content is encrypted and MACed before storing
on normal world file system.
* file hole is not implemented because this is
meaningless in the context of secure storage.

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Signed-off-by: James Kung <james.kung@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: SY Chiu <sy.chiu@linaro.org> (QEMU)
Tested-by: James Kung <james.kung@linaro.org> (QEMU)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)

show more ...

build: remove conf-file from cleanvars.mk

conf-file and conf-mk-file are valid for core and lib
compilation. These variables are set only once, when
starting the building.

Without this patch, the v

build: remove conf-file from cleanvars.mk

conf-file and conf-mk-file are valid for core and lib
compilation. These variables are set only once, when
starting the building.

Without this patch, the variables are cleaned when
compiling the libs. This affects the rules
$(objs): $(conf-file)
which forces the conf-file generation.
In case of parallel build, if libs are compiled before the
core, then conf-file is not created, which results in a
compilation error.

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Pascal Brand <pascal.brand@st.com>

show more ...

plat-stm: CFG_GENERIC_BOOT=y

Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)
Tested-by: Pascal Brand <pascal.brand@linaro.org

plat-stm: CFG_GENERIC_BOOT=y

Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Tested-by: Pascal Brand <pascal.brand@linaro.org> (STM platform)
Tested-by: Pascal Brand <pascal.brand@linaro.org> (QEMU platform)
Signed-off-by: Pascal Brand <pascal.brand@st.com>

show more ...

GP Internal Core API v1.1 : TEE configuration properties

Signed-off-by: Cedric Chaumont <cedric.chaumont@st.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier

GP Internal Core API v1.1 : TEE configuration properties

Signed-off-by: Cedric Chaumont <cedric.chaumont@st.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Tested-by: Cedric Chaumont <cedric.chaumont@linaro.org> (STM boards)
Tested-by: Cedric Chaumont <cedric.chaumont@linaro.org> (ARM Juno board)

show more ...

Add sparse support [C=1]

Adds support to check source files with sparse when C=1 on the command
line. Only files that are recompiled are checked.

Note that sparse isn't very useful at this stage si

Add sparse support [C=1]

Adds support to check source files with sparse when C=1 on the command
line. Only files that are recompiled are checked.

Note that sparse isn't very useful at this stage since the source code
need changes to be more sparse friendly.

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

show more ...