January 2023 - U-Boot

[PATCH] mtd: nand: Mark reserved blocks
by Ashok Reddy Soma 05 Jan '23

05 Jan '23

Reserved blocks are used for storing bad block tables. With "nand bad" command, these reserved blocks are shown as bad blocks. This is leading to confusion when compared with Linux bad blocks. Hence, display "Reserved for bbt" when printing reserved blocks with "nand bad" command. To acheive this, return 2 which represents reserved from nand_isbad_bbt() instead of 1 in case of reserved blocks and catch it in cmd/nand.c. "nand bad" command display's hexadecimal numbers, so add "0x" prefix. Example log will show up as below. ZynqMP> nand bad Device 0 bad blocks: 0x00400000 0x16800000 0x16c00000 0x17000000 0x3d800000 0x3e400000 0xe8400000 0xff000000 <--- Reserved for bbt 0xff400000 <--- Reserved for bbt 0xff800000 <--- Reserved for bbt 0xffc00000 <--- Reserved for bbt 0x116800000 0x116c00000 0x1ff000000 <--- Reserved for bbt 0x1ff400000 <--- Reserved for bbt 0x1ff800000 <--- Reserved for bbt 0x1ffc00000 <--- Reserved for bbt Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> --- cmd/nand.c | 9 ++++++--- drivers/mtd/nand/raw/nand_bbt.c | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cmd/nand.c b/cmd/nand.c index 9a723f5757..feb6b0e3ec 100644 --- a/cmd/nand.c +++ b/cmd/nand.c @@ -567,9 +567,12 @@ static int do_nand(struct cmd_tbl *cmdtp, int flag, int argc, if (strcmp(cmd, "bad") == 0) { printf("\nDevice %d bad blocks:\n", dev); - for (off = 0; off < mtd->size; off += mtd->erasesize) - if (nand_block_isbad(mtd, off)) - printf(" %08llx\n", (unsigned long long)off); + for (off = 0; off < mtd->size; off += mtd->erasesize) { + ret = nand_block_isbad(mtd, off); + if (ret) + printf(" 0x%08llx%s\n", (unsigned long long)off, + ret == 2 ? "\t <--- Reserved for bbt" : ""); + } return 0; } diff --git a/drivers/mtd/nand/raw/nand_bbt.c b/drivers/mtd/nand/raw/nand_bbt.c index 911472e91e..cd451870a6 100644 --- a/drivers/mtd/nand/raw/nand_bbt.c +++ b/drivers/mtd/nand/raw/nand_bbt.c @@ -1330,6 +1330,7 @@ int nand_isreserved_bbt(struct mtd_info *mtd, loff_t offs) * @mtd: MTD device structure * @offs: offset in the device * @allowbbt: allow access to bad block table region + * Return: 0 - good block, 1- bad block, 2 - reserved block */ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) { @@ -1348,7 +1349,7 @@ int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt) case BBT_BLOCK_WORN: return 1; case BBT_BLOCK_RESERVED: - return allowbbt ? 0 : 1; + return allowbbt ? 0 : 2; } return 1; } -- 2.17.1

3 2

[PATCH v2 0/2] Add basic reset driver for assert/deassert operations
by Sergiu Moga 05 Jan '23

05 Jan '23

This patch series originates from: https://lists.denx.de/pipermail/u-boot/2022-December/502865.html Implement a basic driver to enable assert/deassert operations. v1 -> v2: - rebase on u-boot next Cristian Birsan (1): ARM: at91: add sama7 SFR definitions Sergiu Moga (1): reset: at91: Add reset driver for basic assert/deassert operations arch/arm/mach-at91/include/mach/sama7-sfr.h | 59 ++++++++ drivers/reset/Kconfig | 8 ++ drivers/reset/Makefile | 1 + drivers/reset/reset-at91.c | 141 ++++++++++++++++++++ drivers/sysreset/sysreset_at91.c | 9 +- 5 files changed, 210 insertions(+), 8 deletions(-) create mode 100644 arch/arm/mach-at91/include/mach/sama7-sfr.h create mode 100644 drivers/reset/reset-at91.c -- 2.34.1

2 3

