May 2022 - U-Boot

[PATCH 1/1] riscv: Clean up asm/io.h
by Leo Yu-Chi Liang 19 May '22

19 May '22

Clean up asm/io.h by - removing commented code - removing outdated comments - removing unused definitions (for mem_isa, mem_pci) Suggested by commits: (7ab2e47d27) arm: Clean up asm/io.h (909d0399a5) ARM: asm/io.h: kill off confusing #ifdef __mem_pci block This massively improves the readability of the file. Signed-off-by: Leo Yu-Chi Liang <ycliang(a)andestech.com> --- arch/riscv/include/asm/io.h | 117 +----------------------------------- 1 file changed, 1 insertion(+), 116 deletions(-) diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index fc39bb2c70..49bffac03c 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -7,8 +7,6 @@ #ifndef __ASM_RISCV_IO_H #define __ASM_RISCV_IO_H -#ifdef __KERNEL__ - #include <linux/types.h> #include <asm/barrier.h> #include <asm/byteorder.h> @@ -39,11 +37,7 @@ static inline phys_addr_t map_to_sysmem(const void *ptr) } #endif -/* - * Generic virtual read/write. Note that we don't support half-word - * read/writes. We define __arch_*[bl] here, and leave __arch_*w - * to the architecture specific code. - */ +/* Generic virtual read/write. */ #define __arch_getb(a) (*(volatile unsigned char *)(a)) #define __arch_getw(a) (*(volatile unsigned short *)(a)) #define __arch_getl(a) (*(volatile unsigned int *)(a)) @@ -352,115 +346,6 @@ static inline void writesl(unsigned int *addr, const void *data, int longlen) #define insw_p(port, to, len) insw(port, to, len) #define insl_p(port, to, len) insl(port, to, len) -/* - * DMA-consistent mapping functions. These allocate/free a region of - * uncached, unwrite-buffered mapped memory space for use with DMA - * devices. This is the "generic" version. The PCI specific version - * is in pci.h - */ - -/* - * String version of IO memory access ops: - */ - -/* - * If this architecture has PCI memory IO, then define the read/write - * macros. These should only be used with the cookie passed from - * ioremap. - */ -#ifdef __mem_pci - -#define readb(c) ({ unsigned int __v = \ - __raw_readb(__mem_pci(c)); __v; }) -#define readw(c) ({ unsigned int __v = \ - le16_to_cpu(__raw_readw(__mem_pci(c))); __v; }) -#define readl(c) ({ unsigned int __v = \ - le32_to_cpu(__raw_readl(__mem_pci(c))); __v; }) - -#define writeb(v, c) __raw_writeb(v, __mem_pci(c)) -#define writew(v, c) __raw_writew(cpu_to_le16(v), __mem_pci(c)) -#define writel(v, c) __raw_writel(cpu_to_le32(v), __mem_pci(c)) - -#define memset_io(c, v, l) _memset_io(__mem_pci(c), (v), (l)) -#define memcpy_fromio(a, c, l) _memcpy_fromio((a), __mem_pci(c), (l)) -#define memcpy_toio(c, a, l) _memcpy_toio(__mem_pci(c), (a), (l)) - -#define eth_io_copy_and_sum(s, c, l, b) \ - eth_copy_and_sum((s), __mem_pci(c), (l), (b)) - -static inline int check_signature(ulong io_addr, const uchar *s, int len) -{ - int retval = 0; - - do { - if (readb(io_addr) != *s) - goto out; - io_addr++; - s++; - len--; - } while (len); - retval = 1; -out: - return retval; -} -#endif /* __mem_pci */ - -/* - * If this architecture has ISA IO, then define the isa_read/isa_write - * macros. - */ -#ifdef __mem_isa - -#define isa_readb(addr) __raw_readb(__mem_isa(addr)) -#define isa_readw(addr) __raw_readw(__mem_isa(addr)) -#define isa_readl(addr) __raw_readl(__mem_isa(addr)) -#define isa_writeb(val, addr) __raw_writeb(val, __mem_isa(addr)) -#define isa_writew(val, addr) __raw_writew(val, __mem_isa(addr)) -#define isa_writel(val, addr) __raw_writel(val, __mem_isa(addr)) -#define isa_memset_io(a, b, c) _memset_io(__mem_isa(a), (b), (c)) -#define isa_memcpy_fromio(a, b, c) _memcpy_fromio((a), __mem_isa(b), (c)) -#define isa_memcpy_toio(a, b, c) _memcpy_toio(__mem_isa((a)), (b), (c)) - -#define isa_eth_io_copy_and_sum(a, b, c, d) \ - eth_copy_and_sum((a), __mem_isa(b), (c), (d)) - -static inline int -isa_check_signature(ulong io_addr, const uchar *s, int len) -{ - int retval = 0; - - do { - if (isa_readb(io_addr) != *s) - goto out; - io_addr++; - s++; - len--; - } while (len); - retval = 1; -out: - return retval; -} - -#else /* __mem_isa */ - -#define isa_readb(addr) (__readwrite_bug("isa_readb"), 0) -#define isa_readw(addr) (__readwrite_bug("isa_readw"), 0) -#define isa_readl(addr) (__readwrite_bug("isa_readl"), 0) -#define isa_writeb(val, addr) __readwrite_bug("isa_writeb") -#define isa_writew(val, addr) __readwrite_bug("isa_writew") -#define isa_writel(val, addr) __readwrite_bug("isa_writel") -#define isa_memset_io(a, b, c) __readwrite_bug("isa_memset_io") -#define isa_memcpy_fromio(a, b, c) __readwrite_bug("isa_memcpy_fromio") -#define isa_memcpy_toio(a, b, c) __readwrite_bug("isa_memcpy_toio") - -#define isa_eth_io_copy_and_sum(a, b, c, d) \ - __readwrite_bug("isa_eth_io_copy_and_sum") - -#define isa_check_signature(io, sig, len) (0) - -#endif /* __mem_isa */ -#endif /* __KERNEL__ */ - #include <asm-generic/io.h> #endif /* __ASM_RISCV_IO_H */ -- 2.34.1.390.g2ae0a9cb82

