March 2022 - U-Boot

[PATCH v3 00/29] arm: semihosting: Cleanups and new features
by Sean Anderson 04 Apr '22

04 Apr '22

This cleans up the semihosting code and adds the following new features: - hostfs support (like sandbox) - support for being used as a SPL boot device - serial device support - falling back to normal drivers if semihosting is disabled The main device affected by these changes is vexpress64, so I'd appreciate if Andre (or anyone else) could try booting. These changes are motivated by bringup for ls1046a. When forcing JTAG boot, this device disables most communication peripherals, including serial and ethernet devices. This appears to be fixed in later generation devices, but we are stuck with it for now. Semihosting provides an easy way to run a few console commands. The patches in this series are organized as follows: 0-4: rST conversions and other documentation updates 5-9: Semihosting cleanups 10-14: Filesystem support (including SPL boot device) 15-16: Serial support 16: Documentation update 17: JTAG boot support for LS1046A 19-25: Semihosting fallback 26-29: DM puts support The last two groups of patches are "bonus;" the first 17 patches stand on their own. The last two groups could be broken out as separate series, but I have kept them in this one to help with my sanity (and not have to deal with too many outstanding series). Patch 14 depends on [1] to apply cleanly. Patch 17 depends on [2] for correctness. This series should be applied to u-boot/next (in particular, the EROFS series must have been applied). [1] https://lore.kernel.org/u-boot/CACRpkdZ+9fmNjC_mvrbPa9-iuTQVd8UkJ7Zpe7cL0c5… [2] https://lore.kernel.org/u-boot/20220222183840.1355337-2-sean.anderson@seco.… Changes in v3: - Add a config for puts to reduce the impact on the (vast majority) of boards which don't need it. - Add additional documentation for QEMU and OpenOCD - Add dummy device number for hostfs - Add test for putc/puts - Fix loading the wrong EL's SPSR - Fix null pointer dereference in _serial_puts caused by a missing return. - Make FALLBACK depend on ARM64 - Make puts return the number of characters written on success, instead of reusing the len parameter. - Reorder Kconfigs to group SEMIHOSTING_FALLBACK after SEMIHOSTING (instead of after SPL_SEMIHOSTING_FALLBACK) - Update commit message to describe an alternate implementation - Use SYS_ERRNO instead of SYS_ISERROR, since the latter is not implemented in older QEMUs. Changes in v2: - Add implementation of puts for DM - Add migration instructions for smhload - Add myself as a reviewer - Add semihosting fallback implementation - Compile arch/arm/lib/semihosting.o in SPL - Document debug uart - Fix baud numbers being off by 10 - Fix typos in commit message - Make CONFIG_SPL_SEMIHOSTING depend on SPL - Rebase on Andre's series - Rename non-DM driver struct to match format of other drivers Sean Anderson (29): doc: Convert semihosting readme to rST nxp: ls1046ardb: Convert README to rST doc: ls1046ardb: Expand boot mode section doc: ls1046ardb: Document debug uart arm: smh: Add semihosting entry to MAINTAINERS arm: smh: Export semihosting functions arm: smh: Use numeric modes for smh_open arm: smh: Return errno on error arm: smh: Document functions in header arm: smh: Add some file manipulation commands spl: Add semihosting boot method fs: Add semihosting filesystem cmd: fdt: Use start/size for chosen instead of start/end arm: smh: Remove smhload command arm: smh: Add some functions for working with the host console serial: Add semihosting driver doc: smh: Update semihosting documentation ls1046ardb: Add support for JTAG boot arm64: Save esr in pt_regs arm64: Save spsr in pt_regs arm64: Import some ESR and SPSR defines from Linux arm: smh: Add option to detect semihosting arm64: Catch non-emulated semihosting calls serial: smh: Initialize serial only if semihosting is enabled arm64: ls1046a: Support semihosting fallback serial: dm: Add support for puts serial: sandbox: Implement puts test: serial: Add test for putc/puts serial: smh: Implement puts for DM MAINTAINERS | 5 + arch/arm/Kconfig | 47 +++- arch/arm/cpu/armv8/exceptions.S | 9 +- arch/arm/cpu/armv8/fsl-layerscape/spl.c | 3 + arch/arm/include/asm/esr.h | 343 ++++++++++++++++++++++++ arch/arm/include/asm/proc-armv/ptrace.h | 75 ++++++ arch/arm/include/asm/spl.h | 1 + arch/arm/include/asm/u-boot-arm.h | 7 +- arch/arm/lib/Makefile | 2 +- arch/arm/lib/interrupts_64.c | 80 ++++-- arch/arm/lib/semihosting.c | 230 ++++++++-------- arch/arm/mach-imx/imx8m/soc.c | 4 +- arch/sandbox/include/asm/serial.h | 6 + board/freescale/ls1046ardb/MAINTAINERS | 1 + board/freescale/ls1046ardb/README | 76 ------ board/freescale/ls1046ardb/ls1046ardb.c | 11 + cmd/fdt.c | 6 +- common/spl/Makefile | 1 + common/spl/spl_semihosting.c | 71 +++++ disk/part.c | 4 +- doc/README.semihosting | 38 --- doc/board/nxp/index.rst | 1 + doc/board/nxp/ls1046ardb.rst | 191 +++++++++++++ doc/usage/index.rst | 1 + doc/usage/semihosting.rst | 107 ++++++++ drivers/serial/Kconfig | 37 +++ drivers/serial/Makefile | 1 + drivers/serial/sandbox.c | 38 ++- drivers/serial/serial-uclass.c | 26 +- drivers/serial/serial.c | 2 + drivers/serial/serial_semihosting.c | 187 +++++++++++++ fs/Makefile | 1 + fs/fs.c | 20 ++ fs/semihostingfs.c | 115 ++++++++ include/configs/ls1046ardb.h | 2 + include/configs/vexpress_aemv8.h | 10 +- include/fs.h | 1 + include/semihosting.h | 149 ++++++++++ include/semihostingfs.h | 21 ++ include/serial.h | 19 ++ test/dm/serial.c | 19 ++ 41 files changed, 1689 insertions(+), 279 deletions(-) create mode 100644 arch/arm/include/asm/esr.h delete mode 100644 board/freescale/ls1046ardb/README create mode 100644 common/spl/spl_semihosting.c delete mode 100644 doc/README.semihosting create mode 100644 doc/board/nxp/ls1046ardb.rst create mode 100644 doc/usage/semihosting.rst create mode 100644 drivers/serial/serial_semihosting.c create mode 100644 fs/semihostingfs.c create mode 100644 include/semihosting.h create mode 100644 include/semihostingfs.h -- 2.25.1