[PATCH v3 0/9] Add DT USB definitions for SAM9X60, SAMA5D2 and SAMA7
by Sergiu Moga 05 Jan '23

05 Jan '23

This patch series originates from the bigger patch series: https://lists.denx.de/pipermail/u-boot/2022-December/502865.html Add the basic DT USB definitions for SAM9X60, SAMA5D2 and SAMA7. The required pinctrl definitions have been added as well as additional definitions for the UTMI related clocks and their relationship with the Reset driver. v1 -> v2: - split patches for SoC/Board separately - use usb@ v2 -> v3: - update commit message regarding the SAMA7G5_RESET_USB_PHY id's - added USB_ prefix to UTMI macro-definitions - move sama7g5's USB DT definitions to U-Boot specific file Sergiu Moga (9): ARM: dts: sam9x60: Add OHCI and EHCI DT nodes ARM: dts: sam9x60_curiosity: Add pinctrl and gpio properties for USB ARM: dts: sam9x60ek: Add pinctrl and gpio properties for USB dt-bindings: reset: add sama7g5 definitions dt-bindings: clk: at91: Define additional UTMI related clocks ARM: dts: sama7g5: Add USB and UTMI DT nodes ARM: dts: sama7g5ek: Add pinctrl, gpio and phy properties for USB ARM: dts: sama5d2_icp: Add pinctrl nodes for USB related DT nodes ARM: dts: sama5d27_wlsom1_ek: Add pinctrl nodes for USB DT nodes arch/arm/dts/at91-sam9x60_curiosity.dts | 21 +++++ arch/arm/dts/at91-sama5d27_wlsom1_ek.dts | 25 +++++ arch/arm/dts/at91-sama5d2_icp.dts | 22 +++++ arch/arm/dts/at91-sama7g5ek-u-boot.dtsi | 108 ++++++++++++++++++++++ arch/arm/dts/sam9x60.dtsi | 18 ++++ arch/arm/dts/sam9x60ek.dts | 21 +++++ include/dt-bindings/clk/at91.h | 5 + include/dt-bindings/reset/sama7g5-reset.h | 10 ++ 8 files changed, 230 insertions(+) create mode 100644 include/dt-bindings/reset/sama7g5-reset.h -- 2.34.1

3 12

[PATCH] usb: gadget: fastboot: detach usb just before rebooting
by Dario Binacchi 05 Jan '23

05 Jan '23

The patch fixes the following error when updating a BSH SMM S2 board: 3:72>Start Cmd:FB[-t 8000]: ucmd nand write ${loadaddr} nanddtb ${filesize} 3:72>Okay (0.023s) 3:72>Start Cmd:FB: reboot 3:72>Fail Bulk(R):LIBUSB_ERROR_IO(0s) The "fastboot reboot" command detaches the USB when it still needs to be used. So let's detach the USB just before the reset. CC: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> Fixes: 5f7e01e9d5d800 ("usb: gadget: fastboot: detach usb on reboot commands") Signed-off-by: Dario Binacchi <dario.binacchi(a)amarulasolutions.com> --- drivers/usb/gadget/f_fastboot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index 07b1681c8a9a..0b3fae564d0a 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -419,11 +419,6 @@ static int fastboot_tx_write_str(const char *buffer) return fastboot_tx_write(buffer, strlen(buffer)); } -static void compl_do_reset(struct usb_ep *ep, struct usb_request *req) -{ - do_reset(NULL, 0, 0, NULL); -} - static unsigned int rx_bytes_expected(struct usb_ep *ep) { int rx_remain = fastboot_data_remaining(); @@ -495,6 +490,12 @@ static void do_bootm_on_complete(struct usb_ep *ep, struct usb_request *req) do_exit_on_complete(ep, req); } +static void compl_do_reset(struct usb_ep *ep, struct usb_request *req) +{ + do_exit_on_complete(ep, req); + do_reset(NULL, 0, 0, NULL); +} + #if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) static void do_acmd_complete(struct usb_ep *ep, struct usb_request *req) { @@ -544,7 +545,6 @@ static void rx_handler_command(struct usb_ep *ep, struct usb_request *req) case FASTBOOT_COMMAND_REBOOT_FASTBOOTD: case FASTBOOT_COMMAND_REBOOT_RECOVERY: fastboot_func->in_req->complete = compl_do_reset; - g_dnl_trigger_detach(); break; #if CONFIG_IS_ENABLED(FASTBOOT_UUU_SUPPORT) case FASTBOOT_COMMAND_ACMD: -- 2.32.0