2 1

[PATCH] drivers:optee:rpmb: initialize drivers of mmc devices in UCLASS_BLK for rpmb access
by Judy Wang 19 May '22

19 May '22

>From bc1eae1b8883dca98c2874efca1d3e492db20cf3 Mon Sep 17 00:00:00 2001 From: judyw <wangjudy(a)microsoft.com> Date: Tue, 3 May 2022 14:04:40 +0800 Subject: [PATCH] drivers:optee:rpmb: initialize drivers of mmc devices in UCLASS_BLK for rpmb access CONFIG_MMC only initializes drivers for devices in UCLASS_MMC, we need to initialize drivers for devices of type IF_TYPE_MMC in UCLASS_BLK as well because they are the child devices of devices in UCLASS_MMC. This is required for feature RPMB since it will access eMMC in optee-os. Signed-off-by: judyw <wangjudy(a)microsoft.com> --- drivers/tee/optee/rpmb.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/tee/optee/rpmb.c b/drivers/tee/optee/rpmb.c index 0804fc963c..cf5e0a08e6 100644 --- a/drivers/tee/optee/rpmb.c +++ b/drivers/tee/optee/rpmb.c @@ -72,6 +72,10 @@ static struct mmc *get_mmc(struct optee_private *priv, int dev_id) debug("Cannot find RPMB device\n"); return NULL; } + if (mmc_init(mmc)) { + log(LOGC_BOARD, LOGL_ERR, "%s:MMC device %d init failed\n", __func__, dev_id); + return NULL; + } if (!(mmc->version & MMC_VERSION_MMC)) { debug("Device id %d is not an eMMC device\n", dev_id); return NULL; @@ -104,6 +108,11 @@ static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info) if (!mmc) return TEE_ERROR_ITEM_NOT_FOUND; + if (mmc_init(mmc)) { + log(LOGC_BOARD, LOGL_ERR, "%s:MMC device %d init failed\n", __func__, dev_id); + return TEE_ERROR_NOT_SUPPORTED; + } + if (!mmc->ext_csd) return TEE_ERROR_GENERIC; -- 2.34.1.windows.1

1 0

Please pull u-boot-marvell/master
by Stefan Roese 19 May '22

19 May '22

