April 2019 - U-Boot

[U-Boot] [PATCH] rk8xx: implement poweroff
by Urja Rannikko 28 Apr '19

28 Apr '19

Based on snooping around the linux kernel rk8xx driver, and tested to work on the ASUS C201. Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> --- This is really handy to be able to poweroff (without pressing power button for a long time) the C201 from u-boot, so i'm sending this as is. The thing that is bothering me is the pmic_get --- i checked that every rk8xx is named "pmic" in the device tree so it should work, but it just feels really weird that this seems to be the best way to access the driver... drivers/power/pmic/rk8xx.c | 34 ++++++++++++++++++++++++++++++++++ include/power/rk8xx_pmic.h | 4 ++++ 2 files changed, 38 insertions(+) diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 25c339ab12..c42e180e21 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -87,6 +87,40 @@ static int rk8xx_probe(struct udevice *dev) return 0; } +#if CONFIG_IS_ENABLED(CMD_POWEROFF) +/* NOTE: Should only enable this function if the rockchip,system-power-manager + * property is in the device tree node, but it is there in every board that has + * an rk8xx in u-boot currently, so this is left as an excercise for later. + */ + +int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + struct udevice *dev; + struct rk8xx_priv *priv; + u8 bits; + + /* "Hey, what would one name a pmic in the device tree..." */ + if (pmic_get("pmic", &dev) != 0) { + printf("pmic not found\n"); + return 1; + } + priv = dev_get_priv(dev); + + if (priv->variant == RK818_ID) + bits = DEV_OFF; + else + bits = DEV_OFF_RST; + + if (pmic_clrsetbits(dev, REG_DEVCTRL, 0, bits) != 0) { + printf("pmic_clrsetbits failed\n"); + return 1; + } + + printf("Poweroff apparently failed.\n"); + return 0; +} +#endif + static struct dm_pmic_ops rk8xx_ops = { .reg_count = rk8xx_reg_count, .read = rk8xx_read, diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h index c06248f751..565b35985e 100644 --- a/include/power/rk8xx_pmic.h +++ b/include/power/rk8xx_pmic.h @@ -177,6 +177,10 @@ enum { #define RK8XX_ID_MSK 0xfff0 +/* DEVCTRL bits for poweroff */ +#define DEV_OFF_RST BIT(3) +#define DEV_OFF BIT(0) + struct rk8xx_reg_table { char *name; u8 reg_ctl; -- 2.21.0

2 3

[U-Boot] [PATCH 1/2] disk: efi: unify code for finding a valid gpt
by Urja Rannikko 28 Apr '19

28 Apr '19

There were 3 copies of the same sequence, make it into a function. Signed-off-by: Urja Rannikko <urjaman(a)gmail.com> --- disk/part_efi.c | 73 +++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index 239455b816..5f935da4c2 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -51,6 +51,8 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba, static gpt_entry *alloc_read_gpt_entries(struct blk_desc *dev_desc, gpt_header *pgpt_head); static int is_pte_valid(gpt_entry * pte); +static int find_valid_gpt(struct blk_desc *dev_desc, gpt_header *gpt_head, + gpt_entry **pgpt_pte); static char *print_efiname(gpt_entry *pte) { @@ -192,19 +194,8 @@ int get_disk_guid(struct blk_desc * dev_desc, char *guid) unsigned char *guid_bin; /* This function validates AND fills in the GPT header and PTE */ - if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, - gpt_head, &gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid GPT ***\n", __func__); - if (is_gpt_valid(dev_desc, dev_desc->lba - 1, - gpt_head, &gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid Backup GPT ***\n", - __func__); - return -EINVAL; - } else { - printf("%s: *** Using Backup GPT ***\n", - __func__); - } - } + if (find_valid_gpt(dev_desc, gpt_head, &gpt_pte) != 1) + return -EINVAL; guid_bin = gpt_head->disk_guid.b; uuid_bin_to_str(guid_bin, guid, UUID_STR_FORMAT_GUID); @@ -221,19 +212,8 @@ void part_print_efi(struct blk_desc *dev_desc) unsigned char *uuid_bin; /* This function validates AND fills in the GPT header and PTE */ - if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, - gpt_head, &gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid GPT ***\n", __func__); - if (is_gpt_valid(dev_desc, (dev_desc->lba - 1), - gpt_head, &gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid Backup GPT ***\n", - __func__); - return; - } else { - printf("%s: *** Using Backup GPT ***\n", - __func__); - } - } + if (find_valid_gpt(dev_desc, gpt_head, &gpt_pte) != 1) + return; debug("%s: gpt-entry at %p\n", __func__, gpt_pte); @@ -282,19 +262,8 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part, } /* This function validates AND fills in the GPT header and PTE */ - if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, - gpt_head, &gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid GPT ***\n", __func__); - if (is_gpt_valid(dev_desc, (dev_desc->lba - 1), - gpt_head, &gpt_pte) != 1) { - printf("%s: *** ERROR: Invalid Backup GPT ***\n", - __func__); - return -1; - } else { - printf("%s: *** Using Backup GPT ***\n", - __func__); - } - } + if (find_valid_gpt(dev_desc, gpt_head, &gpt_pte) != 1) + return -1; if (part > le32_to_cpu(gpt_head->num_partition_entries) || !is_pte_valid(&gpt_pte[part - 1])) { @@ -981,6 +950,32 @@ static int is_gpt_valid(struct blk_desc *dev_desc, u64 lba, return 1; } +/** + * find_valid_gpt() - finds a valid GPT header and PTEs + * + * gpt is a GPT header ptr, filled on return. + * ptes is a PTEs ptr, filled on return. + * + * Description: returns 1 if found a valid gpt, 0 on error. + * If valid, returns pointers to PTEs. + */ +static int find_valid_gpt(struct blk_desc *dev_desc, gpt_header *gpt_head, + gpt_entry **pgpt_pte) +{ + if (is_gpt_valid(dev_desc, GPT_PRIMARY_PARTITION_TABLE_LBA, + gpt_head, pgpt_pte) != 1) { + printf("%s: *** ERROR: Invalid GPT ***\n", __func__); + if (is_gpt_valid(dev_desc, (dev_desc->lba - 1), + gpt_head, pgpt_pte) != 1) { + printf("%s: *** ERROR: Invalid Backup GPT ***\n", + __func__); + return 0; + } + printf("%s: *** Using Backup GPT ***\n", __func__); + } + return 1; +} + /** * alloc_read_gpt_entries(): reads partition entries from disk * @dev_desc -- 2.21.0

