May 2021 - U-Boot

[PULL] Pull request for u-boot master / v2021.07 = u-boot-stm32-20210528
by Patrick DELAUNAY 28 May '21

28 May '21

Hi Tom, Please pull the STM32 related patches for u-boot/master, v2021.07: u-boot-stm32-20210528 - DFU: MTD: fix for lock support - reset: stm32: fix bank bank and offset computation - enable UNZIP config in several stm32mp defconfig CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/7655 Thanks, Patrick git request-pull origin/master https://source.denx.de/u-boot/custodians/u-boot-stm.git/ u-boot-stm32-20210528 The following changes since commit aab8b17e94c447561a402bc7508b73fd8ee712e5: Merge tag 'ti-v2021.07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-ti (2021-05-27 07:42:49 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-stm.git/ tags/u-boot-stm32-20210528 for you to fetch changes up to 7bda7cee2dfc824eccc6a76ea531fc90b4f7923f: arm: dts: stm32mp157c-odyssey-som: enable the RNG1 (2021-05-28 15:05:39 +0200) ---------------------------------------------------------------- - DFU: MTD: fix for lock support - reset: stm32: fix bank bank and offset computation - enable UNZIP config in several stm32mp defconfig ---------------------------------------------------------------- Christoph Niedermaier (1): ARM: stm32: Update dhelectronics/dh_stm32mp1/MAINTAINERS file Grzegorz Szymaszek (1): arm: dts: stm32mp157c-odyssey-som: enable the RNG1 Marek Vasut (2): ARM: stm32: Add additional ID register check for KSZ8851 presence ARM: stm32: Enable UNZIP on DHSOM by default Patrice Chotard (1): reset: stm32: Fix bank and offset computation Patrick Delaunay (2): dfu: dfu_mtd: remove the mtd_block_op error when mtd_lock is not supported configs: stm32mp: Enable UNZIP on STMicroelectronics stm32mp15 boards arch/arm/dts/stm32mp157c-odyssey-som.dtsi | 4 ++++ board/dhelectronics/dh_stm32mp1/MAINTAINERS | 1 + board/dhelectronics/dh_stm32mp1/board.c | 11 ++++++++++- configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_dhcor_basic_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + drivers/dfu/dfu_mtd.c | 4 +++- drivers/reset/stm32-reset.c | 8 ++++---- 9 files changed, 26 insertions(+), 6 deletions(-)

2 1

Pull request for efi-2021-07-rc4-2
by Heinrich Schuchardt 28 May '21

28 May '21

Dear Tom, The following changes since commit aab8b17e94c447561a402bc7508b73fd8ee712e5: Merge tag 'ti-v2021.07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-ti (2021-05-27 07:42:49 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2021-07-rc4-2 for you to fetch changes up to 163a0d7e2cbdbdf26d90ac8d30c0495b814f3245: efi_loader: add PE/COFF image measurement (2021-05-28 16:17:01 +0200) Gitlab CI showed no problems: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/7658 ---------------------------------------------------------------- Pull request for efi-2021-07-rc4-2 Simplify configuration using HASH functions Fix Coverity warnings related to EFI TCG2 protocol Enable PE/COFF image measurement ---------------------------------------------------------------- Alexandru Gagniuc (2): Revert "lib: introduce HASH_CALCULATE option" efi_loader: Work-around build issue due to missing hash_calculate() Ilias Apalodimas (1): efi_loader: Fix coverity warnings for efi tcg2 protocol Masahisa Kojima (1): efi_loader: add PE/COFF image measurement common/Kconfig.boot | 1 - include/efi_loader.h | 6 ++ include/efi_tcg2.h | 9 ++ include/tpm-v2.h | 18 ++++ lib/Kconfig | 3 - lib/Makefile | 2 +- lib/efi_loader/Kconfig | 5 +- lib/efi_loader/efi_image_loader.c | 62 ++++++++--- lib/efi_loader/efi_tcg2.c | 214 +++++++++++++++++++++++++++++++++++--- 9 files changed, 285 insertions(+), 35 deletions(-)

2 1

[PATCH] configs: stm32mp: Enable UNZIP on STMicroelectronics stm32mp15 boards
by Patrick Delaunay 28 May '21

28 May '21

The CMD_UNZIP provides the 'gzwrite' command, which is convenient for writing e.g. gz-compressed images to eMMC from U-Boot. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_trusted_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index d7511a79a5..0c892dda8b 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_ERASEENV=y CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y +CONFIG_CMD_UNZIP=y CONFIG_CMD_ADC=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index ee89a47171..f7aa571e8d 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_ERASEENV=y CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y +CONFIG_CMD_UNZIP=y CONFIG_CMD_ADC=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y -- 2.17.1

3 2

[PATCH] ARM: stm32: Enable UNZIP on DHSOM by default
by Marek Vasut 28 May '21

28 May '21