3 2

[PATCH v5 0/6] add support for Theobroma Systems PX30-µQ7 (Ringneck) with Haikou devkit
by Quentin Schulz 05 Jan '23

05 Jan '23

From: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> The PX30-uQ7 (Ringneck) SoM is a µQseven-compatible (40mmx70mm, MXM-230 connector) system-on-module from Theobroma Systems[1], featuring the Rockchip PX30. It provides the following feature set: * up to 4GB DDR4 * up to 128GB on-module eMMC (with 8-bit 1.8V interface) * SD card (on a baseboard) via edge connector * Fast Ethernet with on-module TI DP83825I PHY * MIPI-DSI/LVDS * MIPI-CSI * USB - 1x USB 2.0 dual-role - 3x USB 2.0 host * on-module companion controller (STM32 Cortex-M0 or ATtiny), implementing: - low-power RTC functionality (ISL1208 emulation) - fan controller (AMC6821 emulation) - USB<->CAN bridge controller (STM32 only) * on-module Espressif ESP32 for Bluetooth + 2.4GHz WiFi * on-module NXP SE05x Secure Element [1] https://www.theobroma-systems.com/som-product/px30-uq7/ Cheers, Quentin To: Heiko Stuebner <heiko(a)sntech.de> To: Simon Glass <sjg(a)chromium.org> To: Philipp Tomsich <philipp.tomsich(a)vrull.eu> To: Klaus Goger <klaus.goger(a)theobroma-systems.com> Cc: Quentin Schulz <foss+uboot(a)0leil.net> Cc: u-boot(a)lists.denx.de Cc: Kever Yang <kever.yang(a)rock-chips.com> Signed-off-by: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> --- Changes in v5: - added fix for unused variables in px30.c, - fixed missing fdt_support.h inclusion in px30.c, - updated commit log to reference v6.1 and v6.2-rc2 sources for syncing of files instead of linux-next, - rebased on top of master, - Link to v4: https://lore.kernel.org/r/20221017-upstream-ringneck-v4-0-5e0a3f119047@theo… Changes in v4: - added CONFIG_ENV_OVERWRITE to defconfig to match Puma behavior and allow commands specified in our user manual, - added comment in commit log for the DTS origin (next-20221114), - Link to v3: https://lore.kernel.org/r/20221017-upstream-ringneck-v3-0-d6ae387f35ef@theo… Changes in v3: - added Rb, - rebased on top of master, - fixed http links to use u instead of encoded µ, - updated u-boot,mmc-env-offset from 16KB to 20KB to avoid GPT corruption when saving env + reduced env size to 0x3000 to adapt to the offset change, - removed video support from defconfig as there's no display support ATM, - Link to v2: https://lore.kernel.org/r/20221017-upstream-ringneck-v2-0-0f03912ebac2@theo… Changes in v2: - updated DTS from Linux with v2 of the Linux kernel patch series, - updated node nade for bios-disable-override-hog to match v2 of Linux kernel, - removed uapi input patch since it is not needed anymore, --- Quentin Schulz (6): rockchip: px30: fix possibly unused grf and cru variables rockchip: px30: fix CONFIG_IRAM_BASE rockchip: px30: list possible SPL boot devices rockchip: px30: insert u-boot,spl-boot-device into U-Boot device tree arm64: dts: rockchip: sync px30 DTSI with Linux kernel v6.1 rockchip: add support for PX30 Ringneck SoM on Haikou Devkit arch/arm/dts/px30-ringneck-haikou-u-boot.dtsi | 91 +++++ arch/arm/dts/px30-ringneck-haikou.dts | 232 +++++++++++++ arch/arm/dts/px30-ringneck.dtsi | 382 +++++++++++++++++++++ arch/arm/dts/px30.dtsi | 28 +- arch/arm/mach-rockchip/px30/Kconfig | 25 ++ arch/arm/mach-rockchip/px30/px30.c | 67 ++++ board/theobroma-systems/ringneck_px30/Kconfig | 18 + board/theobroma-systems/ringneck_px30/MAINTAINERS | 9 + board/theobroma-systems/ringneck_px30/Makefile | 7 + board/theobroma-systems/ringneck_px30/README | 69 ++++ .../ringneck_px30/ringneck-px30.c | 175 ++++++++++ configs/ringneck-px30_defconfig | 128 +++++++ doc/board/rockchip/rockchip.rst | 1 + include/configs/px30_common.h | 3 +- include/configs/ringneck_px30.h | 15 + 15 files changed, 1245 insertions(+), 5 deletions(-) --- base-commit: 582e3c9fb2337c2f49faa73ac86dde25f4d56901 change-id: 20221017-upstream-ringneck-57abd09a7aaa Best regards, -- Quentin Schulz <quentin.schulz(a)theobroma-systems.com>

