boot/arm-trusted-firmware: support 32bit Arm targets
PATCH v2 1/8 boot/arm-trusted-firmware: support 32bit Arm targets
This change allows one to build the TF-A (Trusted Firmware A) for 32bit architectures Armv7 and Armv8 platforms. TF-A supports these configuration since release v1.5.
Change dependency on BR2_aarch64 into a dependency on either BR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A to better define the target architectures supported by the package.
Set package configuration directive ARM_ARCH_MAJOR according to BR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A. Set package configuration directive ARCH based on BR2_aarch64/BR2_arm.
---
Changes v1 -> v2:
- Set ARM_ARCH_MAJOR and ARCH according to Buildroot directives
BR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A and BR2_aarch64/BR2_arm.
--- boot/arm-trusted-firmware/Config.in | 3 ++- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
boot/arm-trusted-firmware/Config.in +2 -1
@@ -1,6 +1,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" - depends on BR2_aarch64 && BR2_TARGET_UBOOT + depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \ + BR2_TARGET_UBOOT help Enable this option if you want to build the ATF for your ARM based embedded device.
boot/arm-trusted-firmware/arm-trusted-firmware.mk +12 -0
@@ -35,6 +35,18 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) +ifeq ($(BR2_ARM_CPU_ARMV7A),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 +else ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=8 +endif + +ifeq ($(BR2_arm),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch32 +else ifeq ($(BR2_aarch64),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch64 +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
Signature · 1 line
1.9.1
PATCH v2 2/8 boot/arm-trusted-firmware: in-tree and OP-TEE BL32
This change allows one to build trusted firmware (TF-A) with OP-TEE as BL32 secure payload.
When BR2_TARGET_ARM_TRUSTED_FIRMWARE_INTREE_BL32 is enabled TF-A builds a BL32 stage according the TF-A configuration directive. If these specify no BL3 stage then TF-A will build without BL32 support. This is the default configuration and reflects TF-A legacy integration in BR.
When BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32 is enabled TF-A builds with support for the OP-TEE OS as BL32.
---
Changes v1 -> v2:
- No change
--- boot/arm-trusted-firmware/Config.in | 30 +++++++++++++++++++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 ++++++++++ 2 files changed, 43 insertions(+)
boot/arm-trusted-firmware/Config.in +30 -0
@@ -91,6 +91,36 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT bl31.bin. This is used for example by the Xilinx version of U-Boot SPL to load ATF on the ZynqMP SoC. +choice + prompt "Select BL32 stage" + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_INTREE_BL32 + help + Select BL32 stage for the trusted firmware + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_INTREE_BL32 + bool "Intree or no BL32 stage" + help + This option shall be set if the BL32 image is built from + trusted firmware sources (i.e sp_min, tsp) or when no BL32 + is expected. + + When the BL32 stage shall be built from ATF source tree, + the target BL32 payload shall be defined from configuration + BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES, either + using directive SPD=<bl32_id> (Aarch64 platforms, + i.e SPD=tspd) or AARCH32_SP=<bl32_id> (Aarch32 and Armv7 + platforms, i.e "AARCH32_SP=sp_min"). If no SPD or AARCH32_SP + directive is specified, ATF will build without BL32 support. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32 + bool "OP-TEE OS as BL32" + depends on BR2_TARGET_OPTEE_OS + help + This option allows to embed OP-TEE OS as the BL32 part of + the ARM Trusted Firmware boot sequence. + +endchoice + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT
boot/arm-trusted-firmware/arm-trusted-firmware.mk +13 -0
@@ -47,6 +47,19 @@ else ifeq ($(BR2_aarch64),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch64 endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += optee-os +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee-header_v2.bin +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL32_EXTRA1=$(BINARIES_DIR)/tee-pager_v2.bin +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL32_EXTRA2=$(BINARIES_DIR)/tee-pageable_v2.bin +ifeq ($(BR2_aarch64),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SPD=opteed +endif +ifeq ($(BR2_arm),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee +endif +endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32 + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
Signature · 1 line
1.9.1
PATCH v2 2/8 boot/arm-trusted-firmware: in-tree and OP-TEE BL32
Hello Etienne,
Quoted 9 lines · On Tue, 19 Mar 2019 00:21:03 +0100 Etienne Carriere…
This change allows one to build trusted firmware (TF-A) with OP-TEE as BL32 secure payload.
When
BR2_TARGET_ARM_TRUSTED_FIRMWARE_INTREE_BL32is enabled TF-A builds a BL32 stage according the TF-A configuration directive. If these specify no BL3 stage then TF-A will build without BL32 support. This is the default configuration and reflects TF-A legacy integration in BR.
Quoted 4 lines
When
BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32is enabled TF-A builds with support for the OP-TEE OS as BL32.Signed-off-by Etienne Carriere <[email protected]>
I have applied, after doing a few changes. See below.
boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT · line 95
Quoted 2 lines
boot/arm-trusted-firmware/Config.in +2
-0+choice + prompt "Select BL32 stage"
Simplified to just "BL32"
Quoted 1 line
+config
BR2_TARGET_ARM_TRUSTED_FIRMWARE_INTREE_BL32
Changed to:
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_DEFAULT
I found the "in-tree" confusing, because in most cases, it's actually "no BL32". What this option does is essentially nothing, i.e keeps the default.
boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT · line 101
Quoted 1 line
boot/arm-trusted-firmware/Config.in +1
-0+ bool "Intree or no BL32 stage"
Changed to "Default"
boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT · line 113
Quoted 12 lines
boot/arm-trusted-firmware/Config.in +12
-0+ help + This option shall be set if the BL32 image is built from + trusted firmware sources (i.e sp_min, tsp) or when no BL32 + is expected. + + When the BL32 stage shall be built from ATF source tree, + the target BL32 payload shall be defined from configuration + BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES, either + using directive SPD=<bl32_id> (Aarch64 platforms, + i.e SPD=tspd) or AARCH32_SP=<bl32_id> (Aarch32 and Armv7 + platforms, i.e "AARCH32_SP=sp_min"). If no SPD or AARCH32_SP + directive is specified, ATF will build without BL32 support.
I've reworded this to simplify a bit the explanation.
Review
Quoted 2 lines
(quoted diff) +2
-0+ +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32
Renamed to BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE
boot/arm-trusted-firmware/arm-trusted-firmware.mk else ifeq ($(BR2_aarch64),y) · line 54
Quoted 5 lines
boot/arm-trusted-firmware/arm-trusted-firmware.mk +5
-0+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += optee-os +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL32=$(BINARIES_DIR)/tee-header_v2.bin +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL32_EXTRA1=$(BINARIES_DIR)/tee-pager_v2.bin +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL32_EXTRA2=$(BINARIES_DIR)/tee-pageable_v2.bin
I grouped these definitions in a single assignment to ARM_TRUSTED_FIRMWARE_MAKE_OPTS.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 3/8 boot/arm-trusted-firmware: support debug mode
In reply to Etienne CarriereWhen the trusted firmware is built with debug support (DEBUG defined), the generated images are located at a specific path. The non debug images are located in generated directory build/<platform>/release/ while the debug images are located in generated directory build/<platform>/debug/.
This change introduces boolean BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG to define whether the release or debug configuration is used to build trusted firmware. Note that enabling trusted firmware debug support, i.e BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="... DEBUG=1 ..." without enabling BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG will fail since Buildroot will get generated files from the wrong path.
---
Changes v1 -> v2:
- No change
--- boot/arm-trusted-firmware/Config.in | 7 +++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 13 insertions(+)
boot/arm-trusted-firmware/Config.in +7 -0
@@ -136,4 +136,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES Additional parameters for the ATF build E.G. 'DEBUG=1 LOG_LEVEL=20' +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG + bool "Debug mode of the trusted firmware" + default n + help + Enable this directive if trusted firmware is built in debug + mode. + endif
boot/arm-trusted-firmware/arm-trusted-firmware.mk +6 -0
@@ -28,7 +28,13 @@ endif ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \
Signature · 1 line
1.9.1
PATCH v2 3/8 boot/arm-trusted-firmware: support debug mode
Hello Etienne,
Quoted 6 lines · On Tue, 19 Mar 2019 00:21:04 +0100 Etienne Carriere…
When the trusted firmware is built with debug support (DEBUG defined), the generated images are located at a specific path. The non debug images are located in generated directory build/<platform>/release/ while the debug images are located in generated directory build/<platform>/debug/.
Quoted 8 lines
This change introduces boolean
BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUGto define whether the release or debug configuration is used to build trusted firmware. Note that enabling trusted firmware debug support, i.e BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="... DEBUG=1 ..." without enablingBR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUGwill fail since Buildroot will get generated files from the wrong path.Signed-off-by Etienne Carriere <[email protected]>
I've applied with a few minor tweaks.
boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES · line 140
Quoted 2 lines
boot/arm-trusted-firmware/Config.in +2
-0+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG + bool "Debug mode of the trusted firmware"
"of the trusted firmware" is not really useful: options are already indented under the package they apply to, so there's no need to repeat the package name.
boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES · line 141
Quoted 1 line
boot/arm-trusted-firmware/Config.in +1
-0+ default n
"default n" is the default, so it's not needed.
boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES · line 144
Quoted 3 lines
boot/arm-trusted-firmware/Config.in +3
-0+ help + Enable this directive if trusted firmware is built in debug + mode.
The wording is strange: you don't want to enable this option (not directive) if trusted firmware is built in debug mode. You want to enable it to build ATF in debug mode.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 4/8 boot/arm-trusted-firmware: support alternate image files
In reply to Etienne CarriereSome platform may generate specific boot image files instead of the generic files *.bin when building TF-A package. This change introduces new configuration directive for the arm-trusted-firmware boot package.
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES is boolean. When disabled, install boot image files are .../*.bin. When enabled, BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES shall lists the names of the generated boot image files.
---
Changes v1 -> v2:
- No change
--- boot/arm-trusted-firmware/Config.in | 20 ++++++++++++++++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 14 +++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-)
boot/arm-trusted-firmware/Config.in +20 -0
@@ -121,6 +121,26 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32 endchoice +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES + bool "Use custom binary boot image filenames" + help + If not set, build generates the boot image files with the + generic filename that is images with .bin extension. These + are copied to the output images/ directory. + + If enabled, use BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGES + to list the generated file names. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES + string "Binary boot image filenames" + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES + help + This is used when TF-A platform generates boot image files + with custom file names. When so, this should list the path + of the generated files location relatively to the package + build root directory. These files are copied to the output + images/ directory. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT
boot/arm-trusted-firmware/arm-trusted-firmware.mk +13 -1
@@ -135,6 +135,18 @@ define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF endef endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES),y) +define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL + $(foreach f,$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES)), \ + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(f) $(BINARIES_DIR)/ \ + ) +endef +else +define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ +endef +endif + define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
@@ -143,7 +155,7 @@ define ARM_TRUSTED_FIRMWARE_BUILD_CMDS endef define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS - cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ + $(ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL) $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL) $(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF) endef
Signature · 1 line
1.9.1
PATCH v2 4/8 boot/arm-trusted-firmware: support alternate image files
Hello Etienne,
Quoted 11 lines · On Tue, 19 Mar 2019 00:21:05 +0100 Etienne Carriere…
Some platform may generate specific boot image files instead of the generic files *.bin when building TF-A package. This change introduces new configuration directive for the arm-trusted-firmware boot package.
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMESis boolean. When disabled, install boot image files are .../*.bin. When enabled,BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMESshall lists the names of the generated boot image files.Signed-off-by Etienne Carriere <[email protected]>
I think this is more complicated than it needs to be. See an alternate proposal below.
Quoted 9 lines
boot/arm-trusted-firmware/Config.in +9
-0+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES + bool "Use custom binary boot image filenames" + help + If not set, build generates the boot image files with the + generic filename that is images with .bin extension. These + are copied to the output images/ directory. + + If enabled, use BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGES + to list the generated file names.
boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32 · line 142
Quoted 10 lines
boot/arm-trusted-firmware/Config.in +10
-0+ +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES + string "Binary boot image filenames" + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES + help + This is used when TF-A platform generates boot image files + with custom file names. When so, this should list the path + of the generated files location relatively to the package + build root directory. These files are copied to the output + images/ directory.
Just one new option:
config BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGE_NAMES
string "Image names" default "*.bin" help ...
boot/arm-trusted-firmware/arm-trusted-firmware.mk define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF · line 148
Quoted 11 lines
boot/arm-trusted-firmware/arm-trusted-firmware.mk +11
-0+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES),y) +define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL + $(foreach f,$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES)), \ + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(f) $(BINARIES_DIR)/ \ + ) +endef +else +define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ +endef +endif
And then just:
ARM_TRUSTED_FIRMWARE_IMAGE_NAMES = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGE_NAMES))
define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL
$(foreach f,$(wildcard $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(ARM_TRUSTED_FIRMWARE_IMAGE_NAMES)), \ $(INSTALL) -D -m 0644 $(f) $(BINARIES_DIR)/$(notdir $(f)) )
endef
(totally untested of course)
Could you try something like this ?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 4/8 boot/arm-trusted-firmware: support alternate image files
Hi Thomas,
Quoted 65 lines · Thomas Petazzoni
Hello Etienne,
Quoted 11 lines · On Tue, 19 Mar 2019 00:21:05 +0100 Etienne Carriere…
Some platform may generate specific boot image files instead of the generic files *.bin when building TF-A package. This change introduces new configuration directive for the arm-trusted-firmware boot package.
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMESis boolean. When disabled, install boot image files are .../*.bin. When enabled,BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMESshall lists the names of the generated boot image files.Signed-off-by Etienne Carriere <[email protected]>I think this is more complicated than it needs to be. See an alternate proposal below.
Quoted 9 lines
boot/arm-trusted-firmware/Config.in +9
-0+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES + bool "Use custom binary boot image filenames" + help + If not set, build generates the boot image files with the + generic filename that is images with .bin extension. These + are copied to the output images/ directory. + + If enabled, use BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGES + to list the generated file names.boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_OPTEE_AS_BL32 · line 142
Quoted 10 lines
boot/arm-trusted-firmware/Config.in +10
-0+ +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES + string "Binary boot image filenames" + depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES + help + This is used when TF-A platform generates boot image files + with custom file names. When so, this should list the path + of the generated files location relatively to the package + build root directory. These files are copied to the output + images/ directory.Just one new option:
config
BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGE_NAMESstring "Image names" default "*.bin" help ...boot/arm-trusted-firmware/arm-trusted-firmware.mk define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF · line 148
Quoted 11 lines
boot/arm-trusted-firmware/arm-trusted-firmware.mk +11
-0+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_IMAGE_NAMES),y) +define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL + $(foreach f,$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL_IMAGE_NAMES)), \ + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(f) $(BINARIES_DIR)/ \ + ) +endef +else +define ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL + cp -dpf $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/*.bin $(BINARIES_DIR)/ +endef +endifAnd then just:
ARM_TRUSTED_FIRMWARE_IMAGE_NAMES= $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGE_NAMES))define
ARM_TRUSTED_FIRMWARE_BL_IMAGES_INSTALL
Quoted 8 lines
$(foreach f,$(wildcard $(ARM_TRUSTED_FIRMWARE_IMG_DIR)/$(ARM_TRUSTED_FIRMWARE_IMAGE_NAMES)), \ $(INSTALL) -D -m 0644 $(f) $(BINARIES_DIR)/$(notdir $(f)) )endef
(totally untested of course)
Could you try something like this ?
Sure, I'll test and send a update for the patch.
Thanks,
etienne
Quoted 8 lines
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
PATCH v2 5/8 package/optee-test: fix dependency in TAs build
In reply to Etienne CarriereFix TA build command to build TA libraries before TAs.
---
Changes v1 -> v2:
- New commit not in v1 series.
--- package/optee-test/optee-test.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/optee-test/optee-test.mk +1 -1
@@ -16,7 +16,7 @@ OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK) # Trusted Application are not built from CMake due to ta_dev_kit # dependencies. We must build and install them on target. define OPTEE_TEST_BUILD_TAS - $(foreach f,$(wildcard $(@D)/ta/*/Makefile), \ + $(foreach f,$(wildcard $(@D)/ta/*_lib/Makefile) $(wildcard $(@D)/ta/*/Makefile), \ $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ TA_DEV_KIT_DIR=$(OPTEE_OS_SDK) \
Signature · 1 line
1.9.1
Thomas Petazzoni
AppliedPATCH v2 5/8 package/optee-test: fix dependency in TAs build
Quoted 6 lines · On Tue, 19 Mar 2019 00:21:06 +0100 Etienne Carriere…
Fix TA build command to build TA libraries before TAs.
Signed-off-by Etienne Carriere <[email protected]>---
Changes v1 -> v2:
- New commit not in v1 series.
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 6/8 configs/qemu_armv7a_tz_virt: Armv7-A emulation with TrustZone services
In reply to Etienne CarriereThis change introduces a Qemu board for an Armv7-A target executing with OP-TEE secure world services.
The target Linux based normal world embeds the standard minimal filesystem with OP-TEE non-secure components embedded files from OP-TEE test, examples and benchmark packages.
The Linux custom configuration is dumped from the vexpress_defconfig with few added fragments: OP-TEE driver and 9p for virtual filesystem to ease file manipulation and exchanges through Qemu virtfs support.
U-Boot qemu_arm defconfig is modified with a configuration fragment to set boot command, enable semihosting and remove U-Boot persistent environment storage support.
The standard way for booting OP-TEE with a non-secure world companion use the Arm Trusted Firmware-A as bootloader. OP-TEE OS provides the BL32 image and U-boot the BL33 image. The boot scenario is:
TF-A bootloader (BL1/BL2) => OP-TEE (BL32) => U-boot (BL33).
| Executes as secure | Secure | Execs as Non-secure | Loads BL32/BL33 in RAM | Jumps to BL33 | Always booted after | Jumps to BL32 once done | as Non-secure | secure world inits
---
Changes v1 -> v2:
- Bump kernel to 4.19.
- Use kernel defconfig and add optee and 9p as config fragments.
- Remove ARM_ARCH_MAJOR from platform configuration directive BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES.
--- board/qemu/armv7a-tz-virt/linux.fragment | 8 ++ board/qemu/armv7a-tz-virt/readme.txt | 145 +++++++++++++++++++++++++++++++ board/qemu/armv7a-tz-virt/u-boot.config | 7 ++ configs/qemu_armv7a_tz_virt_defconfig | 48 ++++++++++ 4 files changed, 208 insertions(+) create mode 100644 board/qemu/armv7a-tz-virt/linux.fragment create mode 100644 board/qemu/armv7a-tz-virt/readme.txt create mode 100644 board/qemu/armv7a-tz-virt/u-boot.config create mode 100644 configs/qemu_armv7a_tz_virt_defconfig
board/qemu/armv7a-tz-virt/linux.fragment new file +8 -0
@@ -0,0 +1,8 @@ +### Enable OP-TEE +CONFIG_TEE=y +CONFIG_OPTEE=y +### Enable 9P VFS +CONFIG_NET_9P=y +CONFIG_NET_9P_VIRTIO=y +CONFIG_9P_FS=y +CONFIG_9P_FS_POSIX_ACL=y
board/qemu/armv7a-tz-virt/readme.txt new file +145 -0
145 lines not on this page · raw message
board/qemu/armv7a-tz-virt/u-boot.config new file +7 -0
@@ -0,0 +1,7 @@ +CONFIG_SYS_TEXT_BASE=0x60000000 +CONFIG_BOOTCOMMAND="fdt addr ${fdt_addr} && fdt resize 1000 && smhload zImage ${kernel_addr_r} && smhload rootfs.cpio.gz ${ramdisk_addr_r} ramdisk_addr_end && setenv bootargs console=ttyAMA0,115200 earlyprintk=serial,ttyAMA0,115200 && fdt chosen ${ramdisk_addr_r} ${ramdisk_addr_end} && bootz ${kernel_addr_r} - ${fdt_addr}" +CONFIG_SEMIHOSTING=y +# Drop flash accesses +CONFIG_ENV_IS_IN_FLASH=n +CONFIG_MTD=n +CONFIG_MTD_NOR_FLASH=n
configs/qemu_armv7a_tz_virt_defconfig new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 6/8 configs/qemu_armv7a_tz_virt: Armv7-A emulation with TrustZone services
Hi Etienne,
Just a few points I noticed, not a complete review...
board/qemu/armv7a-tz-virt/readme.txt line 19
Quoted 4 lines · Etienne Carriere
board/qemu/armv7a-tz-virt/readme.txt new file +4
-0+ ln -s ./u-boot.bin output/images/bl33.bin + ln -s ./tee-header_v2.bin output/images/bl32.bin + ln -s ./tee-pager_v2.bin output/images/bl32_extra1.bin + ln -s ./tee-pageable_v2.bin output/images/bl32_extra2.bin
This should be done in a post-build script.
Also, don't use ./, i.e.
ln -s u-boot.bin output/images/bl33.bin
[snip]
Review
Quoted 2 lines
(quoted diff) +2
-0+Note "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" +brings virtfs support for file sharing with the hosted Linux OS.
I thought virtfs was enabled with -virtfs. The netdev option creates a virtio
net device and IIUC you use p9 to get an fs over that.
But I don't think we typically enable or document that kind of feature in our
qemu configs. Just enable the minimum that is needed to be able to get a console and a network connection.
In fact, I think this defconfig should be as close as possible to the vexpress
defconfig. But I'm not sure if the a9 supports trustzone, so perhaps it's better to switch the vexpress config to a15.
[snip]
configs/qemu_armv7a_tz_virt_defconfig line 48
Quoted 4 lines
configs/qemu_armv7a_tz_virt_defconfig new file +4
-0+# Qemu emulator for the Arm target +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_QEMU_VIRTFS=y
Why is this needed? AFAICS there is nothing special about the Buildroot-built
host-qemu, so the system-installed qemu should work just as well, no?
Regards,
Arnout
PATCH v2 6/8 configs/qemu_armv7a_tz_virt: Armv7-A emulation with TrustZone services
Hello Arnout,
Quoted 5 lines · Arnout Vandecappelle
Hi Etienne,
Just a few points I noticed, not a complete review...
Quoted 7 lines
board/qemu/armv7a-tz-virt/readme.txt line 19
Quoted 4 lines · Etienne Carriere
board/qemu/armv7a-tz-virt/readme.txt new file +4
-0+ ln -s ./u-boot.bin output/images/bl33.bin + ln -s ./tee-header_v2.bin output/images/bl32.bin + ln -s ./tee-pager_v2.bin output/images/bl32_extra1.bin + ln -s ./tee-pageable_v2.bin output/images/bl32_extra2.binThis should be done in a post-build script.
This file renaming is very specific to the Qemu platform due to Qemu semihosting. If done at installation time, it should be part of optee-os.mk or arm-trusted-firmware.mk. But such a change would be relevant only for the Qemu based boards. It is not generic at all.
I though it would be simpler to state this file renaming in the board readme file, rather than a hack in boot/arm-trusted-firmware package for the Qemu case.
Quoted 4 lines
Also, don't use ./, i.e.
ln -s u-boot.bin output/images/bl33.bin
Ok, I'll fix.
Thanks
Quoted 11 lines
[snip]
Review
Quoted 2 lines
(quoted diff) +2
-0+Note "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" +brings virtfs support for file sharing with the hosted Linux OS.I thought virtfs was enabled with -virtfs. The netdev option creates a virtio
net device and IIUC you use p9 to get an fs over that.But I don't think we typically enable or document that kind of feature in our
qemu configs. Just enable the minimum that is needed to be able to get a console and a network connection.
Hmm, looking back at this... this setup and description is incomplete. Actually OP-TEE can be used in networking support. When so, argument:
-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic
enable Qemu SLiRP user networking. This is used by the OP-TEE tests.
For virtfs, there are a few extra args to provide, no listed in the proposed readme.txt.
I will fix the readme and remove info about virtfs.
Quoted 4 lines
In fact, I think this defconfig should be as close as possible to the vexpress
defconfig. But I'm not sure if the a9 supports trustzone, so perhaps it's better to switch the vexpress config to a15.
c-a9 supports trustzone. But c-a15 is more handy to cover various armv7-a cores flavors.
c-15 supports c-a9 features plus other features found in the armv7-a family (virtualization, 40-bit addressing, ...)
The Qemu platforms upstreamed in TF-A and OP-TEE are based on c-a15.
That said, whether the proposed qemu_armv7a_tz_virt should replace existing vexpress, I really cannot tell. Enabling arm-trustzone in Qemu (-machine secure=on) may drop features that the current vexpress supports (graphics?).
Quoted 9 lines
[snip]
configs/qemu_armv7a_tz_virt_defconfig line 48
Quoted 4 lines
configs/qemu_armv7a_tz_virt_defconfig new file +4
-0+# Qemu emulator for the Arm target +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_QEMU_VIRTFS=yWhy is this needed? AFAICS there is nothing special about the Buildroot-built
host-qemu, so the system-installed qemu should work just as well, no?
By system-installed you mean the user OS, as my ubuntu, for example, where I run Buildroot builds and tests?
I think it is a shame I need to install a specific version of Qemu on my host when Buildroot can produce the up-to-date Qemu tools.
Regards,
etienne
Quoted 5 lines
Regards,
Arnout
PATCH v2 6/8 configs/qemu_armv7a_tz_virt: Armv7-A emulation with TrustZone services
Quoted 15 lines · Etienne Carriere
Hello Arnout,
Quoted 11 lines · Arnout Vandecappelle
Hi Etienne,
Just a few points I noticed, not a complete review...
Quoted 4 lines · Etienne Carriere
board/qemu/armv7a-tz-virt/readme.txt new file +4
-0+ ln -s ./u-boot.bin output/images/bl33.bin + ln -s ./tee-header_v2.bin output/images/bl32.bin + ln -s ./tee-pager_v2.bin output/images/bl32_extra1.bin + ln -s ./tee-pageable_v2.bin output/images/bl32_extra2.bin
Quoted 6 lines
Quoted 1 line
This should be done in a post-build script.
This file renaming is very specific to the Qemu platform due to Qemu semihosting. If done at installation time, it should be part of optee-os.mk or arm-trusted-firmware.mk. But such a change would be relevant only for the Qemu based boards. It is not generic at all.
... which is why I say it should be part of a post-build script that is
specific for this defconfig. I'm talking about BR2_ROOTFS_POST_BUILD_SCRIPT.
Quoted 3 lines
I though it would be simpler to state this file renaming in the board readme file, rather than a hack in boot/arm-trusted-firmware package for the Qemu case.
[snip]
Quoted 8 lines
Quoted 3 lines
In fact, I think this defconfig should be as close as possible to the vexpress
defconfig. But I'm not sure if the a9 supports trustzone, so perhaps it's better to switch the vexpress config to a15.c-a9 supports trustzone. But c-a15 is more handy to cover various armv7-a cores flavors.
c-15 supports c-a9 features plus other features found in the armv7-a family (virtualization, 40-bit addressing, ...)
... which is exactly why a9 is interesting, because code built for a9 will run
on most other cortexes while code built for a15 will possibly not run on a9.
Quoted 1 line
The Qemu platforms upstreamed in TF-A and OP-TEE are based on c-a15.
That, however, is a good reason to use a15 for this defconfig.
Quoted 2 lines
That said, whether the proposed
qemu_armv7a_tz_virtshould replace existing vexpress, I really cannot tell.
I never said to replace it! I said it should be as close as possible. IOW, any
difference between the tz defconfig and the vexpress defconfig should have a good reason. And that reason should be explained in the commit message.
This reminds me: the defconfig should be named qemu_arm_vexpress_tz_defconfig
so it is clear that it's a variant of qemu_arm_vexpress_defconfig.
I would also tend to merge the readme with the existingboard/qemu/arm-vexpress/readme.txt because their content is a bit similar. But there are also reasons to split them (e.g., the script that scrapes the qemu launch command from the readme wouldn't work anymore).
Quoted 14 lines
Enabling arm-trustzone in
Qemu (-machine secure=on) may drop features that the current vexpress supports (graphics?).Quoted 9 lines
[snip]
configs/qemu_armv7a_tz_virt_defconfig line 48
Quoted 4 lines
configs/qemu_armv7a_tz_virt_defconfig new file +4
-0+# Qemu emulator for the Arm target +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_QEMU_VIRTFS=yWhy is this needed? AFAICS there is nothing special about the Buildroot-built
host-qemu, so the system-installed qemu should work just as well, no?
Quoted 2 lines
By system-installed you mean the user OS, as my ubuntu, for example, where I run Buildroot builds and tests?
Indeed, that's what I mean.
Quoted 2 lines
I think it is a shame I need to install a specific version of Qemu on my host when Buildroot can produce the up-to-date Qemu tools.
Do you mean that trustzone emulation is a recent addition to qemu and is not
yet available in the version shipped with e.g. Ubuntu 18.04? That would indeed be a valid reason to build qemu. But is should be explained in the commit log.
Otherwise, we should be consistent with all our qemu defconfigs. I agree that
there is something to be said for building qemu as part of the defconfig. It would increase the build time, but probably not that much more compared to building the toolchain. But if we do this, it should be done for all qemu defconfigs, and the readme's should be updated.
Regards,
Arnout
PATCH v2 6/8 configs/qemu_armv7a_tz_virt: Armv7-A emulation with TrustZone services
Quoted 21 lines · Arnout Vandecappelle
Quoted 17 lines · Etienne Carriere
Hello Arnout,
Quoted 12 lines · Arnout Vandecappelle
Hi Etienne,
Just a few points I noticed, not a complete review...
board/qemu/armv7a-tz-virt/readme.txt line 19
Quoted 4 lines · Etienne Carriere
board/qemu/armv7a-tz-virt/readme.txt new file +4
-0+ ln -s ./u-boot.bin output/images/bl33.bin + ln -s ./tee-header_v2.bin output/images/bl32.bin + ln -s ./tee-pager_v2.bin output/images/bl32_extra1.bin + ln -s ./tee-pageable_v2.bin output/images/bl32_extra2.binThis should be done in a post-build script.
Quoted 7 lines
Quoted 4 lines
This file renaming is very specific to the Qemu platform due to Qemu semihosting. If done at installation time, it should be part of optee-os.mk or arm-trusted-firmware.mk. But such a change would be relevant only for the Qemu based boards. It is not generic at all.
... which is why I say it should be part of a post-build script that is
specific for this defconfig. I'm talking aboutBR2_ROOTFS_POST_BUILD_SCRIPT.
Ok, great, I didn't saw there is such support. I'll add a script.
Quoted 27 lines
Quoted 5 lines
I though it would be simpler to state this file renaming in the board readme file, rather than a hack in boot/arm-trusted-firmware package for the Qemu case.
[snip]
Quoted 8 lines
Quoted 3 lines
In fact, I think this defconfig should be as close as possible to the vexpress
defconfig. But I'm not sure if the a9 supports trustzone, so perhaps it's better to switch the vexpress config to a15.c-a9 supports trustzone. But c-a15 is more handy to cover various armv7-a cores flavors.
c-15 supports c-a9 features plus other features found in the armv7-a family (virtualization, 40-bit addressing, ...)... which is exactly why a9 is interesting, because code built for a9 will run
on most other cortexes while code built for a15 will possibly not run on a9.Quoted 1 line
The Qemu platforms upstreamed in TF-A and OP-TEE are based on c-a15.
That, however, is a good reason to use a15 for this defconfig.
Quoted 2 lines
That said, whether the proposed
qemu_armv7a_tz_virtshould replace existing vexpress, I really cannot tell.
Quoted 6 lines
I never said to replace it! I said it should be as close as possible. IOW, any
difference between the tz defconfig and the vexpress defconfig should have a good reason. And that reason should be explained in the commit message.This reminds me: the defconfig should be named
qemu_arm_vexpress_tz_defconfig
so it is clear that it's a variant ofqemu_arm_vexpress_defconfig.
Ok, i'll change.
Quoted 23 lines
I would also tend to merge the readme with the existing
board/qemu/arm-vexpress/readme.txtbecause their content is a bit similar. But there are also reasons to split them (e.g., the script that scrapes the qemu launch command from the readme wouldn't work anymore).Quoted 14 lines
Enabling arm-trustzone in
Qemu (-machine secure=on) may drop features that the current vexpress supports (graphics?).Quoted 9 lines
[snip]
configs/qemu_armv7a_tz_virt_defconfig line 48
Quoted 4 lines
configs/qemu_armv7a_tz_virt_defconfig new file +4
-0+# Qemu emulator for the Arm target +BR2_PACKAGE_HOST_QEMU=y +BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y +BR2_PACKAGE_HOST_QEMU_VIRTFS=yWhy is this needed? AFAICS there is nothing special about the Buildroot-built
host-qemu, so the system-installed qemu should work just as well, no?Quoted 2 lines
By system-installed you mean the user OS, as my ubuntu, for example, where I run Buildroot builds and tests?
Quoted 8 lines
Indeed, that's what I mean.
Quoted 2 lines
I think it is a shame I need to install a specific version of Qemu on my host when Buildroot can produce the up-to-date Qemu tools.
Do you mean that trustzone emulation is a recent addition to qemu and is not
yet available in the version shipped with e.g. Ubuntu 18.04? That would indeed be a valid reason to build qemu. But is should be explained in the commit log.
Qemu supports Arm secure world since 2.6.0, and there were fixes merged since. Ubuntu 14.04 provides qemu 2.0.0.
Ubuntu-16.04 native qemu is 2.5.0.
Ubuntu 18.04 provides Qemu 2.11.1. I've not tested this later. Buildroot is synced with 3.1.0, latest Qemu revision.
Quoted 9 lines
Otherwise, we should be consistent with all our qemu defconfigs. I agree that
there is something to be said for building qemu as part of the defconfig. It would increase the build time, but probably not that much more compared to building the toolchain. But if we do this, it should be done for all qemu defconfigs, and the readme's should be updated.Regards,
Arnout
PATCH v2 7/8 testing: test can use the locally generated qemu host tool
In reply to Etienne CarriereThis change adds argument local to emulator boot method. When local is True, emulator.py runs the qemu host tool locally generated by the test. Otherwise the test uses the qemu host as found from PATH.
---
Changes v1 -> v2:
- No commit not in v1 series.
--- support/testing/infra/emulator.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
support/testing/infra/emulator.py +14 -2
@@ -1,5 +1,7 @@ import pexpect +import os + import infra
@@ -8,6 +10,7 @@ class Emulator(object): def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): self.qemu = None self.downloaddir = downloaddir + self.builddir = builddir self.logfile = infra.open_log_file(builddir, "run", logtofile) # We use elastic runners on the cloud to runs our tests. Those runners # can take a long time to run the emulator. Use a timeout multiplier
@@ -30,13 +33,22 @@ class Emulator(object): # # options: array of command line options to pass to Qemu # - def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): + # local: if True, the locally built qemu host tool is used instead of a + # qemu host tool found from the PATH. + # + def boot(self, arch, kernel=None, kernel_cmdline=None, options=None, + local=None): if arch in ["armv7", "armv5"]: qemu_arch = "arm" else: qemu_arch = arch - qemu_cmd = ["qemu-system-{}".format(qemu_arch), + if local: + basedir = os.path.join(self.builddir, "host/bin/") + else: + basedir = "" + + qemu_cmd = [basedir + "qemu-system-{}".format(qemu_arch), "-serial", "stdio", "-display", "none"]
Signature · 1 line
1.9.1
PATCH v2 7/8 testing: test can use the locally generated qemu host tool
Dear all,
I made this to allow test_optee to use the qemu config from the platform. But I wonder if it would be more suitable to have an generic option to script run-tests to build the emulator within the test config.
Your thoughts?
Best regards,
etienne
Quoted 62 lines · Etienne Carriere
This change adds argument local to emulator boot method. When local is True,
emulator.pyruns the qemu host tool locally generated by the test. Otherwise the test uses the qemu host as found from PATH.Signed-off-by Etienne Carriere <[email protected]>---
Changes v1 -> v2:
- No commit not in v1 series.--- support/testing/infra/emulator.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)support/testing/infra/emulator.py +14
-3@@ -1,5 +1,7 @@ import pexpect +import os + import infra@@ -8,6 +10,7 @@ class Emulator(object): def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): self.qemu = None self.downloaddir = downloaddir + self.builddir = builddir self.logfile = infra.open_log_file(builddir, "run", logtofile) # We use elastic runners on the cloud to runs our tests. Those runners # can take a long time to run the emulator. Use a timeout multiplier@@ -30,13 +33,22 @@ class Emulator(object): # # options: array of command line options to pass to Qemu # - def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): + # local: if True, the locally built qemu host tool is used instead of a + # qemu host tool found from the PATH. + # + def boot(self, arch, kernel=None, kernel_cmdline=None, options=None, + local=None): if arch in ["armv7", "armv5"]: qemu_arch = "arm" else: qemu_arch = arch - qemu_cmd = ["qemu-system-{}".format(qemu_arch), + if local: + basedir = os.path.join(self.builddir, "host/bin/") + else: + basedir = "" + + qemu_cmd = [basedir + "qemu-system-{}".format(qemu_arch), "-serial", "stdio", "-display", "none"] --1.9.1
PATCH v2 7/8 testing: test can use the locally generated qemu host tool
Quoted 3 lines · Etienne Carriere
I made this to allow
test_opteeto use the qemu config from the platform. But I wonder if it would be more suitable to have an generic option to script run-tests to build the emulator within the test config.
That would indeed be a better idea IMO.
support/testing/infra/emulator.py class Emulator(object): · line 53
Quoted 9 lines
support/testing/infra/emulator.py +6
-1- qemu_cmd = ["qemu-system-{}".format(qemu_arch), + if local: + basedir = os.path.join(self.builddir, "host/bin/") + else: + basedir = "" + + qemu_cmd = [basedir + "qemu-system-{}".format(qemu_arch), "-serial", "stdio", "-display", "none"]
Instead of constructing it like this, I think it would be simpler to always add
output/host/bin to PATH. Unfortunately, however, pexpect only respects the PATH setting of the env argument since version 4.2.0 [1], and we can't rely on the system-installed pexpect to have that version. So you have to mess about with os.environ (which you'd want to restore to the original after running qemu).
Regards,
Arnout
PATCH v2 7/8 testing: test can use the locally generated qemu host tool
Quoted 17 lines · Arnout Vandecappelle
Quoted 3 lines · Etienne Carriere
I made this to allow
test_opteeto use the qemu config from the platform. But I wonder if it would be more suitable to have an generic option to script run-tests to build the emulator within the test config.That would indeed be a better idea IMO.
support/testing/infra/emulator.py class Emulator(object): · line 53
Quoted 9 lines
support/testing/infra/emulator.py +6
-1- qemu_cmd = ["qemu-system-{}".format(qemu_arch), + if local: + basedir = os.path.join(self.builddir, "host/bin/") + else: + basedir = "" + + qemu_cmd = [basedir + "qemu-system-{}".format(qemu_arch), "-serial", "stdio", "-display", "none"]
Quoted 5 lines
Instead of constructing it like this, I think it would be simpler to always add
output/host/bin to PATH. Unfortunately, however, pexpect only respects the PATH setting of the env argument since version 4.2.0 [1], and we can't rely on the system-installed pexpect to have that version. So you have to mess about with os.environ (which you'd want to restore to the original after running qemu).
Playing with the PATH is not very handy and could make the test to use other thing in output/host/bin than only qemu.
Please see proposal in v3 (here https://patchwork.ozlabs.org/patch/1061031/).
Regards,
etienne
Quoted 5 lines
Regards,
Arnout
PATCH v2 8/8 support/testing: test_optee.py: test optee boot and testsuite
In reply to Etienne CarriereRun a Qemu emulation over qemu_armv7a_tz_virt_defconfig and run the embedded OP-TEE regression test suite (xtest).
Tool xtest dumps traces that contain '# ' (hash + space) which corrupts infra/emulator.py sequence which use such traces to find shell prompt when command is completed. To overcome the issue the xtest traces are shown only if the test failed.
One can run the test from something like:
$> ./support/testing/run-tests \
-o output/optee-runtest -d output/dwl \
tests.package.test_optee---
Changes v1 -> v2:
- Add argument local=True to test emulator to use the qemu host built from test configuration.
- Fix typo in trace "Silent test takes a while, be patient..."
--- support/testing/tests/package/test_optee.py | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 support/testing/tests/package/test_optee.py
support/testing/tests/package/test_optee.py new file +40 -0
@@ -0,0 +1,40 @@ +import os + +import infra.basetest + + +class TestOptee(infra.basetest.BRTest): + + with open(os.path.join(os.getcwd(), 'configs/qemu_armv7a_tz_virt_defconfig'), 'r') as config_file: + config = "".join(line for line in config_file if line[:1]!='#') + \ + """ + BR2_TOOLCHAIN_EXTERNAL=y + """ + + def test_run(self): + qemu_options = ['-machine', 'virt,secure=on'] + qemu_options.extend(['-cpu', 'cortex-a15']) + qemu_options.extend(['-m', '1024']) + qemu_options.extend(['-semihosting-config', 'enable,target=native']) + qemu_options.extend(['-bios', 'bl1.bin']) + + # Prepare env for Qemu/armv7a to find the boot images + os.chdir(os.path.join(self.builddir, 'images')) + if not os.path.exists('bl33.bin'): + os.symlink('u-boot.bin', 'bl33.bin') + if not os.path.exists('bl32.bin'): + os.symlink('tee-header_v2.bin', 'bl32.bin') + if not os.path.exists('bl32_extra1.bin'): + os.symlink('tee-pager_v2.bin', 'bl32_extra1.bin') + if not os.path.exists('bl32_extra2.bin'): + os.symlink('tee-pageable_v2.bin', 'bl32_extra2.bin') + + self.emulator.boot(arch='armv7', options=qemu_options, local=True) + self.emulator.login() + + # Trick test trace since it prints "# " and corrupts emulator run method + # Print test trace only if test fails. + cmd = 'echo "Silent test takes a while, be patient..."; ' + \ + 'xtest -t regression > /tmp/xtest.log || (cat /tmp/xtest.log && false)' + output, exit_code = self.emulator.run(cmd, timeout=240) + self.assertEqual(exit_code, 0)
Signature · 1 line
1.9.1
Thomas Petazzoni
AppliedPATCH v2 1/8 boot/arm-trusted-firmware: support 32bit Arm targets
In reply to Etienne CarriereQuoted 12 lines · On Tue, 19 Mar 2019 00:21:02 +0100 Etienne Carriere…
This change allows one to build the TF-A (Trusted Firmware A) for 32bit architectures Armv7 and Armv8 platforms. TF-A supports these configuration since release v1.5.
Change dependency on
BR2_aarch64into a dependency on either BR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A to better define the target architectures supported by the package.Set package configuration directive
ARM_ARCH_MAJORaccording to BR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A. Set package configuration directive ARCH based on BR2_aarch64/BR2_arm.
Quoted 5 lines
Signed-off-by Etienne Carriere <[email protected]>---
Changes v1 -> v2:
- SetARM_ARCH_MAJORand ARCH according to Buildroot directivesBR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A and BR2_aarch64/BR2_arm.
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com