2 6

[U-Boot] [PATCH] rockchip: add Kever Yang as co-custodian
by Kever Yang 28 Apr '19

28 Apr '19

This updates MAINTAINERS and git-mailrc to add me as a co-custodian for rockchip Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- MAINTAINERS | 1 + doc/git-mailrc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8a4c5d4eab..6385811ef9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -230,6 +230,7 @@ F: arch/arm/mach-rmobile/ ARM ROCKCHIP M: Simon Glass <sjg(a)chromium.org> M: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> +M: Kever Yang <kever.yang(a)rock-chips.com> S: Maintained T: git git://git.denx.de/u-boot-rockchip.git F: arch/arm/include/asm/arch-rockchip/ diff --git a/doc/git-mailrc b/doc/git-mailrc index c2eee8c7d8..1db92257e3 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -26,6 +26,7 @@ alias iwamatsu Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> alias jaehoon Jaehoon Chung <jh80.chung(a)samsung.com> alias jagan Jagan Teki <jagan(a)openedev.com> alias jhersh Joe Hershberger <joe.hershberger(a)ni.com> +alias kevery Kever Yang <kever.yang(a)rock-chips.com> alias luka Luka Perkov <luka.perkov(a)sartura.hr> alias lukma Lukasz Majewski <lukma(a)denx.de> alias macpaul Macpaul Lin <macpaul(a)andestech.com> @@ -71,7 +72,7 @@ alias tegra2 tegra alias ti uboot, trini alias uniphier uboot, masahiro alias zynq uboot, monstr -alias rockchip uboot, sjg, Kever Yang <kever.yang(a)rock-chips.com>, ptomsich +alias rockchip uboot, sjg, kevery, ptomsich alias m68k uboot, alisonwang, angelo_ts alias coldfire m68k -- 2.20.1

4 5

[U-Boot] [PATCH 0/1] cmd: efidebug: rework "boot dump"
by AKASHI Takahiro 28 Apr '19

28 Apr '19

This patch is a spin-off from my "non-volatile support" patch[1]. [1] https://lists.denx.de/pipermail/u-boot/2019-April/366214.html Changes (Apr 26, 2019) * use memcmp() instead of u16_strncmp() * merge u16_isxdigit() and u16_tohex() into one function AKASHI Takahiro (1): cmd: efidebug: rework "boot dump" sub-command using GetNextVariableName() cmd/efidebug.c | 79 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 24 deletions(-) -- 2.20.1

2 2

[U-Boot] [PATCH] rockchip: make_fit_atf: Use BL31 environ variable for file location
by Emmanuel Vadot 28 Apr '19

28 Apr '19

