July 2023 - U-Boot

[PATCH V2 00/19] doc: board: ti: Cleanup documentation
by Nishanth Menon 27 Jul '23

27 Jul '23

As requested in the thread[1] and irc[2], this series cleansup board/ti documentation a bit. Highlights: * Reuse from k3.rst sources and build instructions at the same time satisfy needs of users to have a single page documentation on all the steps needed to build for a given platform. * Replace ascii diagrams with actual svg diagrams (I have used a mix of drawio and inkscape to develop these, though inkscape should be sufficient to keep it updated). This also allows reuse based on common patterns. * Convert all pending tables into list-tables * Add information for folks who are looking for board information incontext of the documentation itself. (ever wondered what board is this documentation talking about?) Changes from V1: * Document update to drop ARCH=arm and various fixes identified during review of V1 * Added a couple of patches (sorting board names and adding labels to reuse-memory maps) * Few reviewed by pickups from Neha and Tom * 3 new patches (bootflow cleanup, sorting boards in alpha order and labels to reuse memory map) V1: https://lore.kernel.org/all/20230727080027.2817701-1-nm@ti.com/ Nishanth Menon (19): doc: board: ti: Optimize sources references doc: board: ti: am62x/j7200: Update with common boot flow diagram doc: board: ti: am65x: Update with boot flow diagram doc: board: ti: j721e: Update with boot flow diagram doc: board: ti: k3: Reuse build instructions doc: board: ti: j7200: Convert the image format to svg doc: board: ti: j721e: Convert the image format to svg doc: board: ti: am65x: Convert the image format to svg doc: board: ti: am62x: Convert the image format to svg doc: board: ti: am62x_sk: Add labels to reuse memory map doc: board: ti: am62x_sk: Convert switch settings to list tables doc: board: ti: j7200_evm: Convert switch settings to list tables doc: board: ti: am65x_evm: Convert the UART boot responsibility to list table doc: board: ti: am65/j721e: Convert OSPI memory map to svg doc: board: ti: am65x_evm: Convert the emmc layout to svg doc: board: ti: j7200_evm: Convert the emmc layout to svg doc: board: ti: *: Add platform information doc: board: ti: k3: Sort the boards in alphabetical order board: ti: k3: Convert boot flow ascii flow to svg doc/board/ti/am62x_sk.rst | 243 +- doc/board/ti/am65x_evm.rst | 298 +-- doc/board/ti/img/boot_diagram_am65.svg | 1779 +++++++++++++++ doc/board/ti/img/boot_diagram_j721e.svg | 2012 +++++++++++++++++ doc/board/ti/img/boot_diagram_k3_current.svg | 1925 ++++++++++++++++ doc/board/ti/img/boot_flow_01.svg | 220 ++ doc/board/ti/img/boot_flow_02.svg | 459 ++++ doc/board/ti/img/boot_flow_03.svg | 583 +++++ doc/board/ti/img/dm_tispl.bin.svg | 317 +++ doc/board/ti/img/emmc_am65x_evm_boot0.svg | 748 ++++++ doc/board/ti/img/emmc_j7200_evm_boot01.svg | 662 ++++++ doc/board/ti/img/emmc_j7200_evm_udafs.svg | 505 +++++ doc/board/ti/img/j7200_tiboot3.bin.svg | 447 ++++ doc/board/ti/img/multi_cert_tiboot3.bin.svg | 287 +++ .../ti/img/no_multi_cert_tiboot3.bin.svg | 238 ++ doc/board/ti/img/nodm_tispl.bin.svg | 277 +++ doc/board/ti/img/ospi_sysfw.svg | 721 ++++++ doc/board/ti/img/sysfw.itb.svg | 317 +++ doc/board/ti/j7200_evm.rst | 298 +-- doc/board/ti/j721e_evm.rst | 267 +-- doc/board/ti/k3.rst | 136 +- 21 files changed, 11895 insertions(+), 844 deletions(-) create mode 100644 doc/board/ti/img/boot_diagram_am65.svg create mode 100644 doc/board/ti/img/boot_diagram_j721e.svg create mode 100644 doc/board/ti/img/boot_diagram_k3_current.svg create mode 100644 doc/board/ti/img/boot_flow_01.svg create mode 100644 doc/board/ti/img/boot_flow_02.svg create mode 100644 doc/board/ti/img/boot_flow_03.svg create mode 100644 doc/board/ti/img/dm_tispl.bin.svg create mode 100644 doc/board/ti/img/emmc_am65x_evm_boot0.svg create mode 100644 doc/board/ti/img/emmc_j7200_evm_boot01.svg create mode 100644 doc/board/ti/img/emmc_j7200_evm_udafs.svg create mode 100644 doc/board/ti/img/j7200_tiboot3.bin.svg create mode 100644 doc/board/ti/img/multi_cert_tiboot3.bin.svg create mode 100644 doc/board/ti/img/no_multi_cert_tiboot3.bin.svg create mode 100644 doc/board/ti/img/nodm_tispl.bin.svg create mode 100644 doc/board/ti/img/ospi_sysfw.svg create mode 100644 doc/board/ti/img/sysfw.itb.svg [1] https://lore.kernel.org/all/20230726164942.GW3630934@bill-the-cat/ [2] https://libera.irclog.whitequark.org/u-boot/2023-07-26 Regards, Nishanth Menon -- 2.40.0

