January 2019 - U-Boot

[U-Boot] [PATCH 1/1] efi_selftest: SNP unit test on sandbox
by Heinrich Schuchardt 05 Jan '19

05 Jan '19

Running the simple network protocol test on the sandbox requires setting the environment variable ethact to a network interface connected to a DHCP server and ethrotate to 'no'. So let's make it an on-request test on the sandbox (selectable by setting environment variable efi_selftest). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/efi_selftest_snp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/efi_selftest/efi_selftest_snp.c b/lib/efi_selftest/efi_selftest_snp.c index e10a34ba64..f1e23c4921 100644 --- a/lib/efi_selftest/efi_selftest_snp.c +++ b/lib/efi_selftest/efi_selftest_snp.c @@ -427,4 +427,12 @@ EFI_UNIT_TEST(snp) = { .setup = setup, .execute = execute, .teardown = teardown, +#ifdef CONFIG_SANDBOX + /* + * Running this test on the sandbox requires setting environment + * variable ethact to a network interface connected to a DHCP server and + * ethrotate to 'no'. + */ + .on_request = true, +#endif }; -- 2.20.1

1 0

[U-Boot] [PATCH] env: check defines if config env is in spi flash
by Oskari Lemmela 05 Jan '19

05 Jan '19

Check config environment defines if CONFIG_ENV_IS_IN_SPI_FLASH is defined Signed-off-by: Oskari Lemmela <oskari(a)lemmela.net> --- include/environment.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/include/environment.h b/include/environment.h index 7da1291d5b..d486c8899b 100644 --- a/include/environment.h +++ b/include/environment.h @@ -21,6 +21,19 @@ * *************************************************************************/ +#if defined(CONFIG_ENV_IS_IN_FLASH) || defined(CONFIG_ENV_IS_IN_SPI_FLASH) +# if defined(CONFIG_ENV_SECT_SIZE) || defined(CONFIG_ENV_SIZE) +# ifndef CONFIG_ENV_SECT_SIZE +# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE +# endif +# ifndef CONFIG_ENV_SIZE +# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE +# endif +# else +# error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined" +# endif +#endif + #if defined(CONFIG_ENV_IS_IN_FLASH) # ifndef CONFIG_ENV_ADDR # define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET) @@ -32,16 +45,6 @@ # define CONFIG_ENV_ADDR_REDUND \ (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND) # endif -# if defined(CONFIG_ENV_SECT_SIZE) || defined(CONFIG_ENV_SIZE) -# ifndef CONFIG_ENV_SECT_SIZE -# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE -# endif -# ifndef CONFIG_ENV_SIZE -# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -# endif -# else -# error "Both CONFIG_ENV_SECT_SIZE and CONFIG_ENV_SIZE undefined" -# endif # if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND) # define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE # endif -- 2.17.1

1 0

[U-Boot] [PATCH v2 1/1] altera_pio: fix get_value
by Julien Béraud 05 Jan '19

05 Jan '19

gpio_get_value should return 0 or 1, not 1 << pin Signed-off-by: Julien Beraud <julien.beraud(a)orolia.com> --- drivers/gpio/altera_pio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 59e30979f0..324f9c29a8 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -56,7 +56,7 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin) struct altera_pio_platdata *plat = dev_get_platdata(dev); struct altera_pio_regs *const regs = plat->regs; - return readl(&regs->data) & (1 << pin); + return !!(readl(&regs->data) & (1 << pin)); } -- 2.20.1

2 1

[U-Boot] [PATCH 1/1] altera_pio: fix get_value
by Julien Béraud 05 Jan '19

05 Jan '19

gpio_get_value should return 0 or 1, not 1 << pin Signed-off-by: Julien Beraud <julien.beraud(a)orolia.com> --- drivers/gpio/altera_pio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/altera_pio.c b/drivers/gpio/altera_pio.c index 59e30979f0..997c32e56d 100644 --- a/drivers/gpio/altera_pio.c +++ b/drivers/gpio/altera_pio.c @@ -56,7 +56,7 @@ static int altera_pio_get_value(struct udevice *dev, unsigned pin) struct altera_pio_platdata *plat = dev_get_platdata(dev); struct altera_pio_regs *const regs = plat->regs; - return readl(&regs->data) & (1 << pin); + return (readl(&regs->data) >> pin) & 1; } -- 2.20.1

