May 2021 - U-Boot

[PATCH] fs: btrfs: Add missing cache aligned allocation
by Marek Vasut 27 May '21

27 May '21

The superblock buffer must be cache aligned, since it might be used in DMA context, allocate it using ALLOC_CACHE_ALIGN_BUFFER() just like it was done in btrfs_read_superblock() and read_tree_node(). This fixes this output on boot and non-working btrfs on iMX53: CACHE: Misaligned operation at range [ced299d0, ced2a9d0] Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Marek Behún <marek.behun(a)nic.cz> Cc: Qu Wenruo <wqu(a)suse.com> --- fs/btrfs/disk-io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c6fdec95c16..349411c3ccd 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -291,7 +291,7 @@ error_out: int btrfs_read_dev_super(struct blk_desc *desc, struct disk_partition *part, struct btrfs_super_block *sb) { - char tmp[BTRFS_SUPER_INFO_SIZE]; + ALLOC_CACHE_ALIGN_BUFFER(char, tmp, BTRFS_SUPER_INFO_SIZE); struct btrfs_super_block *buf = (struct btrfs_super_block *)tmp; int ret; -- 2.30.2

3 2

[PATCH 1/1] fs/squashfs: zero out unused fields in fs_dirent
by Heinrich Schuchardt 27 May '21

27 May '21

When reading directories the UEFI sub-system must supply file attributes and timestamps. These fields will have to be added to struct fs_dirent. SquashFS should not fill these fields with random data. Ensure that they are zeroed out. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/squashfs/sqfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 29805c3c6f..997be2dcf4 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -876,7 +876,7 @@ int sqfs_opendir(const char *filename, struct fs_dir_stream **dirsp) char **token_list = NULL, *path = NULL; u32 *pos_list = NULL; - dirs = malloc(sizeof(*dirs)); + dirs = calloc(1, sizeof(*dirs)); if (!dirs) return -EINVAL; -- 2.30.2

3 2

[PATCH v2] part: Add check for NULL dev_part_str
by Sean Anderson 27 May '21

27 May '21

Some callers (e.g. cmd/fs.c) of fs_set_blk_dev may use a NULL dev_part_str. While blk_get_device_part_str handles this fine, part_get_info_by_dev_and_name does not. This fixes commands crashing when implicitly using bootdevice. The unit test has also been updated to set bootdevice to a known value and to restore it after we are done. Fixes: 7194527b6a ("cmd: fs: Use part_get_info_by_dev_and_name_or_num to parse partitions") Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- Changes in v2: - Fix unit test failing if bootdevice was set disk/part.c | 6 +++++- test/dm/part.c | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/disk/part.c b/disk/part.c index 5e7e59cf25..086da84b7f 100644 --- a/disk/part.c +++ b/disk/part.c @@ -714,7 +714,11 @@ static int part_get_info_by_dev_and_name(const char *dev_iface, int ret; /* Separate device and partition name specification */ - part_str = strchr(dev_part_str, '#'); + if (dev_part_str) + part_str = strchr(dev_part_str, '#'); + else + part_str = NULL; + if (part_str) { dup_str = strdup(dev_part_str); dup_str[part_str - dev_part_str] = 0; diff --git a/test/dm/part.c b/test/dm/part.c index 051e9010b6..78dd8472c2 100644 --- a/test/dm/part.c +++ b/test/dm/part.c @@ -11,11 +11,25 @@ #include <dm/test.h> #include <test/ut.h> -static int dm_test_part(struct unit_test_state *uts) +static inline int do_test(struct unit_test_state *uts, int expected, + const char *part_str, bool whole) { - char str_disk_guid[UUID_STR_LEN + 1]; struct blk_desc *mmc_dev_desc; struct disk_partition part_info; + + ut_asserteq(expected, + part_get_info_by_dev_and_name_or_num("mmc", part_str, + &mmc_dev_desc, + &part_info, whole)); + return 0; +} + +static int dm_test_part(struct unit_test_state *uts) +{ + char *oldbootdevice; + char str_disk_guid[UUID_STR_LEN + 1]; + int ret; + struct blk_desc *mmc_dev_desc; struct disk_partition parts[2] = { { .start = 48, /* GPT data takes up the first 34 blocks or so */ @@ -38,16 +52,22 @@ static int dm_test_part(struct unit_test_state *uts) ut_assertok(gpt_restore(mmc_dev_desc, str_disk_guid, parts, ARRAY_SIZE(parts))); -#define test(expected, part_str, whole) \ - ut_asserteq(expected, \ - part_get_info_by_dev_and_name_or_num("mmc", part_str, \ - &mmc_dev_desc, \ - &part_info, whole)) + oldbootdevice = env_get("bootdevice"); +#define test(expected, part_str, whole) do { \ + ret = do_test(uts, expected, part_str, whole); \ + if (ret) \ + goto out; \ +} while (0) + + env_set("bootdevice", NULL); + test(-ENODEV, NULL, true); test(-ENODEV, "", true); env_set("bootdevice", "0"); + test(0, NULL, true); test(0, "", true); env_set("bootdevice", "1"); + test(1, NULL, false); test(1, "", false); test(1, "-", false); env_set("bootdevice", ""); @@ -70,7 +90,10 @@ static int dm_test_part(struct unit_test_state *uts) test(-EINVAL, "1#bogus", false); test(1, "1#test1", false); test(2, "1#test2", false); + ret = 0; - return 0; +out: + env_set("bootdevice", oldbootdevice); + return ret; } DM_TEST(dm_test_part, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); -- 2.31.0

3 2

[PATCH] pinctrl: single: Fix probe failure getting register area size
by Vignesh Raghavendra 27 May '21

27 May '21

If reg property of pinctrl-single node requires address translation then probe fails with following message: single-pinctrl pinctrl@4301c000: failed to get base register size This is because driver uses dev_read_addr_size() to get size which also tries to fetch untranslated addr and fails. Fix this by using dev_read_addr_size_index() which takes care of address translation and also makes following dev_read_addr() call redundant. This fixes Ethernet failures on TI's AM654 based EVMs due to lack of pinmux configuration. Fixes: 9fd8a430f3 ("pinctrl: single: get register area size by device API") Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com> --- drivers/pinctrl/pinctrl-single.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index ebb7602dde..7af6c5f0b0 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -509,19 +509,13 @@ static int single_of_to_plat(struct udevice *dev) return -EINVAL; } - addr = dev_read_addr_size(dev, "reg", &size); + addr = dev_read_addr_size_index(dev, 0, &size); if (addr == FDT_ADDR_T_NONE) { - dev_err(dev, "failed to get base register size\n"); + dev_err(dev, "failed to get base register address\n"); return -EINVAL; } pdata->offset = size - pdata->width / BITS_PER_BYTE; - - addr = dev_read_addr(dev); - if (addr == FDT_ADDR_T_NONE) { - dev_dbg(dev, "no valid base register address\n"); - return -EINVAL; - } pdata->base = addr; ret = dev_read_u32(dev, "pinctrl-single,function-mask", &pdata->mask); -- 2.31.1

3 3

[PATCH] phy: sun4i-usb: Fix PHY0 routing and passby configuration for MUSB
by Andre Przywara 27 May '21

27 May '21

From: Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> Recent Allwinner platforms (starting with the H3) only use the MUSB controller for peripheral mode and use HCI for host mode. As a result, extra steps need to be taken to properly route USB signals to one or the other. More precisely, the following is required: * Routing the pins to either HCI/MUSB (controlled by PHY); * Enabling USB PHY passby in HCI mode (controlled by PMU). The current code will enable passby for each PHY and reroute PHY0 to MUSB, which is inconsistent and results in broken USB host support for port 0. Passby on PHY0 must only be enabled when we want to use HCI. Since host/device mode detection is not available from the PHY code and because U-Boot does not support changing the mode dynamically anyway, we can just mux the controller to MUSB if it is enabled and mux it to HCI otherwise. This fixes USB host support for port 0 on platforms with PHY0 dual-route, especially on boards like Pine64 (with only USB-A host ports) and TV boxes without OTG ports. Signed-off-by: Paul Kocialkowski <paul.kocialkowski(a)bootlin.com> [Andre: tweak commit message, use IS_ENABLED()] Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- Hi, for H6 boards to work this requires a DT update (to get the <&usbphy 0> links between HCI and PHY), which I will send later. Tested on Pine H64, Pine64-LTS, OrangePi Zero, OrangePi PC 2, BananaPi M64, BananaPi M1. Cheers, Andre drivers/phy/allwinner/phy-sun4i-usb.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 5723c980323..e6ceafc7648 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -313,9 +313,21 @@ static int sun4i_usb_phy_init(struct phy *phy) data->cfg->disc_thresh, PHY_DISCON_TH_LEN); } - sun4i_usb_phy_passby(phy, true); + if (IS_ENABLED(CONFIG_USB_MUSB_SUNXI)) { + /* Needed for HCI and conflicts with MUSB, keep PHY0 on MUSB */ + if (usb_phy->id != 0) + sun4i_usb_phy_passby(phy, true); + + /* Route PHY0 to MUSB to allow USB gadget */ + if (data->cfg->phy0_dual_route) + sun4i_usb_phy0_reroute(data, true); + } else { + sun4i_usb_phy_passby(phy, true); - sun4i_usb_phy0_reroute(data, true); + /* Route PHY0 to HCI to allow USB host */ + if (data->cfg->phy0_dual_route) + sun4i_usb_phy0_reroute(data, false); + } return 0; } -- 2.17.5