4 68

[PATCH 0/3] efi_loader: setting boot device
by Heinrich Schuchardt 04 Apr '22

04 Apr '22

Up to now the bootefi command uses the last file loaded to determine the boot partition. This has led to user irritation when the fdt has been loaded from another partition after the EFI binary. Before setting the boot device from a loaded file check if it is a PE-COFF image. The first patch carves out the test function. The second make use of the PE-COFF check. The third add the display of the boot device and file path for easier testing. Heinrich Schuchardt (3): efi_loader: print boot device and file path in helloworld efi_loader: carve out efi_check_pe() efi_loader: setting boot device cmd/bootefi.c | 14 ++- doc/uefi/uefi.rst | 11 +- fs/fs.c | 3 +- include/efi_loader.h | 8 +- lib/efi_loader/efi_image_loader.c | 80 ++++++++------ lib/efi_loader/helloworld.c | 167 ++++++++++++++++++++++++------ net/tftp.c | 9 +- 7 files changed, 211 insertions(+), 81 deletions(-) -- 2.29.2

4 18

[PATCH 0/2] sf: dataflash: add support for AT45DB641E
by Luca Ellero 04 Apr '22

04 Apr '22

Since AT45DB641E uses "extended device information" for reading JEDEC ID we must first introduce support for this feature. All code is borrowed from Linux kernel source code: drivers/mtd/devices/mtd_dataflash.c Luca Ellero (2): sf: dataflash: add support for "extended ID" sf: dataflash: add support for AT45DB641E drivers/mtd/spi/sf_dataflash.c | 101 ++++++++++++++++++++++----------- 1 file changed, 67 insertions(+), 34 deletions(-) -- 2.17.1