3 4

[U-Boot] New mirror: mirror.cyberbits.eu
by root＠cyberbits.eu 05 Jan '19

05 Jan '19

Hi, I've set up a new mirror for U-Boot. It syncs from ftp://ftp.denx.de/pub/u-boot/ twice a day and is available via HTTP and HTTPS at: - http://mirror.cyberbits.eu/u-boot/ - https://mirror.cyberbits.eu/u-boot/ The machines are located in France. You can find more information at <https://mirror.cyberbits.eu/> - please let me know if you have any questions. Cheers, Ced

1 0

[U-Boot] [PATCH v1 00/14] dm: Convert TPC70 to use DM and DTS in SPL and u-boot proper
by Lukasz Majewski 05 Jan '19

05 Jan '19

This patch series converts imx6q based tpc70 board to use driver model and device tree description in SPL and u-boot proper. All the non-DM parts of the code has been removed. This patch series also has several early DM issues fixed for imx6q - for example the pinctrl static definitions. Also, the anatop clock is now setup in a generic imx6q clock code. Lukasz Majewski (14): tpc70: config: Add script commands to update u-boot and OE's wic tpc70: config: Update TPC70 config to support eMMC's boot0 SPL update tpc70: Provide board_boot_order() function to distinct between eMMC and SD boot DTS: imx: Remove not needed '#address-cells' and '#size-cells' properties board: cosmetic: Use define to set ENET clock selection mask on TPC70 DM: tpc70: led: Enable LED default state pinctrl: imx: Replace static soc info definitions with run time allocations DTS: imx: Add "u-boot,dm-pre-reloc" property to relevant imx6qdl nodes imx: serial: dm: Enable DM_FLAG_PRE_RELOC in the IMX uart driver imx: clock: Introduce set_fec_clock() to configure ETH clock (imx6) DM: net: imx: Provide weak function to initialize fec clocks imx: mmc: Use 'fsl,usdhc-index' property to provide esdhc controller number DTS: imx: tpc70: Add TPC70 board (imx6q based) device tree description imx: tpc70: Convert TPC70 (imx6q based) board to use DM/DTS in SPL and u-boot arch/arm/dts/imx6q-kp.dts | 227 ++++++++++++++++++++++++++++++ arch/arm/dts/imx6q.dtsi | 4 - arch/arm/dts/imx6qdl.dtsi | 14 +- arch/arm/include/asm/arch-mx6/clock.h | 1 + arch/arm/mach-imx/mx6/Kconfig | 10 ++ arch/arm/mach-imx/mx6/clock.c | 17 +++ board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 177 +---------------------- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 137 ++---------------- configs/kp_imx6q_tpc_defconfig | 31 +++- drivers/mmc/fsl_esdhc.c | 17 ++- drivers/net/fec_mxc.c | 25 ++++ drivers/net/fec_mxc.h | 2 + drivers/pinctrl/nxp/pinctrl-imx6.c | 39 +++-- drivers/serial/serial_mxc.c | 2 - include/configs/kp_imx6q_tpc.h | 47 ++++--- 15 files changed, 393 insertions(+), 357 deletions(-) create mode 100644 arch/arm/dts/imx6q-kp.dts -- 2.11.0

3 50

[U-Boot] [PATCH] cmd: image_info: Add checking of default FIT config
by Bryan O'Donoghue 05 Jan '19

05 Jan '19