Other make_fit script (like imx or sunxi) use the BL31 environment variable to indicate the location of the file. Also do that for rockchip so we don't need to copy the file in the source directory. Signed-off-by: Emmanuel Vadot <manu(a)freebsd.org> --- arch/arm/mach-rockchip/make_fit_atf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py index d1faff1957..7bf58e3dd1 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -194,7 +194,7 @@ def get_bl31_segments_info(bl31_file_name): def main(): uboot_elf="./u-boot" - bl31_elf="./bl31.elf" + bl31_elf=os.getenv("BL31", "./bl31.elf") FIT_ITS=sys.stdout opts, args = getopt.getopt(sys.argv[1:], "o:u:b:h") -- 2.20.1

7 11

[U-Boot] is "autoconfig.mk" simply a misspelling of "autoconf.mk"?
by Robert P. J. Day 28 Apr '19

28 Apr '19

was going over README.kconfig and noticed these references: $ grep -r autoconfig.mk * doc/README.kconfig: - spl/include/autoconfig.mk (generated by the old config for SPL) doc/README.kconfig: - tpl/include/autoconfig.mk (generated by the old config for TPL) doc/README.kconfig: macros used in makefiles, we can drop include/autoconfig.mk, which makes $ i see no historical references to anything named "autoconfig.mk" -- should i simply assume those are typos for "autoconf.mk"? can submit patch if so. rday

1 0

[U-Boot] [PATCH 0/2] ARM: defconfig: add Raspberry Pi 3 Model B+
by Heinrich Schuchardt 28 Apr '19

28 Apr '19

Updating the bcm283x device tree sources adds the device trees for - Raspberry Pi 3 Model A+ - Raspberry Pi 3 Model B+ - Raspberry Pi Compute Module IO board rev1 - Raspberry Pi Compute Module 3 IO board V3.0 - Raspberry Pi Zero Add a defconfig file for the Raspberry Pi 3 Model B+. Heinrich Schuchardt (2): fdt: update bcm283x device tree sources to Linux 5.1-rc6 state ARM: defconfig: add Raspberry Pi 3 Model B+ arch/arm/dts/Makefile | 13 +- arch/arm/dts/bcm2835-rpi-a-plus.dts | 15 +- arch/arm/dts/bcm2835-rpi-a.dts | 9 +- arch/arm/dts/bcm2835-rpi-b-plus.dts | 15 +- arch/arm/dts/bcm2835-rpi-b-rev2.dts | 11 +- arch/arm/dts/bcm2835-rpi-b.dts | 9 +- arch/arm/dts/bcm2835-rpi-cm1-io1.dts | 88 ++++++++++ arch/arm/dts/bcm2835-rpi-cm1.dtsi | 34 ++++ arch/arm/dts/bcm2835-rpi-zero-w.dts | 123 +++++++++++++- arch/arm/dts/bcm2835-rpi-zero.dts | 105 ++++++++++++ arch/arm/dts/bcm2835-rpi.dtsi | 22 +-- arch/arm/dts/bcm2835.dtsi | 7 +- arch/arm/dts/bcm2836-rpi-2-b.dts | 81 ++++++++- arch/arm/dts/bcm2836-rpi.dtsi | 6 + arch/arm/dts/bcm2836.dtsi | 25 +-- arch/arm/dts/bcm2837-rpi-3-a-plus.dts | 175 +++++++++++++++++++ arch/arm/dts/bcm2837-rpi-3-b-plus.dts | 178 ++++++++++++++++++++ arch/arm/dts/bcm2837-rpi-3-b.dts | 128 +++++++++++++- arch/arm/dts/bcm2837-rpi-cm3-io3.dts | 87 ++++++++++ arch/arm/dts/bcm2837-rpi-cm3.dtsi | 52 ++++++ arch/arm/dts/bcm2837.dtsi | 20 ++- arch/arm/dts/bcm283x-rpi-lan7515.dtsi | 41 +++++ arch/arm/dts/bcm283x-rpi-smsc9512.dtsi | 1 + arch/arm/dts/bcm283x-rpi-usb-otg.dtsi | 11 ++ arch/arm/dts/bcm283x.dtsi | 57 +++++-- configs/rpi_3_b_plus_defconfig | 43 +++++ include/dt-bindings/clock/bcm2835-aux.h | 10 +- include/dt-bindings/clock/bcm2835.h | 10 +- include/dt-bindings/net/microchip-lan78xx.h | 21 +++ include/dt-bindings/pinctrl/bcm2835.h | 8 +- include/dt-bindings/soc/bcm2835-pm.h | 28 +++ 31 files changed, 1333 insertions(+), 100 deletions(-) create mode 100644 arch/arm/dts/bcm2835-rpi-cm1-io1.dts create mode 100644 arch/arm/dts/bcm2835-rpi-cm1.dtsi create mode 100644 arch/arm/dts/bcm2835-rpi-zero.dts create mode 100644 arch/arm/dts/bcm2836-rpi.dtsi create mode 100644 arch/arm/dts/bcm2837-rpi-3-a-plus.dts create mode 100644 arch/arm/dts/bcm2837-rpi-3-b-plus.dts create mode 100644 arch/arm/dts/bcm2837-rpi-cm3-io3.dts create mode 100644 arch/arm/dts/bcm2837-rpi-cm3.dtsi create mode 100644 arch/arm/dts/bcm283x-rpi-lan7515.dtsi create mode 100644 arch/arm/dts/bcm283x-rpi-usb-otg.dtsi create mode 100644 configs/rpi_3_b_plus_defconfig create mode 100644 include/dt-bindings/net/microchip-lan78xx.h create mode 100644 include/dt-bindings/soc/bcm2835-pm.h -- 2.20.1