3 7

[PATCH] configs: am64x_evm_a53_defconfig: Enable DP83867 PHY driver
by Vignesh Raghavendra 27 May '21

27 May '21

AM64x GP and SK EVM have DP83867 PHY connected to CPSW external port0. Enable the driver in order to use ethernet at U-Boot prompt. CONFIG_PHY_TI is selected by CONFIG_PHY_TI_DP83867 and thus can be dropped. Signed-off-by: Vignesh Raghavendra <vigneshr(a)ti.com> --- Based on top of https://source.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2021.07-rc3 configs/am64x_evm_a53_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/am64x_evm_a53_defconfig b/configs/am64x_evm_a53_defconfig index 0e942e36b4..e1e1c375cf 100644 --- a/configs/am64x_evm_a53_defconfig +++ b/configs/am64x_evm_a53_defconfig @@ -76,6 +76,7 @@ CONFIG_SF_DEFAULT_MODE=0 CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHY_TI=y +CONFIG_PHY_TI_DP83867=y CONFIG_PHY_FIXED=y CONFIG_DM_ETH=y CONFIG_TI_AM65_CPSW_NUSS=y -- 2.31.1

2 1

[PATCH v2] arm: dts: k3-j721e: Fix up MAIN R5FSS cluster mode back to Split-mode
by Suman Anna 27 May '21