3 11

[PATCH] rockchip: rk3328: Set VOP QoS to high priority
by Nicolas Frattaroli 05 Jan '23

05 Jan '23

The default priority for the quality of service for the video output results in unsightly glitches on the output whenever there is memory pressure on the system, which happens a lot. This sets the VOP QoS to high priority, which fixes this issue. Signed-off-by: Nicolas Frattaroli <frattaroli.nicolas(a)gmail.com> --- arch/arm/mach-rockchip/rk3328/rk3328.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-rockchip/rk3328/rk3328.c b/arch/arm/mach-rockchip/rk3328/rk3328.c index de17b88682..2373586b14 100644 --- a/arch/arm/mach-rockchip/rk3328/rk3328.c +++ b/arch/arm/mach-rockchip/rk3328/rk3328.c @@ -19,6 +19,8 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xFF100000 #define UART2_BASE 0xFF130000 #define FW_DDR_CON_REG 0xFF7C0040 +#define QOS_VOP_OFFSET 0xFF760080 +#define QOS_VOP_PRIORITY 0x8 const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { [BROM_BOOTSOURCE_EMMC] = "/mmc@ff520000", @@ -54,6 +56,9 @@ int arch_cpu_init(void) /* Disable the ddr secure region setting to make it non-secure */ rk_setreg(FW_DDR_CON_REG, 0x200); +#else + printf("Setting VOP QoS\n"); + rk_setreg(QOS_VOP_OFFSET + QOS_VOP_PRIORITY, 0x2); #endif return 0; } -- 2.37.1

4 6

[PATCH] net: tftp: Fix for DATA ACK for block count out of order
by seanedmond＠linux.microsoft.com 05 Jan '23

05 Jan '23