This patch adds a check for the default FIT config to iminfo. Once applied any signing of the config will show a pass fail similar to rsa+/rsa-. Output looks like this: Hash(es) for Image 0 (kernel@1): sha1+ Hash(es) for Image 1 (fdt(a)imx7s-warp.dtb): sha1+ Hash(es) for Image 2 (ramdisk@1): sha1+ Hash(es) for Image 3 (bootscr): sha1+ Hash for default configuration: sha1,rsa2048:mbl-fit-rot-key+ Signed-off-by: Bryan O'Donoghue <bryan.odonoghue(a)linaro.org> Cc: Jun Nie <jun.nie(a)linaro.org> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- cmd/bootm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/cmd/bootm.c b/cmd/bootm.c index c3a063474a..b3bd236165 100644 --- a/cmd/bootm.c +++ b/cmd/bootm.c @@ -244,6 +244,9 @@ static int do_iminfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) static int image_info(ulong addr) { +#if defined(CONFIG_FIT) + int cfg_noffset; +#endif void *hdr = (void *)addr; printf("\n## Checking Image at %08lx ...\n", addr); @@ -294,6 +297,20 @@ static int image_info(ulong addr) return 1; } + cfg_noffset = fit_conf_get_node(hdr, NULL); + if (!cfg_noffset) { + printf("Could not find configuration node: %s\n", + fdt_strerror(cfg_noffset)); + return 1; + } + + puts(" Hash for default configuration: "); + if (fit_config_verify(hdr, cfg_noffset)) { + puts("Unable to verify default fit config\n"); + return 1; + } + puts("\n"); + return 0; #endif default: -- 2.20.0

2 1

[U-Boot] U-Boot 2019.01-rc1-00337-g42cc2cf partition table issues on imx6
by Petr Štetiar 05 Jan '19

05 Jan '19

Hi, I'm having problems with my bootscript which works on 2018.03 but is having problems on latest master. I need to run `mmc part` to get it working. U-Boot 2019.01-rc1-00337-g42cc2cf (Dec 16 2018 - 01:02:22 +0100) Model: Toradex Apalis iMX6 Quad 2GB IT V1.1A, Serial# 04875944 # mmc dev 0 switch to partitions #0, OK mmc0(part 0) is current device # load mmc 0:1 ${loadaddr} ${script} ** No partition table - mmc 0 ** # mmc part Partition Map for MMC device 0 -- Partition Type: DOS Part Start Sector Num Sectors UUID Type 1 2048 32768 5452574f-01 83 Boot 2 36864 524288 5452574f-02 83a # load mmc 0:1 ${loadaddr} ${script} 641 bytes read in 26 ms (23.4 KiB/s) Same problem with `ext4ls`: # mmc dev 0 switch to partitions #0, OK mmc0(part 0) is current device # ext4ls mmc 0:1 ** No partition table - mmc 0 ** # mmc part Partition Map for MMC device 0 -- Partition Type: DOS Part Start Sector Num Sectors UUID Type 1 2048 32768 5452574f-01 83 Boot 2 36864 524288 5452574f-02 83 # ext4ls mmc 0:1 <DIR> 4096 . <DIR> 4096 .. <DIR> 4096 lost+found 641 boot.scr 47312 imx6q-apalis-ixora.dtb 2521736 uImage -- ynezz

2 2

[U-Boot] [PATCH] dm: MIGRATION: Update migration plan for SPI/SPI_FLASH
by Jagan Teki 05 Jan '19

05 Jan '19

- v2019.04 for no dm conversion drivers - v2019.07 for partially converted drivers. Note: there were many updates on this deadline, so better not update this again. Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- Makefile | 9 +++++++++ doc/driver-model/MIGRATION.txt | 10 +++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5683714947..3ff1e98723 100644 --- a/Makefile +++ b/Makefile @@ -954,6 +954,15 @@ ifeq ($(CONFIG_OF_EMBED),y) @echo "CONFIG_OF_SEPARATE for boards in mainline." @echo "See doc/README.fdt-control for more info." @echo "====================================================" +endif +ifneq ($(CONFIG_DM_SPI)$(CONFIG_DM_SPI_FLASH)$(CONFIG_OF_CONTROL),yyy) + @echo >&2 "===================== WARNING ======================" + @echo >&2 "This board does not use CONFIG_DM_SPI and CONFIG_DM_SPI_FLASH." + @echo >&2 "Please update the board before v2019.04 for no dm convertion" + @echo >&2 "and v2019.07 for partially dm converted drivers." + @echo >&2 "Failure to update can lead to driver/board removal" + @echo >&2 "See doc/driver-model/MIGRATION.txt for more info." + @echo >&2 "====================================================" endif @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt index dce4aa3e1d..4fc75f07b6 100644 --- a/doc/driver-model/MIGRATION.txt +++ b/doc/driver-model/MIGRATION.txt @@ -55,9 +55,6 @@ CONFIG_DM_SPI_FLASH Board Maintainers should submit the patches for enabling DM_SPI and DM_SPI_FLASH to move the migration with in the deadline. -Status: In progress -Deadline: 2018.09 - No dm conversion yet: drivers/spi/cf_spi.c drivers/spi/fsl_espi.c @@ -69,6 +66,9 @@ No dm conversion yet: drivers/spi/sh_spi.c drivers/spi/soft_spi_legacy.c + Status: In progress + Deadline: 2019.04 + Partially converted: drivers/spi/atcspi200_spi.c drivers/spi/davinci_spi.c @@ -79,6 +79,10 @@ Partially converted: drivers/spi/omap3_spi.c drivers/spi/ti_qspi.c + Status: In progress + Deadline: 2019.07 + -- Jagan Teki <jagan(a)openedev.com> +12/14/2018 03/14/2018 -- 2.18.0.321.gffc6fa0e3