27 May '21

The default U-Boot environment variables and design are all set up for both the MAIN R5FSS clusters to be in Split-mode. This is the setting in v2021.01 U-Boot and the dt nodes are synched with the kernel binding property names in commit 468ec2f3ef8f ("remoteproc: k3_r5: Sync to upstreamed kernel DT property names") merged in v2021.04-rc2. The modes for both the clusters got switched back to LockStep mode by mistake in commit 70e167495ab2 ("arm: dts: k3-j721e: Sync Linux v5.11-rc6 dts into U-Boot") also in v2021.04-rc2. This throws the following warning messages when early-booting the cores using default env variables, k3_r5f_rproc r5f@5d00000: Invalid op: Trying to start secondary core 7 in lockstep mode Load Remote Processor 3 with data@addr=0x82000000 98484 bytes: Failed! k3_r5f_rproc r5f@5f00000: Invalid op: Trying to start secondary core 9 in lockstep mode Load Remote Processor 5 with data@addr=0x82000000 98484 bytes: Failed! Fix this by switching back both the clusters to the expected Split-mode. Make this mode change in the u-boot specific dtsi file to avoid such sync overrides in the future until the kernel dts is also switched to Split-mode by default. Fixes: 70e167495ab2 ("arm: dts: k3-j721e: Sync Linux v5.11-rc6 dts into U-Boot") Reported-by: Minas Hambardzumyan <minas(a)ti.com> Signed-off-by: Suman Anna <s-anna(a)ti.com> --- v2: - Move the cluster mode change from k3-j721e-main.dtsi to the u-boot board dtsi file, k3-j721e-common-proc-board-u-boot.dtsi - Update commit description citing the reason v1: http://patchwork.ozlabs.org/project/uboot/patch/20210514003603.13940-1-s-an… arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi index 3384ed9f3a1e..fe095a6153ed 100644 --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi @@ -193,3 +193,11 @@ &mcu_fss0_ospi1_pins_default { u-boot,dm-spl; }; + +&main_r5fss0 { + ti,cluster-mode = <0>; +}; + +&main_r5fss1 { + ti,cluster-mode = <0>; +}; -- 2.30.1