2 3

[U-Boot] [PATCH] fs: btrfs: fix false negatives in ROOT_ITEM search
by Pierre Bourdon 27 Apr '19

27 Apr '19

ROOT_ITEMs in btrfs are referenced without knowing their actual "offset" value. To perform these searches using only two items from the key, the btrfs driver uses a special "btrfs_search_tree_key_type" function. The algorithm used by that function to transform a 3-tuple search into a 2-tuple search was subtly broken, leading to items not being found if they were the first in their tree node. This commit fixes btrfs_search_tree_key_type to properly behave in these situations. Signed-off-by: Pierre Bourdon <delroth(a)gmail.com> Cc: Marek Behun <marek.behun(a)nic.cz> --- fs/btrfs/ctree.h | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 65c152a52f..ca44a2404d 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -292,20 +292,52 @@ btrfs_search_tree_key_type(const struct btrfs_root *root, u64 objectid, { struct btrfs_key key, *res; + /* + * In some cases (e.g. tree roots), we need to look for a given + * objectid and type without knowing the offset value (3rd element of a + * btrfs tree node key). We can rely on the fact that btrfs_search_tree + * returns the first element with key >= search_key, and then perform + * our own comparison between the returned element and the search key. + * + * It is tempting to use a search key with offset 0 to perform this + * "fuzzy search". This would return the first item with the (objectid, + * type) we're looking for. However, using offset 0 has the wrong + * behavior when the wanted item is the first in a leaf: since our + * search key will be lower than the wanted item, the recursive search + * will explore the wrong branch of the tree. + * + * Instead, use the largest possible offset (-1). The result of this + * search will either be: + * 1. An element with the (objectid, type) we're looking for, if it + * has offset -1 or if it is the last element in its leaf. + * 2. The first element *after* an element with the (objectid, type) + */ key.objectid = objectid; key.type = type; - key.offset = 0; + key.offset = -1; if (btrfs_search_tree(root, &key, path)) return NULL; - res = btrfs_path_leaf_key(path); - if (btrfs_comp_keys_type(&key, res)) { - btrfs_free_path(path); - return NULL; + /* + * Compare with the previous element first -- this is the likely case + * since the result of the search is only what we want if it had offset + * == -1 or if it was last in its leaf. + */ + if (path->slots[0] > 0) { + path->slots[0]--; + res = btrfs_path_leaf_key(path); + if (!btrfs_comp_keys_type(&key, res)) + return res; + path->slots[0]++; } - return res; + res = btrfs_path_leaf_key(path); + if (!btrfs_comp_keys_type(&key, res)) + return res; + + btrfs_free_path(path); + return NULL; } static inline u32 btrfs_path_item_size(struct btrfs_path *p) -- 2.19.2

2 5

[U-Boot] [PATCH v6 1/1] avb: add support for named persistent values
by Igor Opaniuk 27 Apr '19

27 Apr '19

AVB 2.0 spec. revision 1.1 introduces support for named persistent values that must be tamper evident and allows AVB to store arbitrary key-value pairs [1]. Introduce implementation of two additional AVB operations read_persistent_value()/write_persistent_value() for retrieving/storing named 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 Reviewed-by: Simon Glass <sjg(a)chromium.org> Reviewed-by: Sam Protsenko <semen.protsenko(a)linaro.org> Signed-off-by: Igor Opaniuk <igor.opaniuk(a)gmail.com> --- v6: - Add R-b tag v5: - fix failing test on sandbox_flattree target - keep all defined globally variables in a driver-private data struct, which permits to probe multiple tee sandbox devices v4: - extend tee sandbox tee driver to support persistent values - fix/re-test avb_persistent test on sandbox configuration v3: - fix possible mem lick in avb_read_persistent/avb_write_persistent - add additional sanity checks - cover avb read_pvalue/write_pvalue commands with python tests v2: - fix output format for avb read_pvalue/write_pvalue commands - fix issue with named value buffer size cmd/avb.c | 78 +++++++++++++++++++++++ common/avb_verify.c | 125 +++++++++++++++++++++++++++++++++++++ drivers/tee/sandbox.c | 121 +++++++++++++++++++++++++++++------ include/sandboxtee.h | 15 ++++- include/tee.h | 2 + include/tee/optee_ta_avb.h | 16 +++++ test/py/tests/test_avb.py | 16 +++++ 7 files changed, 351 insertions(+), 22 deletions(-) diff --git a/cmd/avb.c b/cmd/avb.c index ff00be4cee..c5af4a2e46 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; + char *endp; + + 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], &endp, 10); + if (*endp && *endp != '\n') + return CMD_RET_USAGE; + + buffer = malloc(bytes); + if (!buffer) + return CMD_RET_FAILURE; + + if (avb_ops->read_persistent_value(avb_ops, name, bytes, buffer, + &bytes_read) == AVB_IO_RESULT_OK) { + printf("Read %ld bytes, value = %s\n", bytes_read, + (char *)buffer); + free(buffer); + return CMD_RET_SUCCESS; + } + + printf("Failed to read persistent value\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]; + + if (avb_ops->write_persistent_value(avb_ops, name, strlen(value) + 1, + (const uint8_t *)value) == + AVB_IO_RESULT_OK) { + printf("Wrote %ld 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 a8c5a3e7db..32034d927c 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,123 @@ 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; + size_t name_size = strlen(name) + 1; + + 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, name_size, + 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, name_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 = name_size; + 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; + + if (param[1].u.memref.size > buffer_size) { + rc = AVB_IO_RESULT_ERROR_NO_SUCH_VALUE; + goto out; + } + + *out_num_bytes_read = param[1].u.memref.size; + + memcpy(out_buffer, shm_buf->addr, *out_num_bytes_read); + +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; + size_t name_size = strlen(name) + 1; + + 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, name_size, + 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, name_size); + 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 = name_size; + 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; + +out: + tee_shm_free(shm_buf); +free_name: + tee_shm_free(shm_name); + + return rc; +} /** * ============================================================================ * AVB2.0 AvbOps alloc/initialisation/free @@ -870,6 +991,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/drivers/tee/sandbox.c b/drivers/tee/sandbox.c index ccddb03e73..a136bc9609 100644 --- a/drivers/tee/sandbox.c +++ b/drivers/tee/sandbox.c @@ -14,6 +14,7 @@ * available. */ +static const u32 pstorage_max = 16; /** * struct ta_entry - TA entries * @uuid: UUID of an emulated TA @@ -24,8 +25,11 @@ */ struct ta_entry { struct tee_optee_ta_uuid uuid; - u32 (*open_session)(uint num_params, struct tee_param *params); - u32 (*invoke_func)(u32 func, uint num_params, struct tee_param *params); + u32 (*open_session)(struct udevice *dev, uint num_params, + struct tee_param *params); + u32 (*invoke_func)(struct udevice *dev, + u32 func, uint num_params, + struct tee_param *params); }; #ifdef CONFIG_OPTEE_TA_AVB @@ -59,10 +63,8 @@ bad_params: return TEE_ERROR_BAD_PARAMETERS; } -static u64 ta_avb_rollback_indexes[TA_AVB_MAX_ROLLBACK_LOCATIONS]; -static u32 ta_avb_lock_state; - -static u32 ta_avb_open_session(uint num_params, struct tee_param *params) +static u32 ta_avb_open_session(struct udevice *dev, uint num_params, + struct tee_param *params) { /* * We don't expect additional parameters when opening a session to @@ -73,12 +75,17 @@ static u32 ta_avb_open_session(uint num_params, struct tee_param *params) num_params, params); } -static u32 ta_avb_invoke_func(u32 func, uint num_params, +static u32 ta_avb_invoke_func(struct udevice *dev, u32 func, uint num_params, struct tee_param *params) { + struct sandbox_tee_state *state = dev_get_priv(dev); + ENTRY e, *ep; + char *name; u32 res; uint slot; u64 val; + char *value; + u32 value_sz; switch (func) { case TA_AVB_CMD_READ_ROLLBACK_INDEX: @@ -91,12 +98,12 @@ static u32 ta_avb_invoke_func(u32 func, uint num_params, return res; slot = params[0].u.value.a; - if (slot >= ARRAY_SIZE(ta_avb_rollback_indexes)) { + if (slot >= ARRAY_SIZE(state->ta_avb_rollback_indexes)) { printf("Rollback index slot out of bounds %u\n", slot); return TEE_ERROR_BAD_PARAMETERS; } - val = ta_avb_rollback_indexes[slot]; + val = state->ta_avb_rollback_indexes[slot]; params[1].u.value.a = val >> 32; params[1].u.value.b = val; return TEE_SUCCESS; @@ -111,16 +118,16 @@ static u32 ta_avb_invoke_func(u32 func, uint num_params, return res; slot = params[0].u.value.a; - if (slot >= ARRAY_SIZE(ta_avb_rollback_indexes)) { + if (slot >= ARRAY_SIZE(state->ta_avb_rollback_indexes)) { printf("Rollback index slot out of bounds %u\n", slot); return TEE_ERROR_BAD_PARAMETERS; } val = (u64)params[1].u.value.a << 32 | params[1].u.value.b; - if (val < ta_avb_rollback_indexes[slot]) + if (val < state->ta_avb_rollback_indexes[slot]) return TEE_ERROR_SECURITY; - ta_avb_rollback_indexes[slot] = val; + state->ta_avb_rollback_indexes[slot] = val; return TEE_SUCCESS; case TA_AVB_CMD_READ_LOCK_STATE: @@ -132,7 +139,7 @@ static u32 ta_avb_invoke_func(u32 func, uint num_params, if (res) return res; - params[0].u.value.a = ta_avb_lock_state; + params[0].u.value.a = state->ta_avb_lock_state; return TEE_SUCCESS; case TA_AVB_CMD_WRITE_LOCK_STATE: @@ -144,13 +151,64 @@ static u32 ta_avb_invoke_func(u32 func, uint num_params, if (res) return res; - if (ta_avb_lock_state != params[0].u.value.a) { - ta_avb_lock_state = params[0].u.value.a; - memset(ta_avb_rollback_indexes, 0, - sizeof(ta_avb_rollback_indexes)); + if (state->ta_avb_lock_state != params[0].u.value.a) { + state->ta_avb_lock_state = params[0].u.value.a; + memset(state->ta_avb_rollback_indexes, 0, + sizeof(state->ta_avb_rollback_indexes)); } return TEE_SUCCESS; + case TA_AVB_CMD_READ_PERSIST_VALUE: + res = check_params(TEE_PARAM_ATTR_TYPE_MEMREF_INPUT, + TEE_PARAM_ATTR_TYPE_MEMREF_INOUT, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + num_params, params); + if (res) + return res; + + name = params[0].u.memref.shm->addr; + + value = params[1].u.memref.shm->addr; + value_sz = params[1].u.memref.size; + + e.key = name; + e.data = NULL; + hsearch_r(e, FIND, &ep, &state->pstorage_htab, 0); + if (!ep) + return TEE_ERROR_ITEM_NOT_FOUND; + + value_sz = strlen(ep->data); + memcpy(value, ep->data, value_sz); + + return TEE_SUCCESS; + case TA_AVB_CMD_WRITE_PERSIST_VALUE: + res = check_params(TEE_PARAM_ATTR_TYPE_MEMREF_INPUT, + TEE_PARAM_ATTR_TYPE_MEMREF_INPUT, + TEE_PARAM_ATTR_TYPE_NONE, + TEE_PARAM_ATTR_TYPE_NONE, + num_params, params); + if (res) + return res; + + name = params[0].u.memref.shm->addr; + + value = params[1].u.memref.shm->addr; + value_sz = params[1].u.memref.size; + + e.key = name; + e.data = NULL; + hsearch_r(e, FIND, &ep, &state->pstorage_htab, 0); + if (ep) + hdelete_r(e.key, &state->pstorage_htab, 0); + + e.key = name; + e.data = value; + hsearch_r(e, ENTER, &ep, &state->pstorage_htab, 0); + if (!ep) + return TEE_ERROR_OUT_OF_MEMORY; + + return TEE_SUCCESS; default: return TEE_ERROR_NOT_SUPPORTED; @@ -225,7 +283,7 @@ static int sandbox_tee_open_session(struct udevice *dev, return 0; } - arg->ret = ta->open_session(num_params, params); + arg->ret = ta->open_session(dev, num_params, params); arg->ret_origin = TEE_ORIGIN_TRUSTED_APP; if (!arg->ret) { @@ -261,7 +319,7 @@ static int sandbox_tee_invoke_func(struct udevice *dev, return -EINVAL; } - arg->ret = ta->invoke_func(arg->func, num_params, params); + arg->ret = ta->invoke_func(dev, arg->func, num_params, params); arg->ret_origin = TEE_ORIGIN_TRUSTED_APP; return 0; @@ -285,6 +343,29 @@ static int sandbox_tee_shm_unregister(struct udevice *dev, struct tee_shm *shm) return 0; } +static int sandbox_tee_remove(struct udevice *dev) +{ + struct sandbox_tee_state *state = dev_get_priv(dev); + + hdestroy_r(&state->pstorage_htab); + + return 0; +} + +static int sandbox_tee_probe(struct udevice *dev) +{ + struct sandbox_tee_state *state = dev_get_priv(dev); + /* + * With this hastable we emulate persistent storage, + * which should contain persistent values + * between different sessions/command invocations. + */ + if (!hcreate_r(pstorage_max, &state->pstorage_htab)) + return TEE_ERROR_OUT_OF_MEMORY; + + return 0; +} + static const struct tee_driver_ops sandbox_tee_ops = { .get_version = sandbox_tee_get_version, .open_session = sandbox_tee_open_session, @@ -305,4 +386,6 @@ U_BOOT_DRIVER(sandbox_tee) = { .of_match = sandbox_tee_match, .ops = &sandbox_tee_ops, .priv_auto_alloc_size = sizeof(struct sandbox_tee_state), + .probe = sandbox_tee_probe, + .remove = sandbox_tee_remove, }; diff --git a/include/sandboxtee.h b/include/sandboxtee.h index 44f653d9cf..419643a024 100644 --- a/include/sandboxtee.h +++ b/include/sandboxtee.h @@ -6,16 +6,25 @@ #ifndef __SANDBOXTEE_H #define __SANDBOXTEE_H +#include <search.h> +#include <tee/optee_ta_avb.h> + /** * struct sandbox_tee_state - internal state of the sandbox TEE - * @session: current open session - * @num_shms: number of registered shared memory objects - * @ta: Trusted Application of current session + * @session: current open session + * @num_shms: number of registered shared memory objects + * @ta: Trusted Application of current session + * @ta_avb_rollback_indexes TA avb rollback indexes storage + * @ta_avb_lock_state TA avb lock state storage + * @pstorage_htab named persistent values storage */ struct sandbox_tee_state { u32 session; int num_shms; void *ta; + u64 ta_avb_rollback_indexes[TA_AVB_MAX_ROLLBACK_LOCATIONS]; + u32 ta_avb_lock_state; + struct hsearch_data pstorage_htab; }; #endif /*__SANDBOXTEE_H*/ diff --git a/include/tee.h b/include/tee.h index edd9f9b0c9..02bcd9e703 100644 --- a/include/tee.h +++ b/include/tee.h @@ -43,7 +43,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 074386af19..949875a64c 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 + * out 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 */ diff --git a/test/py/tests/test_avb.py b/test/py/tests/test_avb.py index e70a010c9a..2bb75ed6e2 100644 --- a/test/py/tests/test_avb.py +++ b/test/py/tests/test_avb.py @@ -116,3 +116,19 @@ def test_avb_mmc_read(u_boot_console): response = u_boot_console.run_command('cmp 0x%x 0x%x 40' % (temp_addr, temp_addr2)) assert response.find('64 word') + + +(a)pytest.mark.buildconfigspec('cmd_avb') +(a)pytest.mark.buildconfigspec('optee_ta_avb') +def test_avb_persistent_values(u_boot_console): + """Test reading/writing persistent storage to avb + """ + + response = u_boot_console.run_command('avb init %s' % str(mmc_dev)) + assert response == '' + + response = u_boot_console.run_command('avb write_pvalue test value_value') + assert response == 'Wrote 12 bytes' + + response = u_boot_console.run_command('avb read_pvalue test 12') + assert response == 'Read 12 bytes, value = value_value' -- 2.17.1