2 1

[U-Boot] [PATCH 1/1] avb2.0: add support for named persistent values
by Igor Opaniuk 05 Jan '19

05 Jan '19

AVB 1.1 introduces support for named persistent values which must be tamper evident and allows AVB to store arbitrary key-value pairs [1]. Introduce two additional Avb operations read_persistent_value()/ write_persistent_value() for retrieving/storing names persistent values. Correspondent pull request in the OP-TEE OS project repo [2]. [1]: https://android.googlesource.com/platform/external/avb/+/android-9.0.0_r22 [2]: https://github.com/OP-TEE/optee_os/pull/2699 Signed-off-by: Igor Opaniuk <igor.opaniuk(a)linaro.org> --- cmd/avb.c | 78 +++++++++++++++++++++++++++++ common/avb_verify.c | 122 +++++++++++++++++++++++++++++++++++++++++++++ include/tee.h | 2 + include/tee/optee_ta_avb.h | 16 ++++++ 4 files changed, 218 insertions(+) diff --git a/cmd/avb.c b/cmd/avb.c index ff00be4..1df13a2 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -340,6 +340,76 @@ int do_avb_is_unlocked(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; } +int do_avb_read_pvalue(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + const char *name; + size_t bytes; + size_t bytes_read; + void *buffer; + + if (!avb_ops) { + printf("AVB 2.0 is not initialized, run 'avb init' first\n"); + return CMD_RET_FAILURE; + } + + if (argc != 3) + return CMD_RET_USAGE; + + name = argv[1]; + bytes = simple_strtoul(argv[2], NULL, 16); + buffer = malloc(bytes); + if (!buffer) + return CMD_RET_FAILURE; + + printf("Reading persistent value, name = %s, bytes = %zu\n", + name, bytes); + if (avb_ops->read_persistent_value(avb_ops, name, bytes, buffer, + &bytes_read) == AVB_IO_RESULT_OK) { + printf("Read %zu bytes, value = %s\n", bytes_read, + (char *)buffer); + free(buffer); + return CMD_RET_SUCCESS; + } + + printf("Failed to write in partition\n"); + + free(buffer); + + return CMD_RET_FAILURE; +} + +int do_avb_write_pvalue(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + const char *name; + const char *value; + + if (!avb_ops) { + printf("AVB 2.0 is not initialized, run 'avb init' first\n"); + return CMD_RET_FAILURE; + } + + if (argc != 3) + return CMD_RET_USAGE; + + name = argv[1]; + value = argv[2]; + + printf("Writing persistent value, name = %s, value = %s\n", + name, value); + if (avb_ops->write_persistent_value(avb_ops, name, strlen(value) + 1, + (const uint8_t *)value) == + AVB_IO_RESULT_OK) { + printf("Wrote %zu bytes\n", strlen(value) + 1); + return CMD_RET_SUCCESS; + } + + printf("Failed to write persistent value\n"); + + return CMD_RET_FAILURE; +} + static cmd_tbl_t cmd_avb[] = { U_BOOT_CMD_MKENT(init, 2, 0, do_avb_init, "", ""), U_BOOT_CMD_MKENT(read_rb, 2, 0, do_avb_read_rb, "", ""), @@ -350,6 +420,10 @@ static cmd_tbl_t cmd_avb[] = { U_BOOT_CMD_MKENT(read_part_hex, 4, 0, do_avb_read_part_hex, "", ""), U_BOOT_CMD_MKENT(write_part, 5, 0, do_avb_write_part, "", ""), U_BOOT_CMD_MKENT(verify, 1, 0, do_avb_verify_part, "", ""), +#ifdef CONFIG_OPTEE_TA_AVB + U_BOOT_CMD_MKENT(read_pvalue, 3, 0, do_avb_read_pvalue, "", ""), + U_BOOT_CMD_MKENT(write_pvalue, 3, 0, do_avb_write_pvalue, "", ""), +#endif }; static int do_avb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -384,6 +458,10 @@ U_BOOT_CMD( " partition <partname> and print to stdout\n" "avb write_part <partname> <offset> <num> <addr> - write <num> bytes to\n" " <partname> by <offset> using data from <addr>\n" +#ifdef CONFIG_OPTEE_TA_AVB + "avb read_pvalue <name> <bytes> - read a persistent value <name>\n" + "avb write_pvalue <name> <value> - write a persistent value <name>\n" +#endif "avb verify - run verification process using hash data\n" " from vbmeta structure\n" ); diff --git a/common/avb_verify.c b/common/avb_verify.c index a8c5a3e..c92e73c 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -647,6 +647,10 @@ static AvbIOResult invoke_func(struct AvbOpsData *ops_data, u32 func, return AVB_IO_RESULT_OK; case TEE_ERROR_OUT_OF_MEMORY: return AVB_IO_RESULT_ERROR_OOM; + case TEE_ERROR_STORAGE_NO_SPACE: + return AVB_IO_RESULT_ERROR_INSUFFICIENT_SPACE; + case TEE_ERROR_ITEM_NOT_FOUND: + return AVB_IO_RESULT_ERROR_NO_SUCH_VALUE; case TEE_ERROR_TARGET_DEAD: /* * The TA has paniced, close the session to reload the TA @@ -847,6 +851,120 @@ static AvbIOResult get_size_of_partition(AvbOps *ops, return AVB_IO_RESULT_OK; } +static AvbIOResult read_persistent_value(AvbOps *ops, + const char *name, + size_t buffer_size, + u8 *out_buffer, + size_t *out_num_bytes_read) +{ + AvbIOResult rc; + struct tee_shm *shm_name; + struct tee_shm *shm_buf; + struct tee_param param[2]; + struct udevice *tee; + + if (get_open_session(ops->user_data)) + return AVB_IO_RESULT_ERROR_IO; + + tee = ((struct AvbOpsData *)ops->user_data)->tee; + + rc = tee_shm_alloc(tee, strlen(name) + 1, + TEE_SHM_ALLOC, &shm_name); + if (rc) + return AVB_IO_RESULT_ERROR_OOM; + + rc = tee_shm_alloc(tee, buffer_size, + TEE_SHM_ALLOC, &shm_buf); + if (rc) { + rc = AVB_IO_RESULT_ERROR_OOM; + goto free_name; + } + + memcpy(shm_name->addr, name, strlen(name) + 1); + + memset(param, 0, sizeof(param)); + param[0].attr = TEE_PARAM_ATTR_TYPE_MEMREF_INPUT; + param[0].u.memref.shm = shm_name; + param[0].u.memref.size = strlen(name) + 1; + param[1].attr = TEE_PARAM_ATTR_TYPE_MEMREF_INOUT; + param[1].u.memref.shm = shm_buf; + param[1].u.memref.size = buffer_size; + + rc = invoke_func(ops->user_data, TA_AVB_CMD_READ_PERSIST_VALUE, + 2, param); + if (rc) + goto out; + + *out_num_bytes_read = param[0].u.memref.size; + + memcpy(out_buffer, shm_buf->addr, *out_num_bytes_read); + + return AVB_IO_RESULT_OK; + +out: + tee_shm_free(shm_buf); +free_name: + tee_shm_free(shm_name); + + return rc; +} + +static AvbIOResult write_persistent_value(AvbOps *ops, + const char *name, + size_t value_size, + const u8 *value) +{ + AvbIOResult rc; + struct tee_shm *shm_name; + struct tee_shm *shm_buf; + struct tee_param param[2]; + struct udevice *tee; + + if (get_open_session(ops->user_data)) + return AVB_IO_RESULT_ERROR_IO; + + tee = ((struct AvbOpsData *)ops->user_data)->tee; + + if (!value_size) + return AVB_IO_RESULT_ERROR_NO_SUCH_VALUE; + + rc = tee_shm_alloc(tee, strlen(name) + 1, + TEE_SHM_ALLOC, &shm_name); + if (rc) + return AVB_IO_RESULT_ERROR_OOM; + + rc = tee_shm_alloc(tee, value_size, + TEE_SHM_ALLOC, &shm_buf); + if (rc) { + rc = AVB_IO_RESULT_ERROR_OOM; + goto free_name; + } + + memcpy(shm_name->addr, name, strlen(name) + 1); + memcpy(shm_buf->addr, value, value_size); + + memset(param, 0, sizeof(param)); + param[0].attr = TEE_PARAM_ATTR_TYPE_MEMREF_INPUT; + param[0].u.memref.shm = shm_name; + param[0].u.memref.size = strlen(name) + 1; + param[1].attr = TEE_PARAM_ATTR_TYPE_MEMREF_INPUT; + param[1].u.memref.shm = shm_buf; + param[1].u.memref.size = value_size; + + rc = invoke_func(ops->user_data, TA_AVB_CMD_WRITE_PERSIST_VALUE, + 2, param); + if (rc) + goto out; + + return AVB_IO_RESULT_OK; + +out: + tee_shm_free(shm_buf); +free_name: + tee_shm_free(shm_name); + + return rc; +} /** * ============================================================================ * AVB2.0 AvbOps alloc/initialisation/free @@ -870,6 +988,10 @@ AvbOps *avb_ops_alloc(int boot_device) ops_data->ops.read_is_device_unlocked = read_is_device_unlocked; ops_data->ops.get_unique_guid_for_partition = get_unique_guid_for_partition; +#ifdef CONFIG_OPTEE_TA_AVB + ops_data->ops.write_persistent_value = write_persistent_value; + ops_data->ops.read_persistent_value = read_persistent_value; +#endif ops_data->ops.get_size_of_partition = get_size_of_partition; ops_data->mmc_dev = boot_device; diff --git a/include/tee.h b/include/tee.h index 98b1c9c..69de924 100644 --- a/include/tee.h +++ b/include/tee.h @@ -42,7 +42,9 @@ #define TEE_ERROR_COMMUNICATION 0xffff000e #define TEE_ERROR_SECURITY 0xffff000f #define TEE_ERROR_OUT_OF_MEMORY 0xffff000c +#define TEE_ERROR_OVERFLOW 0xffff300f #define TEE_ERROR_TARGET_DEAD 0xffff3024 +#define TEE_ERROR_STORAGE_NO_SPACE 0xffff3041 #define TEE_ORIGIN_COMMS 0x00000002 #define TEE_ORIGIN_TEE 0x00000003 diff --git a/include/tee/optee_ta_avb.h b/include/tee/optee_ta_avb.h index 074386a..ef84488 100644 --- a/include/tee/optee_ta_avb.h +++ b/include/tee/optee_ta_avb.h @@ -45,4 +45,20 @@ */ #define TA_AVB_CMD_WRITE_LOCK_STATE 3 +/* + * Reads a persistent value corresponding to the given name. + * + * in params[0].u.memref: persistent value name + * ioout params[1].u.memref: read persistent value buffer + */ +#define TA_AVB_CMD_READ_PERSIST_VALUE 4 + +/* + * Writes a persistent value corresponding to the given name. + * + * in params[0].u.memref: persistent value name + * in params[1].u.memref: persistent value buffer to write + */ +#define TA_AVB_CMD_WRITE_PERSIST_VALUE 5 + #endif /* __TA_AVB_H */ -- 2.7.4

2 1