Hi Tom, please pull this next batch of mostly Marvell related patches: ---------------------------------------------------------------- - Misc Kconfig cleanups (Chris & Pali) - turris_omnia: Fix hangup in debug UART (this introduces TPL/SPL_DEBUG_UART_BASE) Pali - mvebu: uDPU: include fixed-phy support (Robert) - pinctrl: probe pinctrl drivers during post-bind (Robert) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=196&view=results Thanks, Stefan The following changes since commit c387e62614713d0cc9e3ed022b86c9f320b02853: Merge branch '2022-05-11-Kconfig-cleanups-etc' (2022-05-11 13:27:44 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to f9ec791b5e24378b71590877499f8683d5f54dac: pinctrl: probe pinctrl drivers during post-bind (2022-05-17 06:44:06 +0200) ---------------------------------------------------------------- Chris Packham (1): arm: mvebu: Remove unused ARMADA_64BIT Pali Rohár (9): cmd: mvebu: Hide bubt specific options when bubt is disabled arm: Add new config option ARCH_VERY_EARLY_INIT arm: mvebu: Move internal registers in arch_very_early_init() function serial: Add new config option SPL_DEBUG_UART_BASE serial: Add new config option TPL_DEBUG_UART_BASE serial: ns16550: Add support for SPL_DEBUG_UART_BASE arm: mvebu: turris_omnia: Fix DEBUG_UART_BASE arm: mvebu: Fix DEBUG_UART_BASE for all 32-bit boards arm: mvebu: turris_{omnia,mox}: Enable CONFIG_NETCONSOLE Robert Marko (2): mvebu: uDPU: include fixed-phy support pinctrl: probe pinctrl drivers during post-bind arch/arm/Kconfig | 6 ++++++ arch/arm/lib/crt0.S | 5 +++++ arch/arm/mach-mvebu/Kconfig | 5 +---- arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/cpu.c | 31 ------------------------------- arch/arm/mach-mvebu/lowlevel.S | 27 +++++++++++++++++++++++++++ cmd/mvebu/Kconfig | 4 ++++ configs/clearfog_defconfig | 3 ++- configs/controlcenterdc_defconfig | 3 ++- configs/db-88f6820-amc_defconfig | 3 ++- configs/db-88f6820-gp_defconfig | 3 ++- configs/db-mv784mp-gp_defconfig | 3 ++- configs/ds414_defconfig | 3 ++- configs/helios4_defconfig | 3 ++- configs/maxbcm_defconfig | 3 ++- configs/theadorable_debug_defconfig | 3 ++- configs/turris_mox_defconfig | 1 + configs/turris_omnia_defconfig | 4 +++- configs/uDPU_defconfig | 1 + configs/x530_defconfig | 3 ++- drivers/pinctrl/pinctrl-uclass.c | 7 +++++++ drivers/serial/Kconfig | 14 ++++++++++++++ drivers/serial/ns16550.c | 4 ++-- 23 files changed, 92 insertions(+), 48 deletions(-) create mode 100644 arch/arm/mach-mvebu/lowlevel.S

2 1

[PATCH] Kconfig: hide options not intended for users in arch/Kconfig
by Daniel Schwierzeck 18 May '22

18 May '22

Those options show up in menuconfig when selecting ARM or MIPS which is dangerous if a user accidently sets them. This also clutters up the menuconfig top-level screen. Because those options should only be set by SoC specific or board specific configs, make them invisible. Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- arch/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 12de8a1165..e3e28d0628 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -365,7 +365,7 @@ config SYS_DISABLE_DCACHE_OPS this functionality. config SYS_IMMR - hex "Address for the Internal Memory-Mapped Registers (IMMR) window" + hex depends on PPC || FSL_LSCH2 || FSL_LSCH3 || ARCH_LS1021A default 0xFF000000 if MPC8xx default 0xF0000000 if ARCH_MPC8313 @@ -377,7 +377,7 @@ config SYS_IMMR to configure the features of many Freescale / NXP SoCs. config SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" + bool depends on ARM || MIPS || RISCV help If enabled, then certain low level initializations (like setting up @@ -388,7 +388,7 @@ config SKIP_LOWLEVEL_INIT debugger which performs these initializations itself. config SPL_SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" + bool depends on SPL && (ARM || MIPS || RISCV) help If enabled, then certain low level initializations (like setting up @@ -399,7 +399,7 @@ config SPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself. config TPL_SKIP_LOWLEVEL_INIT - bool "Skip the calls to certain low level initialization functions" + bool depends on SPL && ARM help If enabled, then certain low level initializations (like setting up @@ -410,7 +410,7 @@ config TPL_SKIP_LOWLEVEL_INIT debugger which performs these initializations itself. config SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool depends on ARM help This allows just the call to lowlevel_init() to be skipped. The @@ -418,7 +418,7 @@ config SKIP_LOWLEVEL_INIT_ONLY performed. config SPL_SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool depends on SPL && ARM help This allows just the call to lowlevel_init() to be skipped. The @@ -426,7 +426,7 @@ config SPL_SKIP_LOWLEVEL_INIT_ONLY performed. config TPL_SKIP_LOWLEVEL_INIT_ONLY - bool "Skip the call to lowlevel_init during early boot ONLY" + bool depends on TPL && ARM help This allows just the call to lowlevel_init() to be skipped. The -- 2.36.1

2 5

buildman failed on v2022.07-rc2 with toolchain-wrapper option
by Patrick DELAUNAY 18 May '22

18 May '22

Hi Simon, It seems the buildman option toolchain-wrapper is no more working since v2022.07-rc2 => with the lines in ${HOME]/.buildman : [toolchain-wrapper] wrapper: ccache I have compilation error for some ARM target with EFI support, for example for stm32mp15_defconfig. Tests in include/efi_default_filename.h are introduced with commit 4e65ca00f3a3 ("efi_loader: bootmgr: add booting from removable media") for examples: #if HOST_ARCH == HOST_ARCH_X86 but ${HOST_ARCH} is empty. The issue occurs because when CROSSCOMPILER="ccache arm-linux-gnueabi-" in Makefile, MK_ARCH have invalid value and thus HOST_ARCH is empty... The issue can be avoid with the dirty patch: ----------------------------------- Makefile ----------------------------------- index d394340221..3999bbcd71 100644 @@ -21,7 +21,7 @@ include include/host_arch.h ifeq ("", "$(CROSS_COMPILE)") MK_ARCH="${shell uname -m}" else - MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/^[[:space:]]*$[^\/]*\/$*$[^-]*$-[^[:space:]]*/\2/p'}" + MK_ARCH="${shell echo $(CROSS_COMPILE) | sed -n 's/ccache//;s/^[[:space:]]*$[^\/]*\/$*$[^-]*$-[^[:space:]]*/\2/p'}" endif But I solve only the issue only for "ccache" wrapper ! Do you think we need to remove this option in "toolchain-wrapper" buildman ? Patrick

1 0

[PATCH] Add support for the Digilent Arty-Z7 Xilinx ZYNQ based board
by Christopher Bowman 18 May '22

18 May '22

Greetings, I’m new to contributing but the attached patch adds support for a board I’m working on. Regards, Christopher

1 0

[PATCH v14 0/2] add TCP and HTTP for downloading images
by Ying-Chun Liu 18 May '22

18 May '22

From: "Ying-Chun Liu (PaulLiu)" <paul.liu(a)linaro.org> This patch is a refresh from previous patches made by Duncan Hare <DuncanCHare(a)yahoo.com>. I've contacted him and continue to work on this patch. This patch introduce a TCP stack with SACK. And a simple wget command to download images from http server. v13: Fix some issues which is reviewed by Christian v14: Add options to enable/disable SACK. Ying-Chun Liu (PaulLiu) (2): net: Add TCP protocol net: Add wget application cmd/Kconfig | 7 + cmd/net.c | 13 + include/net.h | 10 +- include/net/tcp.h | 222 ++++++++++++++ include/net/wget.h | 19 ++ net/Kconfig | 12 + net/Makefile | 2 + net/net.c | 36 +++ net/tcp.c | 709 +++++++++++++++++++++++++++++++++++++++++++++ net/wget.c | 436 ++++++++++++++++++++++++++++ 10 files changed, 1464 insertions(+), 2 deletions(-) create mode 100644 include/net/tcp.h create mode 100644 include/net/wget.h create mode 100644 net/tcp.c create mode 100644 net/wget.c -- 2.35.1

4 7

[PATCH] riscv: remove CONFIG_ARCH_MAP_SYSMEM from io.h
by Michal Simek 18 May '22

18 May '22

Commit ba1ed5b022c6 ("Convert CONFIG_ARCH_MAP_SYSMEM to Kconfig") clearly defined that this option is available for SANDBOX (was also for already removed NDS32). That's why there is no way how this code can be enabled with current Kconfig layout for riscv. Based on this removing this code. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- arch/riscv/include/asm/io.h | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index fc39bb2c701e..431cf1389d1d 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h @@ -17,28 +17,6 @@ static inline void sync(void) { } -#ifdef CONFIG_ARCH_MAP_SYSMEM -static inline void *map_sysmem(phys_addr_t paddr, unsigned long len) -{ - if (paddr < PHYS_SDRAM_0_SIZE + PHYS_SDRAM_1_SIZE) - paddr = paddr | 0x40000000; - return (void *)(uintptr_t)paddr; -} - -static inline void *unmap_sysmem(const void *vaddr) -{ - phys_addr_t paddr = (phys_addr_t)vaddr; - - paddr = paddr & ~0x40000000; - return (void *)(uintptr_t)paddr; -} - -static inline phys_addr_t map_to_sysmem(const void *ptr) -{ - return (phys_addr_t)(uintptr_t)ptr; -} -#endif - /* * Generic virtual read/write. Note that we don't support half-word * read/writes. We define __arch_*[bl] here, and leave __arch_*w -- 2.36.0

2 1

[PATCH] usb: dwc3: Fix the error paths in usb3-phy PHY configuration
by Aswath Govindraju 18 May '22

18 May '22

generic_phy_power_off(), needs to be called in dwc3_glue_remove() while exiting as we powering on the phy in the dwc3_glue_probe(). Therefore, instantiate struct phy in dwc3_glue_data to use in dwc3_glue_probe() as well as dwc3_glue_remove(). In cases where "usb3-phy" is not present in the phy-names property, generic_phy_get_by_name() returns -ENODATA. Therefore, add condition to not return when the error code is -ENODATA too. Also, generic_phy_init() and generic_phy_power_on() functions, have checks to verify if the struct phy argument passed is valid. Therefore, remove additional checks added for these in the dwc3_glue_probe(). Fixes: 142d50fbce7c ("usb: dwc3: Add support for usb3-phy PHY configuration") Signed-off-by: Aswath Govindraju <a-govindraju(a)ti.com> --- drivers/usb/dwc3/dwc3-generic.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index 6e1a1d066b40..f74d710a2447 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -30,6 +30,7 @@ struct dwc3_glue_data { struct clk_bulk clks; struct reset_ctl_bulk resets; + struct phy phy; fdt_addr_t regs; }; @@ -458,21 +459,21 @@ static int dwc3_glue_probe(struct udevice *dev) { struct dwc3_glue_ops *ops = (struct dwc3_glue_ops *)dev_get_driver_data(dev); struct dwc3_glue_data *glue = dev_get_plat(dev); + struct phy *phy = &glue->phy; struct udevice *child = NULL; int index = 0; int ret; - struct phy phy; - ret = generic_phy_get_by_name(dev, "usb3-phy", &phy); - if (!ret) { - ret = generic_phy_init(&phy); - if (ret) - return ret; - } else if (ret != -ENOENT) { + ret = generic_phy_get_by_name(dev, "usb3-phy", phy); + if (ret && ret != -ENOENT && ret != -ENODATA) { debug("could not get phy (err %d)\n", ret); return ret; } + ret = generic_phy_init(phy); + if (ret) + return ret; + glue->regs = dev_read_addr(dev); ret = dwc3_glue_clk_init(dev, glue); @@ -483,11 +484,9 @@ static int dwc3_glue_probe(struct udevice *dev) if (ret) return ret; - if (phy.dev) { - ret = generic_phy_power_on(&phy); - if (ret) - return ret; - } + ret = generic_phy_power_on(phy); + if (ret) + return ret; ret = device_find_first_child(dev, &child); if (ret) @@ -516,6 +515,8 @@ static int dwc3_glue_remove(struct udevice *dev) { struct dwc3_glue_data *glue = dev_get_plat(dev); + generic_phy_power_off(&glue->phy); + reset_release_bulk(&glue->resets); clk_release_bulk(&glue->clks); -- 2.17.1

2 1

[PATCH 00/10] arm64: zynqmp: Various DT fixes
by Michal Simek 18 May '22

18 May '22

Hi, I am sending couple of patches to extend DT for zynqmp boards. Modepin and si5328 dt bindings are available in the Linux kernel. The rest are small changes with the existing DT binding mostly in Linux. Thanks, Michal Michal Simek (7): arm64: zynqmp: Add gpio labels for modepin arm64: zynqmp: Fix opp-table-cpu arm64: zynqmp: Add power domain description for PL arm64: zynqmp: Add dmas, gpu, rtc, watchdogs and opp nodes for SOM arm64: zynqmp: Add PHY description for SGMII on vck190 SC arm64: zynqmp: Add linux,code for fwuen button arm64: zynqmp: Add DT description for si5328 for zcu102/zcu106 Piyush Mehta (1): arm64: zynqmp: Add mode-pin GPIO controller DT node T Karthik Reddy (1): Revert "arm64: zynqmp: Add zynqmp firmware specific DT nodes" Vishal Patel (1): arm64: zynqmp: Add pwm-fan node and fix ttc0 pwm-cells property arch/arm/dts/zynqmp-e-a2197-00-revA.dts | 15 ++++ arch/arm/dts/zynqmp-mini-emmc0.dts | 40 --------- arch/arm/dts/zynqmp-mini-emmc1.dts | 40 --------- arch/arm/dts/zynqmp-sm-k26-revA.dts | 113 ++++++++++++++++++++++++ arch/arm/dts/zynqmp-zcu102-revA.dts | 21 ++++- arch/arm/dts/zynqmp-zcu106-revA.dts | 21 ++++- arch/arm/dts/zynqmp.dtsi | 11 ++- 7 files changed, 178 insertions(+), 83 deletions(-) -- 2.36.0

1 11