The CMD_UNZIP provides the 'gzwrite' command, which is convenient for writing e.g. gz-compressed images to eMMC from U-Boot. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- configs/stm32mp15_dhcom_basic_defconfig | 1 + configs/stm32mp15_dhcor_basic_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/stm32mp15_dhcom_basic_defconfig b/configs/stm32mp15_dhcom_basic_defconfig index e36d34d001e..df702547081 100644 --- a/configs/stm32mp15_dhcom_basic_defconfig +++ b/configs/stm32mp15_dhcom_basic_defconfig @@ -36,6 +36,7 @@ CONFIG_SYS_PROMPT="STM32MP> " CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y +CONFIG_CMD_UNZIP=y CONFIG_CMD_ADC=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y diff --git a/configs/stm32mp15_dhcor_basic_defconfig b/configs/stm32mp15_dhcor_basic_defconfig index 4794b1a14d5..4508d4158af 100644 --- a/configs/stm32mp15_dhcor_basic_defconfig +++ b/configs/stm32mp15_dhcor_basic_defconfig @@ -34,6 +34,7 @@ CONFIG_SYS_PROMPT="STM32MP> " CONFIG_CMD_EEPROM=y CONFIG_CMD_MEMINFO=y CONFIG_CMD_MEMTEST=y +CONFIG_CMD_UNZIP=y CONFIG_CMD_ADC=y CONFIG_CMD_CLK=y CONFIG_CMD_DFU=y -- 2.30.2

3 3

[PATCH] ARM: stm32: Add additional ID register check for KSZ8851 presence
by Marek Vasut 28 May '21

28 May '21

Currently the code sets eth1addr only if /ethernet1 alias exists in DT, the node pointed to by the alias has "micrel,ks8851-mll" compatible string, and the KSZ8851 CCR register read indicates programmed EEPROM is not connected. This is not sufficient to detect cases where the DT still contains the KSZ8851 nodes, but the chip itself is not present. Extend the detection to handle these cases. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- board/dhelectronics/dh_stm32mp1/board.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/board/dhelectronics/dh_stm32mp1/board.c b/board/dhelectronics/dh_stm32mp1/board.c index 49b12c4c042..ac1af718d4a 100644 --- a/board/dhelectronics/dh_stm32mp1/board.c +++ b/board/dhelectronics/dh_stm32mp1/board.c @@ -86,6 +86,8 @@ DECLARE_GLOBAL_DATA_PTR; #define KS_CCR_EEPROM BIT(9) #define KS_BE0 BIT(12) #define KS_BE1 BIT(13) +#define KS_CIDER 0xC0 +#define CIDER_ID 0x8870 int setup_mac_address(void) { @@ -123,11 +125,18 @@ int setup_mac_address(void) * is present. If EEPROM is present, it must contain valid * MAC address. */ - u32 reg, ccr; + u32 reg, cider, ccr; reg = fdt_get_base_address(gd->fdt_blob, off); if (!reg) goto out_set_ethaddr; + writew(KS_BE0 | KS_BE1 | KS_CIDER, reg + 2); + cider = readw(reg); + if ((cider & 0xfff0) != CIDER_ID) { + skip_eth1 = true; + goto out_set_ethaddr; + } + writew(KS_BE0 | KS_BE1 | KS_CCR, reg + 2); ccr = readw(reg); if (ccr & KS_CCR_EEPROM) { -- 2.30.2

3 3

[PATCH V2] ARM: stm32: Update dhelectronics/dh_stm32mp1/MAINTAINERS file
by Christoph Niedermaier 28 May '21

28 May '21

Adding new DH electronics mailing list. Signed-off-by: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> --- V2: Correct message tag --- board/dhelectronics/dh_stm32mp1/MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/board/dhelectronics/dh_stm32mp1/MAINTAINERS b/board/dhelectronics/dh_stm32mp1/MAINTAINERS index fd70131f9e..9ce21c3ab2 100644 --- a/board/dhelectronics/dh_stm32mp1/MAINTAINERS +++ b/board/dhelectronics/dh_stm32mp1/MAINTAINERS @@ -1,5 +1,6 @@ DH_STM32MP1_PDK2 BOARD M: Marek Vasut <marex(a)denx.de> +L: u-boot(a)dh-electronics.com S: Maintained F: arch/arm/dts/stm32mp15xx-dhcom* F: board/dhelectronics/dh_stm32mp1/ -- 2.11.0

2 2

[PATCH] reset: stm32: Fix bank and offset computation
by Patrice Chotard 28 May '21

28 May '21