2 1

[U-Boot] Please pull u-boot-marvell/master
by Stefan Roese 27 Apr '19

27 Apr '19

Hi Tom, please pull the following Marvell and watchdog related patches: ---------------------------------------------------------------- - Add DM based generic watchdog start and reset implementation and remove all ad-hoc implementations (Stefan) - Move mv_sdhci to DM (Pierre) - Misc turris_omnia updates (Pierre) - Change openrd targets to correctly build again (size changes and fixes to the dts targets) and bring it back into Travis builds (Stefan) - Add Kirkwood db-88f6281-bp board (Chris) ---------------------------------------------------------------- Here the Travis build, without any issues: https://travis-ci.org/stroese/u-boot/builds/524793378 Thanks, Stefan The following changes since commit 7d994067424776b6184872b82fcaf4c0b95528f9: Merge tag 'pull-24apr19' of git://git.denx.de/u-boot-dm (2019-04-24 12:27:29 -0400) are available in the Git repository at: git://www.denx.de/git/u-boot-marvell.git for you to fetch changes up to b684d4031b38b6b6a9e22676c7c6e2770e767cc7: arm: kirkwood: openrd: Mark openrd boards as maintained again (2019-04-26 09:16:32 +0200) ---------------------------------------------------------------- Chris Packham (2): ARM: kirkwood: add db-88f6281-bp board ARM: kirkwood: enable CONFIG_DM_USB on db-88f6281-bp Michael Walle (1): arm: kirkwood: lsxl: add note about sata in README Pierre Bourdon (3): arm: mvebu: turris_omnia: fix eeprom/mcu device names mmc: mv_sdhci: add driver model support arm: mvebu: turris_omnia: use MMC driver model Stefan Roese (9): arm: kirkwood: dts: Add openrd-* dtb makefile build targets arm: kirkwood: openrd: Remove superfluous CONFIG_ENV_ADDR arm: kirkwood: openrd: Increase U-Boot size in flash to make it fit arm: mvebu: turris_omnia: Use thumb instructions in SPL to save space watchdog: Implement generic watchdog_reset() version watchdog: cadence: Remove driver specific "timeout-sec" handling watchdog: mpc8xx_wdt: Watchdog driver and macros cleanup watchdog: at91sam9_wdt: Remove now superfluous wdt start and reset arm: kirkwood: openrd: Mark openrd boards as maintained again .travis.yml | 4 +- arch/arm/dts/Makefile | 5 + arch/arm/dts/kirkwood-db-88f6281-spi.dts | 48 ++++++++++ arch/arm/dts/kirkwood-db-88f6281.dts | 26 ++++++ arch/arm/dts/kirkwood-db.dtsi | 94 +++++++++++++++++++ arch/arm/mach-at91/clock.c | 45 --------- arch/arm/mach-at91/include/mach/at91_wdt.h | 2 - arch/arm/mach-kirkwood/Kconfig | 4 + arch/arm/mach-mvebu/cpu.c | 2 +- arch/arm/mach-mvebu/include/mach/cpu.h | 2 + arch/mips/mach-mt7620/cpu.c | 36 ------- arch/powerpc/Kconfig | 2 +- arch/powerpc/cpu/mpc8xx/Kconfig | 6 +- board/CZ.NIC/turris_mox/turris_mox.c | 30 ------ board/CZ.NIC/turris_omnia/turris_omnia.c | 39 +------- board/Marvell/db-88f6281-bp/.gitignore | 1 + board/Marvell/db-88f6281-bp/Kconfig | 12 +++ board/Marvell/db-88f6281-bp/MAINTAINERS | 10 ++ board/Marvell/db-88f6281-bp/Makefile | 12 +++ board/Marvell/db-88f6281-bp/db-88f6281-bp.c | 103 +++++++++++++++++++++ board/Marvell/db-88f6281-bp/kwbimage.cfg.in | 36 +++++++ board/Marvell/openrd/MAINTAINERS | 4 +- board/alliedtelesis/x530/x530.c | 36 +------ board/buffalo/lsxl/README | 10 ++ .../xilinx/microblaze-generic/microblaze-generic.c | 40 -------- board/xilinx/zynq/board.c | 39 -------- board/xilinx/zynqmp/zynqmp.c | 39 -------- common/board_r.c | 4 + common/spl/spl.c | 5 + configs/db-88f6281-bp-nand_defconfig | 54 +++++++++++ configs/db-88f6281-bp-spi_defconfig | 56 +++++++++++ configs/gardena-smart-gateway-at91sam_defconfig | 2 - configs/turris_omnia_defconfig | 4 +- drivers/mmc/mv_sdhci.c | 67 +++++++++++++- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/Makefile | 2 +- drivers/watchdog/at91sam9_wdt.c | 8 -- drivers/watchdog/cdns_wdt.c | 15 ++- drivers/watchdog/mpc8xx_wdt.c | 4 +- drivers/watchdog/wdt-uclass.c | 26 ++++++ include/asm-generic/global_data.h | 4 + include/configs/db-88f6281-bp.h | 99 ++++++++++++++++++++ include/configs/openrd.h | 3 +- include/configs/turris_omnia.h | 5 - include/wdt.h | 41 ++++++++ 45 files changed, 743 insertions(+), 345 deletions(-) create mode 100644 arch/arm/dts/kirkwood-db-88f6281-spi.dts create mode 100644 arch/arm/dts/kirkwood-db-88f6281.dts create mode 100644 arch/arm/dts/kirkwood-db.dtsi create mode 100644 board/Marvell/db-88f6281-bp/.gitignore create mode 100644 board/Marvell/db-88f6281-bp/Kconfig create mode 100644 board/Marvell/db-88f6281-bp/MAINTAINERS create mode 100644 board/Marvell/db-88f6281-bp/Makefile create mode 100644 board/Marvell/db-88f6281-bp/db-88f6281-bp.c create mode 100644 board/Marvell/db-88f6281-bp/kwbimage.cfg.in create mode 100644 configs/db-88f6281-bp-nand_defconfig create mode 100644 configs/db-88f6281-bp-spi_defconfig create mode 100644 include/configs/db-88f6281-bp.h

2 1