1 19

[PATCH 1/2] net: phy: Factor out PHY GPIO reset code
by Marek Vasut 27 Jul '23

27 Jul '23

Pull the PHY GPIO reset code into separate function, since this is and will be reused multiple times. Set up default reset assert and deassert timing to generous 20ms and 1ms for maximum compatibility in case those DT properties are missing. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Marek Vasut <marek.vasut+renesas(a)mailbox.org> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Nishanth Menon <nm(a)ti.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> --- drivers/net/phy/ethernet_id.c | 37 ++++----------------------- drivers/net/phy/phy.c | 47 +++++++++++++++++++++++++++++++++++ include/phy.h | 9 +++++++ 3 files changed, 61 insertions(+), 32 deletions(-) diff --git a/drivers/net/phy/ethernet_id.c b/drivers/net/phy/ethernet_id.c index 877a51c3d00..0beafaae46a 100644 --- a/drivers/net/phy/ethernet_id.c +++ b/drivers/net/phy/ethernet_id.c @@ -18,12 +18,11 @@ struct phy_device *phy_connect_phy_id(struct mii_dev *bus, struct udevice *dev, { struct phy_device *phydev; struct ofnode_phandle_args phandle_args; - struct gpio_desc gpio; const char *node_name; struct udevice *pdev; - ofnode node; - u32 id, assert, deassert; u16 vendor, device; + ofnode node; + u32 id; int ret; if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, @@ -41,35 +40,9 @@ struct phy_device *phy_connect_phy_id(struct mii_dev *bus, struct udevice *dev, return NULL; } - if (!IS_ENABLED(CONFIG_DM_ETH_PHY)) { - ret = gpio_request_by_name_nodev(node, "reset-gpios", 0, &gpio, - GPIOD_IS_OUT | GPIOD_ACTIVE_LOW); - if (!ret) { - assert = ofnode_read_u32_default(node, - "reset-assert-us", 0); - deassert = ofnode_read_u32_default(node, - "reset-deassert-us", - 0); - ret = dm_gpio_set_value(&gpio, 1); - if (ret) { - dev_err(dev, - "Failed assert gpio, err: %d\n", ret); - return NULL; - } - - udelay(assert); - - ret = dm_gpio_set_value(&gpio, 0); - if (ret) { - dev_err(dev, - "Failed deassert gpio, err: %d\n", - ret); - return NULL; - } - - udelay(deassert); - } - } + ret = phy_gpio_reset(dev); + if (ret) + return NULL; id = vendor << 16 | device; phydev = phy_device_create(bus, phyaddr, id, false); diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index ae21acb059b..3d69c2c4d28 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -18,6 +18,8 @@ #include <phy.h> #include <errno.h> #include <asm/global_data.h> +#include <asm/gpio.h> +#include <dm/device_compat.h> #include <dm/of_extra.h> #include <linux/bitops.h> #include <linux/delay.h> @@ -799,6 +801,51 @@ int miiphy_reset(const char *devname, unsigned char addr) return phy_reset(phydev); } +int phy_gpio_reset(struct udevice *dev) +{ + struct ofnode_phandle_args phandle_args; + struct gpio_desc gpio; + u32 assert, deassert; + ofnode node; + int ret; + + ret = dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, + &phandle_args); + /* No PHY handle is OK */ + if (ret) + return 0; + + node = phandle_args.node; + if (!ofnode_valid(node)) + return -EINVAL; + + ret = gpio_request_by_name_nodev(node, "reset-gpios", 0, &gpio, + GPIOD_IS_OUT | GPIOD_ACTIVE_LOW); + /* No PHY reset GPIO is OK */ + if (ret) + return 0; + + assert = ofnode_read_u32_default(node, "reset-assert-us", 20000); + deassert = ofnode_read_u32_default(node, "reset-deassert-us", 1000); + ret = dm_gpio_set_value(&gpio, 1); + if (ret) { + dev_err(dev, "Failed assert gpio, err: %d\n", ret); + return ret; + } + + udelay(assert); + + ret = dm_gpio_set_value(&gpio, 0); + if (ret) { + dev_err(dev, "Failed deassert gpio, err: %d\n", ret); + return ret; + } + + udelay(deassert); + + return 0; +} + struct phy_device *phy_find_by_mask(struct mii_dev *bus, uint phy_mask) { /* Reset the bus */ diff --git a/include/phy.h b/include/phy.h index f023a3c2685..6fe397be1fe 100644 --- a/include/phy.h +++ b/include/phy.h @@ -188,6 +188,15 @@ int phy_init(void); */ int phy_reset(struct phy_device *phydev); +/** + * phy_gpio_reset() - Resets the specified PHY using GPIO reset + * Toggles the optional PHY reset GPIO + * + * @dev: PHY udevice to reset + * @return: 0 if OK, -ve on error + */ +int phy_gpio_reset(struct udevice *dev); + /** * phy_find_by_mask() - Searches for a PHY on the specified MDIO bus * The function checks the PHY addresses flagged in phy_mask and returns a -- 2.39.2

3 4

[tom.rini@gmail.com: Fwd: New Defects reported by Coverity Scan for Das U-Boot]
by Tom Rini 27 Jul '23

27 Jul '23

Here's the latest report. ---------- Forwarded message --------- From: <scan-admin(a)coverity.com> Date: Tue, Jul 25, 2023 at 5:29 PM Subject: New Defects reported by Coverity Scan for Das U-Boot To: <tom.rini(a)gmail.com> Hi, Please find the latest report on new defect(s) introduced to Das U-Boot found with Coverity Scan. 5 new defect(s) introduced to Das U-Boot found with Coverity Scan. 30 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 5 of 5 defect(s) ** CID 463147: Insecure data handling (TAINTED_SCALAR) ________________________________________________________________________________________________________ *** CID 463147: Insecure data handling (TAINTED_SCALAR) /common/fdt_support.c: 1115 in fdt_copy_fixed_partitions() 1109 res = fdt_setprop_string(blob, suboff, "label", 1110 ofnode_read_string(subnode, "label")); 1111 if (res) 1112 return res; 1113 1114 reg = ofnode_get_property(subnode, "reg", &len); >>> CID 463147: Insecure data handling (TAINTED_SCALAR) >>> Passing tainted expression "len" to "fdt_setprop", which uses it as an offset. 1115 res = fdt_setprop(blob, suboff, "reg", reg, len); 1116 if (res) 1117 return res; 1118 } 1119 1120 /* go to next fixed-partitions node */ ** CID 463146: Null pointer dereferences (NULL_RETURNS) ________________________________________________________________________________________________________ *** CID 463146: Null pointer dereferences (NULL_RETURNS) /common/fdt_support.c: 1115 in fdt_copy_fixed_partitions() 1109 res = fdt_setprop_string(blob, suboff, "label", 1110 ofnode_read_string(subnode, "label")); 1111 if (res) 1112 return res; 1113 1114 reg = ofnode_get_property(subnode, "reg", &len); >>> CID 463146: Null pointer dereferences (NULL_RETURNS) >>> Dereferencing a pointer that might be "NULL" "reg" when calling "fdt_setprop". 1115 res = fdt_setprop(blob, suboff, "reg", reg, len); 1116 if (res) 1117 return res; 1118 } 1119 1120 /* go to next fixed-partitions node */ ** CID 463145: Error handling issues (CHECKED_RETURN) /lib/efi_loader/efi_firmware.c: 176 in efi_firmware_get_lsv_from_dtb() ________________________________________________________________________________________________________ *** CID 463145: Error handling issues (CHECKED_RETURN) /lib/efi_loader/efi_firmware.c: 176 in efi_firmware_get_lsv_from_dtb() 170 fdt_for_each_subnode(offset, fdt, parent) { 171 efi_guid_t guid; 172 173 guid_str = fdt_getprop(fdt, offset, "image-type-id", &len); 174 if (!guid_str) 175 continue; >>> CID 463145: Error handling issues (CHECKED_RETURN) >>> Calling "uuid_str_to_bin" without checking return value (as is done elsewhere 7 out of 8 times). 176 uuid_str_to_bin(guid_str, guid.b, UUID_STR_FORMAT_GUID); 177 178 val = fdt_getprop(fdt, offset, "image-index", &len); 179 if (!val) 180 continue; 181 index = fdt32_to_cpu(*val); ** CID 463144: (CHECKED_RETURN) /boot/expo.c: 257 in expo_apply_theme() /boot/expo.c: 258 in expo_apply_theme() /boot/expo.c: 259 in expo_apply_theme() ________________________________________________________________________________________________________ *** CID 463144: (CHECKED_RETURN) /boot/expo.c: 257 in expo_apply_theme() 251 struct expo_theme *theme = &exp->theme; 252 int ret; 253 254 log_debug("Applying theme %s\n", ofnode_get_name(node)); 255 256 memset(theme, '\0', sizeof(struct expo_theme)); >>> CID 463144: (CHECKED_RETURN) >>> Calling "ofnode_read_u32" without checking return value (as is done elsewhere 33 out of 41 times). 257 ofnode_read_u32(node, "font-size", &theme->font_size); 258 ofnode_read_u32(node, "menu-inset", &theme->menu_inset); 259 ofnode_read_u32(node, "menuitem-gap-y", &theme->menuitem_gap_y); 260 261 list_for_each_entry(scn, &exp->scene_head, sibling) { 262 ret = scene_apply_theme(scn, theme); /boot/expo.c: 258 in expo_apply_theme() 252 int ret; 253 254 log_debug("Applying theme %s\n", ofnode_get_name(node)); 255 256 memset(theme, '\0', sizeof(struct expo_theme)); 257 ofnode_read_u32(node, "font-size", &theme->font_size); >>> CID 463144: (CHECKED_RETURN) >>> Calling "ofnode_read_u32" without checking return value (as is done elsewhere 33 out of 41 times). 258 ofnode_read_u32(node, "menu-inset", &theme->menu_inset); 259 ofnode_read_u32(node, "menuitem-gap-y", &theme->menuitem_gap_y); 260 261 list_for_each_entry(scn, &exp->scene_head, sibling) { 262 ret = scene_apply_theme(scn, theme); 263 if (ret) /boot/expo.c: 259 in expo_apply_theme() 253 254 log_debug("Applying theme %s\n", ofnode_get_name(node)); 255 256 memset(theme, '\0', sizeof(struct expo_theme)); 257 ofnode_read_u32(node, "font-size", &theme->font_size); 258 ofnode_read_u32(node, "menu-inset", &theme->menu_inset); >>> CID 463144: (CHECKED_RETURN) >>> Calling "ofnode_read_u32" without checking return value (as is done elsewhere 33 out of 41 times). 259 ofnode_read_u32(node, "menuitem-gap-y", &theme->menuitem_gap_y); 260 261 list_for_each_entry(scn, &exp->scene_head, sibling) { 262 ret = scene_apply_theme(scn, theme); 263 if (ret) 264 return log_msg_ret("app", ret); 265 } 266 267 return 0; ** CID 463143: Control flow issues (DEADCODE) /test/dm/part.c: 124 in do_get_info_test() ________________________________________________________________________________________________________ *** CID 463143: Control flow issues (DEADCODE) /test/dm/part.c: 124 in do_get_info_test() 118 119 memset(&p, 0, sizeof(p)); 120 121 ret = part_get_info_by_type(dev_desc, part, part_type, &p); 122 printf("part_get_info_by_type(%d, 0x%x) = %d\n", part, part_type, ret); 123 if (ut_assertok(ret)) { >>> CID 463143: Control flow issues (DEADCODE) >>> Execution cannot reach this statement: "return 0;". 124 return 0; 125 } 126 127 ut_asserteq(reference->start, p.start); 128 ut_asserteq(reference->size, p.size); 129 ut_asserteq(reference->sys_ind, p.sys_ind); ________________________________________________________________________________________________________

1 0

[PATCH v4 0/9] spl: Use common function for loading/parsing images
by Sean Anderson 27 Jul '23

27 Jul '23

This series adds support for loading all image types (Legacy, FIT (with and without LOAD_FIT_FULL), and i.MX) to the MMC, SPI, NOR, NET, FAT, and EXT load methods. It does this by introducing a helper function which handles the minutiae of invoking the proper parsing function, and reading the rest of the image. Hopefully, this will make it easier for load methods to support all image types that U-Boot supports, without having undocumented unsupported image types. I applied this to several loaders which were invoking spl_load_simple_fit and/or spl_parse_image_header, but I did not use it with others (e.g. DFU/RAM) which had complications in the mix. Here's some bloat-o-meter for j7200_evm_a72_defconfig with ext4 support enabled: add/remove: 1/0 grow/shrink: 2/4 up/down: 356/-260 (96) Function old new delta spl_load - 308 +308 spl_fit_read 60 104 +44 spl_load_image_ext 364 368 +4 spl_nor_load_image 120 108 -12 spl_load_image_fat 320 256 -64 spl_spi_load_image 304 236 -68 spl_mmc_load 716 600 -116 Total: Before=233350, After=233446, chg +0.04% ext4 support is +48 bytes, because the original image support was so bare-bones (just legacy/raw images). For most boards with a few load methods (where one of them isn't ext4), this series should be +100 bytes. However, in the worst case this series will add 300 bytes. I have only tested EXT, FAT, and MMC raw loaders. Please try booting your favorite board with NOR/SPI flash or SPI falcon mode. Changes in v4: - Fix format specifiers in debug prints - Reword/fix some of the doc comments for spl_load - Rebase on u-boot/master Changes in v3: - Fix using ffs instead of fls - Fix using not initializing bl_len when info->filename was NULL - Fix failing on success Changes in v2: - Use reverse-xmas-tree style for locals in spl_simple_read. This is not complete, since overhead depends on bl_mask. - Convert semihosting as well - Consolidate spi_load_image_os into spl_spi_load_image Sean Anderson (9): spl: Add generic spl_load function spl: Convert ext to use spl_load spl: Convert fat to spl_load spl: Convert mmc to spl_load spl: Convert net to spl_load spl: Convert nor to spl_load spl: Convert semihosting to spl_load spl: Convert spi to spl_load spl: spi: Consolidate spi_load_image_os into spl_spi_load_image common/spl/spl.c | 68 ++++++++++++++++++ common/spl/spl_ext.c | 24 +++++-- common/spl/spl_fat.c | 40 +++-------- common/spl/spl_mmc.c | 73 ++----------------- common/spl/spl_net.c | 24 ++----- common/spl/spl_nor.c | 39 ++-------- common/spl/spl_semihosting.c | 39 +++++----- common/spl/spl_spi.c | 136 ++++++++++------------------------- include/spl.h | 29 +++++++- 9 files changed, 192 insertions(+), 280 deletions(-) -- 2.35.1.1320.gc452695387.dirty

2 11

[PULL] u-boot-usb/master
by Marek Vasut 27 Jul '23

27 Jul '23

The following changes since commit 0274eb61e1f2a8e053fb028b6c668c67c0b75b9c: Merge tag 'efi-2023-10-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi (2023-07-20 10:19:04 -0400) are available in the Git repository at: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to 3aba92c9dd2302a91b56d49791041766dcc7dfeb: usb: xhci: Fix double free on failure (2023-07-27 03:59:38 +0200) ---------------------------------------------------------------- Ravi Gunasekaran (1): usb: cdns3: gadget: Configure speed in udc_start Richard Habeeb (1): usb: xhci: Fix double free on failure Tim Harvey (1): usb: ehci-mx6: remove unnecessary regulator enable from probe drivers/usb/cdns3/gadget.c | 4 ++++ drivers/usb/host/ehci-mx6.c | 16 ---------------- drivers/usb/host/xhci.c | 1 - 3 files changed, 4 insertions(+), 17 deletions(-)

2 1

[PATCH v4.1 10/9] spl: Convert NVMe to spl_load
by Sean Anderson 27 Jul '23

27 Jul '23

This converts the blk load method (used exclusively by NVMe) to use spl_load. As a consequence, it also adds support for LOAD_FIT_FULL and IMX images. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- As suggested by Heinrich. common/spl/spl_blk_fs.c | 62 ++++++++++------------------------------- 1 file changed, 14 insertions(+), 48 deletions(-) diff --git a/common/spl/spl_blk_fs.c b/common/spl/spl_blk_fs.c index d97adc4d39a..a0992f3838a 100644 --- a/common/spl/spl_blk_fs.c +++ b/common/spl/spl_blk_fs.c @@ -50,6 +50,12 @@ int spl_blk_load_image(struct spl_image_info *spl_image, loff_t actlen, filesize; struct blk_dev dev; int ret; + struct spl_load_info load = { + .read = spl_fit_read, + .bl_len = 1, + .filename = filename, + .priv = &dev, + }; blk_desc = blk_get_devnum_by_uclass_id(uclass_id, devnum); if (!blk_desc) { @@ -75,6 +81,13 @@ int spl_blk_load_image(struct spl_image_info *spl_image, goto out; } + ret = fs_size(filename, &filesize); + if (ret) { + printf("spl: unable to get file size: %s. Err - %d\n", + filename, ret); + goto out; + } + ret = fs_read(filename, (ulong)header, 0, sizeof(struct legacy_img_hdr), &actlen); if (ret) { @@ -83,52 +96,5 @@ int spl_blk_load_image(struct spl_image_info *spl_image, goto out; } - if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && - image_get_magic(header) == FDT_MAGIC) { - struct spl_load_info load; - - debug("Found FIT\n"); - load.read = spl_fit_read; - load.bl_len = 1; - load.filename = (void *)filename; - load.priv = &dev; - - return spl_load_simple_fit(spl_image, &load, 0, header); - } - - ret = spl_parse_image_header(spl_image, bootdev, header); - if (ret) { - printf("spl: unable to parse image header. Err - %d\n", - ret); - goto out; - } - - ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); - if (ret) { - printf("spl: unable to set blk_dev %s %s. Err - %d\n", - dev.ifname, dev.dev_part_str, ret); - goto out; - } - - ret = fs_size(filename, &filesize); - if (ret) { - printf("spl: unable to get file size: %s. Err - %d\n", - filename, ret); - goto out; - } - - ret = fs_set_blk_dev(dev.ifname, dev.dev_part_str, FS_TYPE_ANY); - if (ret) { - printf("spl: unable to set blk_dev %s %s. Err - %d\n", - dev.ifname, dev.dev_part_str, ret); - goto out; - } - - ret = fs_read(filename, (ulong)spl_image->load_addr, 0, filesize, - &actlen); - if (ret) - printf("spl: unable to read file %s. Err - %d\n", - filename, ret); -out: - return ret; + return spl_load(spl_image, bootdev, &load, header, filesize, 0); } -- 2.35.1.1320.gc452695387.dirty

2 2

[PATCH] efi_loader: fix an IS_ERR() vs NULL check
by Dan Carpenter 27 Jul '23

27 Jul '23

The efi_parse_pkcs7_header() function returns NULL on error so the check for IS_ERR() should be changed to a NULL check. Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- lib/efi_loader/efi_capsule.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c index 7a6f195cbc02..c98cff812f10 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -368,9 +368,8 @@ efi_status_t efi_capsule_authenticate(const void *capsule, efi_uintn_t capsule_s auth_hdr->auth_info.hdr.dwLength - sizeof(auth_hdr->auth_info), &buf); - if (IS_ERR(capsule_sig)) { + if (!capsule_sig) { debug("Parsing variable's pkcs7 header failed\n"); - capsule_sig = NULL; goto out; } -- 2.39.2

3 5

Trying to boot JH7110 RISCV-V CPU from MMC
by Roland Ruckerbauer 27 Jul '23

27 Jul '23

Hi! I am trying to use upstream u-boot + opensbi, to boot my visionfive2 SBC I got from external SD card. I had not much luck with the vendor provided images / tools, they seem to have a lot of hard coded stuff and just won`t work correctly. With upstream u-boot I followed the doc/board/starfive/visionfive2.rst to the point, but unfortunately it did not work. First I ran into an issue, where the chip would pick up a random SPL somewhere else on the SD card, and so I could not test my build. I fixed it by completely erasing the whole sdcard to make sure there can be no other SPL/Uboot on it. This worked, but unfortunately the sd card I made with the steps from doc/board/starfive/visionfive2.rst still did not work. I managed to figure out, that I need to make special modifications to the first 2 sectors of the sd card (protective MBR and GPT header), using https://github.com/starfive-tech/Tools/tree/master/spl_tool. Calling spl_tool -i -f /dev/sdb on my sdcard patches the first sectors with an invalid SPL, and also a offset to the backup SPL (which is the primary one I flashed according to the documentation). Maybe this should be added to the docu, otherwise it will not work, or worse, load some other SPL also on the SD card and cause confusion. There also is a mention in the docu, that the boot ROM searches for the SPL by looking for the offset of its partition in the GPT with a specific GUID. Not sure where this information comes from, but testing showed, that its probably not true. Now to my actual problem, hopefully someone can help: The sdcard I built with u-boot and opensbi can now boot the spl, and also start opensbi and load u-boot. Unfortunately the init_sequence_r now fails with an error: initcall sequence 00000000fffe0738 failed at call 0000000040216240 (err=-19) Digging through the source and some printf debugging revealed to me, that initr_dm_devices() fails, because it can not find a timer device with in dm_timer_init() call. For the JH7110 and pretty much any other RISCV chip the timer device should be provided by the SBI, which is functioning correctly as far as I can tell. I searched for it in the u-boot code, and figured out that riscv_timer uboot driver should be probed, when the booting cpu is bound to its driver in the riscv_cpu_bind() function. Unfortunately it seems like this cpu driver bind function is never called before the initcall sequence crashed because of the missing timer device. That is pretty much everything I could figure out on my own until now, but I am not sure what exactly is going wrong. Hopefully it has nothing to do with how my local setup compiles the code. u-boot seems to be using many tricks like the U_BOOT_DRIVER() macro and others, maybe some of them do not guarantee to create entries in a specific order, and the code accidentally depends on a specific order. Maybe somebody can give me some pointers, I would appreciate it. Greetings, Roland Ruckerbauer

2 2

[PATCH] efi_loader: fix uninitialized variable bug in efi_set_load_options()
by Dan Carpenter 27 Jul '23

27 Jul '23

Check for efi_search_protocol() failure before dereferencing "handler" to avoid a crash. Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- lib/efi_loader/efi_load_options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_load_options.c b/lib/efi_loader/efi_load_options.c index 3cfddee014e9..5f62184da1cd 100644 --- a/lib/efi_loader/efi_load_options.c +++ b/lib/efi_loader/efi_load_options.c @@ -31,10 +31,10 @@ efi_status_t efi_set_load_options(efi_handle_t handle, efi_status_t ret; ret = efi_search_protocol(handle, &efi_guid_loaded_image, &handler); - loaded_image_info = handler->protocol_interface; if (ret != EFI_SUCCESS) return EFI_INVALID_PARAMETER; + loaded_image_info = handler->protocol_interface; loaded_image_info->load_options = load_options; loaded_image_info->load_options_size = load_options_size; -- 2.39.2

3 2

[PATCH v4] xilinx: zynqmp: Extract aes operation into new file
by christian.taedcke-oss＠weidmueller.com 27 Jul '23

27 Jul '23

From: Christian Taedcke <christian.taedcke(a)weidmueller.com> This moves the aes operation that is performed by the pmu into a separate file. This way it can be called not just from the shell command, but also e.g. from board initialization code. Signed-off-by: Christian Taedcke <christian.taedcke(a)weidmueller.com> --- Changes in v4: - remove redundant () around parameters - fix indentation Changes in v3: - fix function doc format Changes in v2: - convert doxygen comments to kernel-doc - fix typos - fix header license - fix do_zynqmp_aes() return value arch/arm/mach-zynqmp/Makefile | 3 +- arch/arm/mach-zynqmp/aes.c | 59 +++++++++++++++++++ .../arm/mach-zynqmp/include/mach/zynqmp_aes.h | 32 ++++++++++ board/xilinx/zynqmp/cmds.c | 43 +------------- 4 files changed, 95 insertions(+), 42 deletions(-) create mode 100644 arch/arm/mach-zynqmp/aes.c create mode 100644 arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h diff --git a/arch/arm/mach-zynqmp/Makefile b/arch/arm/mach-zynqmp/Makefile index bb1830c846..1a76493bef 100644 --- a/arch/arm/mach-zynqmp/Makefile +++ b/arch/arm/mach-zynqmp/Makefile @@ -3,8 +3,7 @@ # (C) Copyright 2014 - 2015 Xilinx, Inc. # Michal Simek <michal.simek(a)xilinx.com> -obj-y += clk.o -obj-y += cpu.o +obj-y += aes.o clk.o cpu.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_SPL_BUILD) += spl.o handoff.o psu_spl_init.o obj-$(CONFIG_SPL_ZYNQMP_DRAM_ECC_INIT) += ecc_spl_init.o diff --git a/arch/arm/mach-zynqmp/aes.c b/arch/arm/mach-zynqmp/aes.c new file mode 100644 index 0000000000..8a2b7fdcbe --- /dev/null +++ b/arch/arm/mach-zynqmp/aes.c @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) Copyright 2018 Xilinx, Inc. + * Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> + * + * Copyright (C) 2023 Weidmueller Interface GmbH & Co. KG <oss(a)weidmueller.com> + * Christian Taedcke <christian.taedcke(a)weidmueller.com> + */ + +#include <common.h> +#include <mach/zynqmp_aes.h> + +#include <asm/arch/sys_proto.h> +#include <cpu_func.h> +#include <memalign.h> +#include <zynqmp_firmware.h> + +int zynqmp_aes_operation(struct zynqmp_aes *aes) +{ + u32 ret_payload[PAYLOAD_ARG_CNT]; + int ret; + + if (zynqmp_firmware_version() <= PMUFW_V1_0) + return -ENOENT; + + if (aes->srcaddr && aes->ivaddr && aes->dstaddr) { + flush_dcache_range(aes->srcaddr, + aes->srcaddr + + roundup(aes->len, ARCH_DMA_MINALIGN)); + flush_dcache_range(aes->ivaddr, + aes->ivaddr + + roundup(IV_SIZE, ARCH_DMA_MINALIGN)); + flush_dcache_range(aes->dstaddr, + aes->dstaddr + + roundup(aes->len, ARCH_DMA_MINALIGN)); + } + + if (aes->keysrc == 0) { + if (aes->keyaddr == 0) + return -EINVAL; + + flush_dcache_range(aes->keyaddr, + aes->keyaddr + + roundup(KEY_PTR_LEN, ARCH_DMA_MINALIGN)); + } + + flush_dcache_range((ulong)aes, (ulong)(aes) + + roundup(sizeof(struct zynqmp_aes), ARCH_DMA_MINALIGN)); + + ret = xilinx_pm_request(PM_SECURE_AES, upper_32_bits((ulong)aes), + lower_32_bits((ulong)aes), 0, 0, ret_payload); + if (ret || ret_payload[1]) { + printf("Failed: AES op status:0x%x, errcode:0x%x\n", + ret, ret_payload[1]); + return -EIO; + } + + return 0; +} diff --git a/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h b/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h new file mode 100644 index 0000000000..2a9cffbd0f --- /dev/null +++ b/arch/arm/mach-zynqmp/include/mach/zynqmp_aes.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2023 Weidmueller Interface GmbH & Co. KG <oss(a)weidmueller.com> + * Christian Taedcke <christian.taedcke(a)weidmueller.com> + * + * Declaration of AES operation functionality for ZynqMP. + */ + +#ifndef ZYNQMP_AES_H +#define ZYNQMP_AES_H + +struct zynqmp_aes { + u64 srcaddr; + u64 ivaddr; + u64 keyaddr; + u64 dstaddr; + u64 len; + u64 op; + u64 keysrc; +}; + +/** + * zynqmp_aes_operation() - Performs an aes operation using the pmu firmware + * + * @aes: The aes operation buffer that must have been allocated using + * ALLOC_CACHE_ALIGN_BUFFER(struct zynqmp_aes, aes, 1) + * + * Return: 0 in case of success, in case of an error any other value + */ +int zynqmp_aes_operation(struct zynqmp_aes *aes); + +#endif /* ZYNQMP_AES_H */ diff --git a/board/xilinx/zynqmp/cmds.c b/board/xilinx/zynqmp/cmds.c index dd1ad66f90..60c7bfca02 100644 --- a/board/xilinx/zynqmp/cmds.c +++ b/board/xilinx/zynqmp/cmds.c @@ -14,16 +14,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> #include <asm/io.h> - -struct aes { - u64 srcaddr; - u64 ivaddr; - u64 keyaddr; - u64 dstaddr; - u64 len; - u64 op; - u64 keysrc; -}; +#include <mach/zynqmp_aes.h> static int do_zynqmp_verify_secure(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) @@ -121,9 +112,7 @@ static int do_zynqmp_mmio_write(struct cmd_tbl *cmdtp, int flag, int argc, static int do_zynqmp_aes(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { - ALLOC_CACHE_ALIGN_BUFFER(struct aes, aes, 1); - int ret; - u32 ret_payload[PAYLOAD_ARG_CNT]; + ALLOC_CACHE_ALIGN_BUFFER(struct zynqmp_aes, aes, 1); if (zynqmp_firmware_version() <= PMUFW_V1_0) { puts("ERR: PMUFW v1.0 or less is detected\n"); @@ -142,40 +131,14 @@ static int do_zynqmp_aes(struct cmd_tbl *cmdtp, int flag, int argc, aes->keysrc = hextoul(argv[6], NULL); aes->dstaddr = hextoul(argv[7], NULL); - if (aes->srcaddr && aes->ivaddr && aes->dstaddr) { - flush_dcache_range(aes->srcaddr, - (aes->srcaddr + - roundup(aes->len, ARCH_DMA_MINALIGN))); - flush_dcache_range(aes->ivaddr, - (aes->ivaddr + - roundup(IV_SIZE, ARCH_DMA_MINALIGN))); - flush_dcache_range(aes->dstaddr, - (aes->dstaddr + - roundup(aes->len, ARCH_DMA_MINALIGN))); - } - if (aes->keysrc == 0) { if (argc < cmdtp->maxargs) return CMD_RET_USAGE; aes->keyaddr = hextoul(argv[8], NULL); - if (aes->keyaddr) - flush_dcache_range(aes->keyaddr, - (aes->keyaddr + - roundup(KEY_PTR_LEN, - ARCH_DMA_MINALIGN))); } - flush_dcache_range((ulong)aes, (ulong)(aes) + - roundup(sizeof(struct aes), ARCH_DMA_MINALIGN)); - - ret = xilinx_pm_request(PM_SECURE_AES, upper_32_bits((ulong)aes), - lower_32_bits((ulong)aes), 0, 0, ret_payload); - if (ret || ret_payload[1]) - printf("Failed: AES op status:0x%x, errcode:0x%x\n", - ret, ret_payload[1]); - - return ret; + return zynqmp_aes_operation(aes); } #ifdef CONFIG_DEFINE_TCM_OCM_MMAP -- 2.34.1

2 1