From: Sean Edmond <seanedmond(a)microsoft.com> In rfc7440, if an ACK is not received by the server or if the last data block in a window is dropped, the server will timeout and retransmit the window. In this case, the block count received will be less than the internal block count. In this case, the client should not ACK. ACK should only be sent if the received block count is greater than the expected block count. Signed-off-by: Sean Edmond <seanedmond(a)microsoft.com> --- net/tftp.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/tftp.c b/net/tftp.c index c780c33f37..51e062bddf 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -592,6 +592,14 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, debug("Received unexpected block: %d, expected: %d\n", ntohs(*(__be16 *)pkt), (ushort)(tftp_cur_block + 1)); + /* + * Only ACK if the block count received is greater than + * the expected block count, otherwise skip ACK. + * (required to properly handle the server retransmitting + * the window) + */ + if ((ushort)(tftp_cur_block + 1) - (short)(ntohs(*(__be16 *)pkt)) > 0) + break; /* * If one packet is dropped most likely * all other buffers in the window -- 2.17.1

1 0

[PATCH 0/8] sunxi: Update H616 DRAM driver
by Jernej Skrabec 05 Jan '23

05 Jan '23

Current H616 DRAM driver is completely customized to Orange Pi Zero2 board, which is currently the only H616 board supported by U-Boot. Needless to say, this is not ideal for adding new boards. With changes in this series, all DDR3 boards are supported and all that is needed is just vendor DRAM values extracted from Android image. New DRAM types should also be easier to support, since a lot of constants used before are not really DRAM type dependent. Changes were verified by decompiling driver and generated values were compared to previous, hard coded ones. This was done without dram_para structures, so compiler was able to heavily optimize code and produce constants. Please take a look. Best regards, Jernej Jernej Skrabec (8): sunxi: Fix write to H616 DRAM CR register sunxi: cosmetic: Fix H616 DRAM driver code style sunxi: parameterize H616 DRAM ODT values sunxi: Convert H616 DRAM options to single setting sunxi: Always configure ODT on H616 DRAM sunxi: Make bit delay function in H616 DRAM code void sunxi: Parameterize bit delay code in H616 DRAM driver sunxi: Parameterize H616 DRAM code some more .../include/asm/arch-sunxi/dram_sun50i_h616.h | 18 + arch/arm/mach-sunxi/Kconfig | 67 +-- arch/arm/mach-sunxi/dram_sun50i_h616.c | 445 +++++++++++------- configs/orangepi_zero2_defconfig | 8 +- 4 files changed, 348 insertions(+), 190 deletions(-) -- 2.38.1

3 28

Pull request for efi-2023-01-rc5-3
by Heinrich Schuchardt 04 Jan '23

04 Jan '23

Dear Tom, The following changes since commit 582e3c9fb2337c2f49faa73ac86dde25f4d56901: Merge https://source.denx.de/u-boot/custodians/u-boot-marvell (2023-01-02 09:36:13 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2023-01-rc5-3 for you to fetch changes up to 60bba6e2052c281afe401247e10aebcb4c17049b: efi_loader: populate console handles in system table (2023-01-04 13:17:42 +0100) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/14580 ---------------------------------------------------------------- Pull request for efi-2023-01-rc5-3 Documentation: * Describe building documentation UEFI: * Add .data section to aarch64 EFI binaries and correct section flags * Correct sorting of capsules when updating * Populate console handles in system table Other: * Fix description of eth_env_[gs]et_enetaddr() return value * Avoid endless loop in sound play command ---------------------------------------------------------------- Heinrich Schuchardt (8): cmd: avoid endless loop in sound play command doc: building documentation efi_loader: defines for PE-COFF section flags efi_loader: fix building aarch64 EFI binaries lib: add function u16_strcasecmp() test: unit test for u16_strcasecmp() efi_loader: adjust sorting of capsules efi_loader: populate console handles in system table Marek Vasut (1): doc: Fix eth_env_[gs]et_enetaddr() return value arch/arm/lib/crt0_aarch64_efi.S | 47 +++++++++++++++------ arch/arm/lib/elf_aarch64_efi.lds | 6 ++- cmd/sound.c | 4 +- doc/build/documentation.rst | 90 ++++++++++++++++++++++++++++++++++++++++ doc/build/index.rst | 1 + include/asm-generic/pe.h | 13 ++++++ include/charset.h | 13 ++++++ include/env.h | 4 +- lib/charset.c | 26 ++++++++++++ lib/efi_loader/efi_boottime.c | 3 ++ lib/efi_loader/efi_capsule.c | 9 ++-- test/unicode_ut.c | 25 +++++++++++ 12 files changed, 219 insertions(+), 22 deletions(-) create mode 100644 doc/build/documentation.rst

2 1

[PATCH 1/2] clk: Allow clk_get_by_name() with NULL name
by Samuel Holland 04 Jan '23

04 Jan '23

This allows devm_clock_get(dev, NULL) to work and get the first clock, which is common in code ported from Linux. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- drivers/clk/clk-uclass.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 2f9635524cf..bfacafb2eef 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -399,13 +399,14 @@ int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk) int clk_get_by_name_nodev(ofnode node, const char *name, struct clk *clk) { - int index; + int index = 0; debug("%s(node=%p, name=%s, clk=%p)\n", __func__, ofnode_get_name(node), name, clk); clk->dev = NULL; - index = ofnode_stringlist_search(node, "clock-names", name); + if (name) + index = ofnode_stringlist_search(node, "clock-names", name); if (index < 0) { debug("fdt_stringlist_search() failed: %d\n", index); return index; -- 2.37.4

3 5