2 4

[PATCH v2 00/23] sunxi: Add and use a pinctrl driver
by Samuel Holland 04 Apr '22

04 Apr '22

This series resolves some longstanding TODOs by implementing a pinctrl driver for sunxi platforms and converting DM drivers to use it. Changes in v2: - Merge all SoC drivers into one file and one U_BOOT_DRIVER. - Add a consumer for the APB bus clock - Add support for the F1C100s SoC Samuel Holland (23): sunxi: pinctrl: Create the driver skeleton sunxi: pinctrl: Implement pin muxing functions sunxi: pinctrl: Implement get_pin_muxing function sunxi: pinctrl: Implement pin configuration pinctrl: sunxi: Add UART pinmuxes sunxi: Skip non-DM UART pin setup when PINCTRL=y pinctrl: sunxi: Add sun4i EMAC pinmuxes net: sunxi_emac: Remove non-DM pin setup pinctrl: sunxi: Add sunxi GMAC pinmuxes sunxi: Remove non-DM GMAC pin setup pinctrl: sunxi: Add sun8i EMAC pinmuxes net: sun8i_emac: Remove non-DM pin setup pinctrl: sunxi: Add I2C pinmuxes sunxi: Remove options and setup code for I2C2-I2C4 sunxi: Remove non-DM I2C clock/pin setup from U-Boot i2c: sun6i_p2wi: Only do non-DM pin setup for non-DM I2C i2c: sun8i_rsb: Only do non-DM pin setup for non-DM I2C pinctrl: sunxi: Add MMC pinmuxes sunxi: Remove non-DM MMC pin setup pinctrl: sunxi: Add the A64 PWM pinmux pwm: sunxi: Remove non-DM pin setup pinctrl: sunxi: Add SPI0 pinmuxes spi: sun4i_spi: Remove non-DM pin setup MAINTAINERS | 1 + arch/arm/Kconfig | 1 + arch/arm/include/asm/arch-sunxi/gpio.h | 17 +- arch/arm/include/asm/arch-sunxi/i2c.h | 11 +- arch/arm/mach-sunxi/Kconfig | 22 - arch/arm/mach-sunxi/board.c | 2 + board/sunxi/board.c | 67 -- board/sunxi/gmac.c | 55 -- drivers/gpio/sunxi_gpio.c | 130 +--- drivers/i2c/sun6i_p2wi.c | 12 +- drivers/i2c/sun8i_rsb.c | 46 +- drivers/net/sun8i_emac.c | 90 --- drivers/net/sunxi_emac.c | 7 +- drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 2 +- drivers/pinctrl/sunxi/Kconfig | 127 ++++ drivers/pinctrl/sunxi/Makefile | 3 + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 887 +++++++++++++++++++++++++ drivers/pwm/sunxi_pwm.c | 11 - drivers/spi/spi-sunxi.c | 84 --- 20 files changed, 1057 insertions(+), 519 deletions(-) create mode 100644 drivers/pinctrl/sunxi/Kconfig create mode 100644 drivers/pinctrl/sunxi/Makefile create mode 100644 drivers/pinctrl/sunxi/pinctrl-sunxi.c -- 2.33.1

3 50

[PATCH v2] Add ethernet0 alias in Nanopi NEO's device tree
by Baltazár Radics 04 Apr '22

04 Apr '22