BITS_PER_LONG is used to represent register's size which is 32. But when compiled on arch64, BITS_PER_LONG is then equal to 64. Fix bank and offset computation to make it work on arch32 and arch64 and ensure that register's size is always equal to 32. Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> Signed-off-by: Pankaj Dev <pankaj.dev(a)st.com> --- drivers/reset/stm32-reset.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c index daa2e47ebb..bbc6b135a9 100644 --- a/drivers/reset/stm32-reset.c +++ b/drivers/reset/stm32-reset.c @@ -40,8 +40,8 @@ static int stm32_reset_free(struct reset_ctl *reset_ctl) static int stm32_reset_assert(struct reset_ctl *reset_ctl) { struct stm32_reset_priv *priv = dev_get_priv(reset_ctl->dev); - int bank = (reset_ctl->id / BITS_PER_LONG) * 4; - int offset = reset_ctl->id % BITS_PER_LONG; + int bank = (reset_ctl->id / (sizeof(u32) * BITS_PER_BYTE)) * 4; + int offset = reset_ctl->id % (sizeof(u32) * BITS_PER_BYTE); dev_dbg(reset_ctl->dev, "reset id = %ld bank = %d offset = %d)\n", reset_ctl->id, bank, offset); @@ -61,8 +61,8 @@ static int stm32_reset_assert(struct reset_ctl *reset_ctl) static int stm32_reset_deassert(struct reset_ctl *reset_ctl) { struct stm32_reset_priv *priv = dev_get_priv(reset_ctl->dev); - int bank = (reset_ctl->id / BITS_PER_LONG) * 4; - int offset = reset_ctl->id % BITS_PER_LONG; + int bank = (reset_ctl->id / (sizeof(u32) * BITS_PER_BYTE)) * 4; + int offset = reset_ctl->id % (sizeof(u32) * BITS_PER_BYTE); dev_dbg(reset_ctl->dev, "reset id = %ld bank = %d offset = %d)\n", reset_ctl->id, bank, offset); -- 2.17.1

2 3

[PATCH v1 0/6] Provide support for mv88e6020 Marvell switch
by Lukasz Majewski 28 May '21

28 May '21

This patch set provides support for mv88e6020 switch. It is a dual chip device, with direct access to port register on SMI bus. However, PHYs are accessed indirectly. Lukasz Majewski (6): net: mv88e61xx: Add support for checking addressing mode net: mv88e61xx: Configure PHY ports to also pass packets between them net: mv88e61xx: Clear temporary structs before using them in get_phy_id() net: mv88e61xx: Directly access the switch chip net: mv88e61xx: Set proper offset when R0_LED/ADDR4 is set on bootstrap net: mv88e61xx: Reset switch PHYs when bootstrapped to !NO_CPU drivers/net/phy/mv88e61xx.c | 158 ++++++++++++++++++++++++++++++++---- 1 file changed, 142 insertions(+), 16 deletions(-) -- 2.20.1

2 13

[PATCH 0/7] rtc: davinci: add driver model support
by Dario Binacchi 28 May '21

28 May '21

The series adds driver model support for omap RTC plus some fixes. Dario Binacchi (7): rtc: davinci: enable compilation for omap architectures rtc: davinci: replace 32bit access with 8bit access rtc: davinci: check BUSY bit before set TC registers rtc: davinci: use unlock/lock mechanism arm: dts: sync rtc node of am335x boards with Linux 5.9-rc7 rtc: davinci: add driver model support rtc: davinci: fix date loaded on reset arch/arm/dts/am335x-bone-common.dtsi | 5 + arch/arm/dts/am335x-evm.dts | 5 + arch/arm/dts/am335x-evmsk.dts | 5 + arch/arm/dts/am335x-osd335x-common.dtsi | 6 + drivers/rtc/Kconfig | 7 + drivers/rtc/davinci.c | 467 ++++++++++++++++++++++-- 6 files changed, 466 insertions(+), 29 deletions(-) -- 2.17.1

3 12

[PATCH] dfu: dfu_mtd: remove the mtd_block_op error when mtd_lock is not supported
by Patrick Delaunay 28 May '21

28 May '21

Fix the result of DFU_OP_WRITE operation in mtd_block_op function when mtd_lock is not supported (-EOPNOTSUPP) to avoid DFU stack error on the DFU manifestation of the MTD device, when dfu_flush_medium_mtd is called. Without this patch, dfu-util failed on dfuERROR state at the end of the write operation on the alternate even if MTD write opeartion is correctly performed. $> dfu-util -a 3 -D test.bin .... DFU mode device DFU version 0110 Device returned transfer size 4096 Copying data from PC to DFU device .... Download [=========================] 100% 225469 bytes Download done. state(10) = dfuERROR, status(14) = Something went wrong, but the device does not know what it was Done! Fixes: 65f3fc18fc1e ("dfu_mtd: Add provision to unlock mtd device") Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- drivers/dfu/dfu_mtd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dfu/dfu_mtd.c b/drivers/dfu/dfu_mtd.c index ca67585a7e..ec40b8f6bb 100644 --- a/drivers/dfu/dfu_mtd.c +++ b/drivers/dfu/dfu_mtd.c @@ -150,7 +150,9 @@ static int mtd_block_op(enum dfu_op op, struct dfu_entity *dfu, /* Write done, lock again */ debug("Locking the mtd device\n"); ret = mtd_lock(mtd, lock_ofs, lock_len); - if (ret && ret != -EOPNOTSUPP) + if (ret == -EOPNOTSUPP) + ret = 0; + else if (ret) printf("MTD device lock failed\n"); } return ret; -- 2.17.1

3 2