2 1

[PATCH 0/3] Fix 'reset' for TI K3 AM64x and J721E/J7200 boards
by Suman Anna 27 May '21

27 May '21

Hi Lokesh, The following patches fix the 'reset' command functionality for various TI K3 SoCs. Patches are based on the latest master that includes the AM64x board support, commit ea184cbff99e ("Merge tag 'ti-v2021.07-rc3' of https://source.denx.de/u-boot/custodians/u-boot-ti"). The first patch is needed for J721E/J7200 SoCs with newer System Firmwares (anything newer that 2020.04 SYSFW) and is backward compatible. Without this, the 'reset' command throws the following warnings, => reset resetting ... ti-sci-sysreset sysreset-controller: ti_sci_sysreset_request: reboot_device failed (-19) ti-sci-sysreset sysreset-controller: ti_sci_sysreset_request: reboot_device failed (-19) ti-sci-sysreset sysreset-controller: ti_sci_sysreset_request: reboot_device failed (-19) System reset not supported on this platform ### ERROR ### Please RESET the board ### The second and third patches add the required ti-sci sysreset nodes for the AM64x EVM and SK boards respectively. The required SYSRESET and SYSRESET_TI_SCI configs are already enabled in the am64x_evm_a53_defconfig. regards Suman Dave Gerlach (1): firmware: ti_sci: Update ti_sci_msg_req_reboot to include domain Suman Anna (2): arm: dts: k3-am642-evm: Add sysreset controller node arm: dts: k3-am642-sk: Add sysreset controller node arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ++++ arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 ++++ drivers/firmware/ti_sci.c | 1 + drivers/firmware/ti_sci.h | 2 ++ 4 files changed, 11 insertions(+) -- 2.30.1

2 4

[PATCH] ARM: ti: Increase the allocated size for MLO.raw
by Aswath Govindraju 27 May '21

27 May '21

From: Faiz Abbas <faiz_abbas(a)ti.com> MLO has increased to a size greater than the allocated 128 kB in dfu_alt_info_emmc and _mmc. Therefore, double the allocated size for MLO.raw in the default environment. Signed-off-by: Faiz Abbas <faiz_abbas(a)ti.com> Signed-off-by: Aswath Govindraju <a-govindraju(a)ti.com> --- include/environment/ti/dfu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/environment/ti/dfu.h b/include/environment/ti/dfu.h index 720c3453af0e..3c90570107e4 100644 --- a/include/environment/ti/dfu.h +++ b/include/environment/ti/dfu.h @@ -13,7 +13,7 @@ "boot part 0 1;" \ "rootfs part 0 2;" \ "MLO fat 0 1;" \ - "MLO.raw raw 0x100 0x100;" \ + "MLO.raw raw 0x100 0x200;" \ "u-boot.img.raw raw 0x300 0x1000;" \ "u-env.raw raw 0x1300 0x200;" \ "spl-os-args.raw raw 0x1500 0x200;" \ @@ -29,7 +29,7 @@ "boot part 1 1;" \ "rootfs part 1 2;" \ "MLO fat 1 1;" \ - "MLO.raw raw 0x100 0x100;" \ + "MLO.raw raw 0x100 0x200;" \ "u-boot.img.raw raw 0x300 0x1000;" \ "u-env.raw raw 0x1300 0x200;" \ "spl-os-args.raw raw 0x1500 0x200;" \ -- 2.17.1

2 1

[PATCH v9 0/1] PE/COFF measurement support
by Masahisa Kojima 27 May '21

27 May '21

This patch series add the PE/COFF measurement support. Extending PCR and Event Log is tested with fTPM running as a OP-TEE TA. Unit test will be added in the separate series. Originally, this patch series have three patches. Two out of three patches are already merged, so this series only contain one remaining commit from v9. Masahisa Kojima (1): efi_loader: add PE/COFF image measurement include/efi_loader.h | 6 + include/efi_tcg2.h | 9 ++ include/tpm-v2.h | 18 +++ lib/efi_loader/Kconfig | 1 + lib/efi_loader/efi_image_loader.c | 62 ++++++--- lib/efi_loader/efi_tcg2.c | 207 ++++++++++++++++++++++++++++-- 6 files changed, 277 insertions(+), 26 deletions(-) -- 2.17.1

3 4