This is required to enable automatic MAC address generation. Signed-off-by: Baltazár Radics <baltazar.radics(a)gmail.com> --- arch/arm/dts/sun8i-h3-nanopi-neo.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/dts/sun8i-h3-nanopi-neo.dts index 9f33f6fae..df71fab3c 100644 --- a/arch/arm/dts/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/dts/sun8i-h3-nanopi-neo.dts @@ -45,6 +45,10 @@ / { model = "FriendlyARM NanoPi NEO"; compatible = "friendlyarm,nanopi-neo", "allwinner,sun8i-h3"; + + aliases { + ethernet0 = &emac; + }; }; &ehci0 { -- 2.35.1

2 1

[PATCH] IOMUX: Fix access past end of console_devices
by Sean Anderson 03 Apr '22

03 Apr '22

We should only access console_devices[file][i] once we have checked that i < cd_count[file]. Otherwise, we will access uninitialized memory at the end of the loop. console_devices[file][i] should not be NULL, but putting the assignment in the loop condition allows us to ensure that i is checked beforehand. This isn't a bug, but it does make valgrind stop complaining. Fixes: 400797cad3 ("IOMUX: Split out for_each_console_dev() helper macro") Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- include/iomux.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/iomux.h b/include/iomux.h index 37f5f6dee6..1046df133b 100644 --- a/include/iomux.h +++ b/include/iomux.h @@ -25,9 +25,8 @@ extern struct stdio_dev **console_devices[MAX_FILES]; extern int cd_count[MAX_FILES]; #define for_each_console_dev(i, file, dev) \ - for (i = 0, dev = console_devices[file][i]; \ - i < cd_count[file]; \ - i++, dev = console_devices[file][i]) + for (i = 0; i < cd_count[file] && \ + (dev = console_devices[file][i]); i++) int iomux_match_device(struct stdio_dev **, const int, struct stdio_dev *); int iomux_doenv(const int, const char *); -- 2.35.1

3 9

[PATCH 00/11] vexpress64: OF_CONTROL and ARMv8-R64 support
by Andre Przywara 03 Apr '22

03 Apr '22

Hi, this series is the continuation of last year's effort to support the new Armv8-R64 application profile. This led to a significant rework of the existing fastmodel (FVP) support, to both upgrade it to newest U-Boot standards (OF_CONTROL and distro_boot support), but also to generalise the code, so that plugging in the v8-R64 support in the last patch gets much easier. This is because apart from the twisted memory map between the two profiles there is actually little difference, when it comes to U-Boot relevant parts of the hardware. I kept the legacy semihosting support (which picks up magic files from the current directory), but if that fails, we go and try virtio-blk (.iso installer images work), then virtio-net. Please have a look, and give it a try, if possible. Both the v8-R and v8-A FVP models are available for free on the Arm website[1]. Patch 01/11 fixes a regression introduced in December, it should be applied now. The rest of the patches are for the next merge window. [1] https://developer.arm.com/tools-and-software/simulation-models/fast-models Cheers, Andre Andre Przywara (10): vexpress64: fvp: Fix automatic boot vexpress64: Kconfig: move board definitions out of arch/arm arm: dts: Add Arm FVP Fastmodel RevC .dts files from Linux vexpress64: fvp: enable OF_CONTROL vexpress64: config header: unify environment definition vexpress64: move hardware setting from defconfig to Kconfig vexpress64: fvp: add distro_boot support vexpress64: defconfigs: allow default commands vexpress64: generalise page table generation vexpress64: pick DRAM size from DT Peter Hoyes (1): vexpress64: Add ARMv8R-64 board variant arch/arm/Kconfig | 31 +-- arch/arm/dts/Makefile | 2 + arch/arm/dts/arm_fvp.dts | 11 + arch/arm/dts/fvp-base-revc.dts | 246 +++++++++++++++++++++ arch/arm/dts/rtsm_ve-motherboard-rs2.dtsi | 27 +++ arch/arm/dts/rtsm_ve-motherboard.dtsi | 258 ++++++++++++++++++++++ board/armltd/vexpress64/Kconfig | 71 +++++- board/armltd/vexpress64/vexpress64.c | 44 ++-- configs/vexpress_aemv8a_juno_defconfig | 33 +-- configs/vexpress_aemv8a_semi_defconfig | 30 +-- configs/vexpress_aemv8r_defconfig | 14 ++ doc/arch/arm64.rst | 3 +- doc/board/armltd/vexpress64.rst | 1 + include/configs/vexpress_aemv8.h | 159 +++++++++---- 14 files changed, 792 insertions(+), 138 deletions(-) create mode 100644 arch/arm/dts/arm_fvp.dts create mode 100644 arch/arm/dts/fvp-base-revc.dts create mode 100644 arch/arm/dts/rtsm_ve-motherboard-rs2.dtsi create mode 100644 arch/arm/dts/rtsm_ve-motherboard.dtsi create mode 100644 configs/vexpress_aemv8r_defconfig -- 2.25.1

4 23

[PATCH v1] net: eth-uclass: Fix eth_halt
by qianfanguijin＠163.com 02 Apr '22

02 Apr '22

From: qianfan Zhao <qianfanguijin(a)163.com> eth_device_priv maybe unaccessable after @stop handler due to eth device is removed in @stop. Setting private data before @stop handler. This also fix data abort bug when run dhcp or tftp command via usbnet. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- net/eth-uclass.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 58c308f332..c6eb1bc8f8 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -338,9 +338,14 @@ void eth_halt(void) if (!priv || !priv->running) return; - eth_get_ops(current)->stop(current); - priv->state = ETH_STATE_PASSIVE; + /* Make sure setting private data before @stop handler, it may remove + * ethernet device and will cause @priv unaccessable. + * eg: + * usb_eth_stop -> usb_gadget_release -> device_remove + */ priv->running = false; + + eth_get_ops(current)->stop(current); } int eth_is_active(struct udevice *dev) -- 2.17.1

3 2

[PATCH v2 1/2] net: eth-uclass: Fix eth_halt
by qianfanguijin＠163.com 01 Apr '22

01 Apr '22

From: qianfan Zhao <qianfanguijin(a)163.com> eth_device_priv maybe unaccessable after @stop handler due to eth device is removed in @stop. Setting private data before @stop handler. This also fix data abort bug when run dhcp or tftp command via usbnet. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- net/eth-uclass.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 58c308f332..c6eb1bc8f8 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -338,9 +338,14 @@ void eth_halt(void) if (!priv || !priv->running) return; - eth_get_ops(current)->stop(current); - priv->state = ETH_STATE_PASSIVE; + /* Make sure setting private data before @stop handler, it may remove + * ethernet device and will cause @priv unaccessable. + * eg: + * usb_eth_stop -> usb_gadget_release -> device_remove + */ priv->running = false; + + eth_get_ops(current)->stop(current); } int eth_is_active(struct udevice *dev) -- 2.17.1

2 2

[PATCH] net: phy: dp83867: Fix a never true comparison
by li.haolin＠qq.com 01 Apr '22

01 Apr '22

From: Haolin Li <li.haolin(a)qq.com> The type of the return value of phy_read() and phy_read_mmd() is int. Change the variable to not be unsigned so that we not get into an unsigned compared against 0. Signed-off-by: Haolin Li <li.haolin(a)qq.com> --- drivers/net/phy/dp83867.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index eada4541c9..c5d44f4629 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c @@ -266,7 +266,7 @@ static int dp83867_of_init(struct phy_device *phydev) static int dp83867_config(struct phy_device *phydev) { struct dp83867_private *dp83867; - unsigned int val, delay, cfg2; + int val, delay, cfg2; int ret, bs; dp83867 = (struct dp83867_private *)phydev->priv; @@ -291,8 +291,11 @@ static int dp83867_config(struct phy_device *phydev) if (phy_interface_is_rgmii(phydev)) { val = phy_read(phydev, MDIO_DEVAD_NONE, MII_DP83867_PHYCTRL); - if (val < 0) + if (val < 0) { + ret = val; goto err_out; + } + val &= ~DP83867_PHYCR_FIFO_DEPTH_MASK; val |= (dp83867->fifo_depth << DP83867_PHYCR_FIFO_DEPTH_SHIFT); -- 2.25.1

2 2