- U-Boot - denx.biz

[PATCH 00/13] Add support for Ethernet boot on AM62p-SK and AM68-SK
by Chintan Vankar 28 Jan '25

28 Jan '25

This series enables Ethernet boot on AM62p-SK and AM68-SK. This series is based on commit '6d41f0a39d6423c8e57e92ebbe9f8c0333a63f72' of origin/master branch of U-Boot. Logs: AM62p-SK Ethernet boot: https://gist.github.com/chintan013/cd622d329b0a5b894808daff3191bb9f AM68-SK Etherent boot: https://gist.github.com/chintan013/39e67a173327bcbdae1724c35341b445 Andreas Dannenberg (3): arm: mach-k3: am62p: Update SoC auto-gen data to enable CPSW boot board: ti: am62px: evm: Enable cache for AM62p configs: am62p: Add configs for enabling ETHBOOT in R5SPL Chintan Vankar (10): net: tftp: Increase TFTP pkt string length to include null character arm: mach-k3: j721s2: Update SoC auto-gen data to enable Ethernet boot arm: mach-k3: j721s2_spl: Alias Ethernet boot to CPGMAC arm: mach-k3: j721s2_init: Probe AM65 CPSW NUSS for R5/A72 SPL configs: am68: Add configs for enabling Ethboot in R5SPL configs: am68: Enable configs required for Ethernet boot arm: dts: k3-am68-sk-base-board-u-boot: Add bootph-all property to necessary nodes arm: mach-k3: am62p5_init: Probe AM65 CPSW NUSS for R5/A53 SPL configs: am62p: Enable configs required for Ethboot arch: arm: dts: k3-am62p5-sk-u-boot: Add bootph-all property to necessary nodes arch/arm/dts/k3-am62p5-sk-u-boot.dtsi | 32 ++++++++ .../arm/dts/k3-am68-sk-base-board-u-boot.dtsi | 28 +++++++ arch/arm/mach-k3/am62px/am62p5_init.c | 10 +++ arch/arm/mach-k3/include/mach/j721s2_spl.h | 1 + arch/arm/mach-k3/j721s2/j721s2_init.c | 10 +++ arch/arm/mach-k3/r5/am62px/clk-data.c | 44 +++++++++- arch/arm/mach-k3/r5/am62px/dev-data.c | 24 +++--- arch/arm/mach-k3/r5/j721s2/clk-data.c | 58 +++++++++++++- arch/arm/mach-k3/r5/j721s2/dev-data.c | 3 +- board/ti/am62px/evm.c | 8 ++ configs/am62px_evm_a53_ethboot_defconfig | 17 ++++ configs/am62px_evm_r5_ethboot_defconfig | 35 ++++++++ configs/am68_sk_a72_ethboot_defconfig | 18 +++++ configs/am68_sk_r5_ethboot_defconfig | 80 +++++++++++++++++++ net/tftp.c | 6 +- 15 files changed, 353 insertions(+), 21 deletions(-) create mode 100644 configs/am62px_evm_a53_ethboot_defconfig create mode 100644 configs/am62px_evm_r5_ethboot_defconfig create mode 100644 configs/am68_sk_a72_ethboot_defconfig create mode 100644 configs/am68_sk_r5_ethboot_defconfig -- 2.34.1

6 33

[PATCH][V2] Fix fastboot handling of partitions when no slots are supported
by Federico Fuga 28 Jan '25

28 Jan '25

The fastboot module has a bug that prevents some command to work properly on devices that haven't an Android-like partition scheme, that is, just one spl and one kernel partition, instead of the redundant scheme with _a and _b slots. This is the schema of our NAND storage (board is based on an AllWinner A33 sunxi chip): => mtdparts device nand0 <1c03000.nand>, # parts = 4 #: name size net size offset mask_flags 0: spl 0x00020000 0x00020000 0x00000000 0 1: uboot 0x00100000 0x00100000 0x00020000 0 2: kernel_a 0x00400000 0x00400000 0x00120000 0 3: ubi 0x07ae0000 0x079e0000 (!) 0x00520000 0 active partition: nand0,0 - (spl) 0x00020000 @ 0x00000000 This happens when we try to erase the spl partition using fastboot: $ fastboot erase spl Erasing 'spl_a' FAILED (remote: 'invalid NAND device') fastboot: error: Command failed The error occurs because getvars fails to handle the error returned by nand layer when a partition cannot be found. Indeed, getvar_get_part_info returns what is returned by fastboot_nand_get_part_info (0 on success, 1 on failure) but it should return -ENODEV or -EINVAL instead. Since the cause of failure is not returned by the nand function, I decided to return -EINVAL to make it simple. Signed-off-by: Federico Fuga <fuga(a)studiofuga.com> --- drivers/fastboot/fb_getvar.c | 5 ++++- drivers/fastboot/fb_nand.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 9c2ce65a4e..816ed8a621 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -121,8 +121,11 @@ static int getvar_get_part_info(const char *part_name, char *response, *size = disk_part.size * disk_part.blksz; } else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) { r = fastboot_nand_get_part_info(part_name, &part_info, response); - if (r >= 0 && size) + if (r == 0 && size) { *size = part_info->size; + } else { + r = -EINVAL; + } } else { fastboot_fail("this storage is not supported in bootloader", response); r = -ENODEV; diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c index afc64fd528..9e2f7c0189 100644 --- a/drivers/fastboot/fb_nand.c +++ b/drivers/fastboot/fb_nand.c @@ -151,7 +151,7 @@ static lbaint_t fb_nand_sparse_reserve(struct sparse_storage *info, * * @part_name: Named device to lookup * @part_info: Pointer to returned part_info pointer - * @response: Pointer to fastboot response buffer + * @response: 0 on success, 1 otherwise */ int fastboot_nand_get_part_info(const char *part_name, struct part_info **part_info, char *response) -- 2.48.1

2 1

[PATCH] Fix fastboot handling of partitions when no slots are supported
by Federico Fuga 28 Jan '25

28 Jan '25

The fastboot module has a bug that prevents some command to work properly on devices that haven't an Android-like partition scheme, that is, just one spl and one kernel partition, instead of the redundant scheme with _a and _b slots. This is the schema of our NAND storage (board is based on an AllWinner A33 sunxi chip): => mtdparts device nand0 <1c03000.nand>, # parts = 4 #: name size net size offset mask_flags 0: spl 0x00020000 0x00020000 0x00000000 0 1: uboot 0x00100000 0x00100000 0x00020000 0 2: kernel_a 0x00400000 0x00400000 0x00120000 0 3: ubi 0x07ae0000 0x079e0000 (!) 0x00520000 0 active partition: nand0,0 - (spl) 0x00020000 @ 0x00000000 This happens when we try to erase the spl partition using fastboot: $ fastboot erase spl Erasing 'spl_a' FAILED (remote: 'invalid NAND device') fastboot: error: Command failed The error occurs because getvars fails to handle the error returned by nand layer when a partition cannot be found. Indeed, getvar_get_part_info returns what is returned by fastboot_nand_get_part_info (0 on success, 1 on failure) but it should return -ENODEV or -EINVAL instead. Since the cause of failure is not returned by the nand function, I decided to return -EINVAL to make it simple. Signed-off-by: Federico Fuga <fuga(a)studiofuga.com> --- drivers/fastboot/fb_getvar.c | 5 ++++- drivers/fastboot/fb_nand.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 9c2ce65a4e..816ed8a621 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -121,8 +121,11 @@ static int getvar_get_part_info(const char *part_name, char *response, *size = disk_part.size * disk_part.blksz; } else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) { r = fastboot_nand_get_part_info(part_name, &part_info, response); - if (r >= 0 && size) + if (r == 0 && size) { *size = part_info->size; + } else { + r = -EINVAL; + } } else { fastboot_fail("this storage is not supported in bootloader", response); r = -ENODEV; diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c index afc64fd528..9e2f7c0189 100644 --- a/drivers/fastboot/fb_nand.c +++ b/drivers/fastboot/fb_nand.c @@ -151,7 +151,7 @@ static lbaint_t fb_nand_sparse_reserve(struct sparse_storage *info, * * @part_name: Named device to lookup * @part_info: Pointer to returned part_info pointer - * @response: Pointer to fastboot response buffer + * @response: 0 on success, 1 otherwise */ int fastboot_nand_get_part_info(const char *part_name, struct part_info **part_info, char *response) -- 2.48.1

1 0

[PATCH] Fix fastboot handling of partitions when no slots are, supported
by Federico Fuga 28 Jan '25

28 Jan '25

The fastboot module has a bug that prevents some command to work properly on devices that haven't an Android-like partition scheme, that is, just one spl and one kernel partition, instead of the redundant scheme with _a and _b slots. This is the schema of our NAND storage (board is based on an AllWinner A33 sunxi chip): => mtdparts device nand0 <1c03000.nand>, # parts = 4 #: name size net size offset mask_flags 0: spl 0x00020000 0x00020000 0x00000000 0 1: uboot 0x00100000 0x00100000 0x00020000 0 2: kernel 0x00400000 0x00400000 0x00120000 0 3: ubi 0x07ae0000 0x079e0000 (!) 0x00520000 0 active partition: nand0,0 - (spl) 0x00020000 @ 0x00000000 This happens when we try to erase the spl partition using fastboot: $ fastboot erase spl Erasing 'spl_a' FAILED (remote: 'invalid NAND device') fastboot: error: Command failed The error occurs because getvars fails to handle the error returned by nand layer when a partition cannot be found. Indeed, getvar_get_part_info returns what is returned by fastboot_nand_get_part_info (0 on success, 1 on failure) but it should return -ENODEV or -EINVAL instead. Since the cause of failure is not returned by the nand function, I decided to return -EINVAL to make it simple. Signed-off-by: Federico Fuga <fuga(a)studiofuga.com> --- drivers/fastboot/fb_getvar.c | 5 ++++- drivers/fastboot/fb_nand.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 93cbd598e0..f5d8b03301 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -121,8 +121,11 @@ static int getvar_get_part_info(const char *part_name, char *response, *size = disk_part.size * disk_part.blksz; } else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) { r = fastboot_nand_get_part_info(part_name, &part_info, response); - if (r >= 0 && size) + if (r == 0 && size) { *size = part_info->size; + } else { + r = -EINVAL; + } } else { fastboot_fail("this storage is not supported in bootloader", response); r = -ENODEV; diff --git a/drivers/fastboot/fb_nand.c b/drivers/fastboot/fb_nand.c index 5a55144479..3ee0f40ea8 100644 --- a/drivers/fastboot/fb_nand.c +++ b/drivers/fastboot/fb_nand.c @@ -141,7 +141,7 @@ static lbaint_t fb_nand_sparse_reserve(struct sparse_storage *info, * * @part_name: Named device to lookup * @part_info: Pointer to returned part_info pointer - * @response: Pointer to fastboot response buffer + * @response: 0 on success, 1 otherwise */ int fastboot_nand_get_part_info(const char *part_name, struct part_info **part_info, char *response) -- 2.48.1

2 3

[PATCH] usb: dwc2: Refactor register operations with clrsetbits macros
by Junhui Liu 28 Jan '25

28 Jan '25

Refactor DWC2 USB gadget driver to replace manual read-modify-write operations with `clrsetbits_le32`, `setbits_le32`, and `clrbits_le32` macros, which simplify the code and improve readability. Signed-off-by: Junhui Liu <junhui.liu(a)pigmoral.tech> --- This patch is a supplement of patch series [1]. [1] https://lore.kernel.org/u-boot/20250110-dwc2-dev-v4-0-987f4fd6f8b2@pigmoral… --- drivers/usb/gadget/dwc2_udc_otg.c | 16 ++------ drivers/usb/gadget/dwc2_udc_otg_phy.c | 33 ++++++---------- drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 63 +++++++----------------------- 3 files changed, 31 insertions(+), 81 deletions(-) diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index c3fdc81e9096bb216b63ff0ac672d216bed3f23d..40393141ca95b8947712a8996727391fe8742275 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -465,7 +465,6 @@ static void reconfig_usbd(struct dwc2_udc *dev) { /* 2. Soft-reset OTG Core and then unreset again. */ int i; - unsigned int uTemp; u32 dflt_gusbcfg; u32 rx_fifo_sz, tx_fifo_sz, np_tx_fifo_sz; u32 max_hw_ep; @@ -497,16 +496,12 @@ static void reconfig_usbd(struct dwc2_udc *dev) writel(dflt_gusbcfg, &reg->global_regs.gusbcfg); /* 3. Put the OTG device core in the disconnected state.*/ - uTemp = readl(&reg->device_regs.dctl); - uTemp |= DCTL_SFTDISCON; - writel(uTemp, &reg->device_regs.dctl); + setbits_le32(&reg->device_regs.dctl, DCTL_SFTDISCON); udelay(20); /* 4. Make the OTG device core exit from the disconnected state.*/ - uTemp = readl(&reg->device_regs.dctl); - uTemp = uTemp & ~DCTL_SFTDISCON; - writel(uTemp, &reg->device_regs.dctl); + clrbits_le32(&reg->device_regs.dctl, DCTL_SFTDISCON); /* 5. Configure OTG Core to initial settings of device mode.*/ /* [][1: full speed(30Mhz) 0:high speed]*/ @@ -592,7 +587,6 @@ static void reconfig_usbd(struct dwc2_udc *dev) static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed) { - unsigned int ep_ctrl; int i; if (speed == USB_SPEED_HIGH) { @@ -612,12 +606,10 @@ static void set_max_pktsize(struct dwc2_udc *dev, enum usb_device_speed speed) dev->ep[i].ep.maxpacket = ep_fifo_size; /* EP0 - Control IN (64 bytes)*/ - ep_ctrl = readl(&reg->device_regs.in_endp[EP0_CON].diepctl); - writel(ep_ctrl | (0 << 0), &reg->device_regs.in_endp[EP0_CON].diepctl); + setbits_le32(&reg->device_regs.in_endp[EP0_CON].diepctl, (0 << 0)); /* EP0 - Control OUT (64 bytes)*/ - ep_ctrl = readl(&reg->device_regs.out_endp[EP0_CON].doepctl); - writel(ep_ctrl | (0 << 0), &reg->device_regs.out_endp[EP0_CON].doepctl); + setbits_le32(&reg->device_regs.out_endp[EP0_CON].doepctl, (0 << 0)); } static int dwc2_ep_enable(struct usb_ep *_ep, diff --git a/drivers/usb/gadget/dwc2_udc_otg_phy.c b/drivers/usb/gadget/dwc2_udc_otg_phy.c index c7eea7b34421ad9bde86d42334852d2f21a133e8..e0ac5d142b0610461408754a59bfd2aa09848407 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_phy.c +++ b/drivers/usb/gadget/dwc2_udc_otg_phy.c @@ -48,29 +48,24 @@ void otg_phy_init(struct dwc2_udc *dev) printf("USB PHY0 Enable\n"); /* Enable PHY */ - writel(readl(usb_phy_ctrl) | USB_PHY_CTRL_EN0, usb_phy_ctrl); + setbits_le32(usb_phy_ctrl, USB_PHY_CTRL_EN0); if (dev->pdata->usb_flags == PHY0_SLEEP) /* C210 Universal */ - writel((readl(&phy->phypwr) - &~(PHY_0_SLEEP | OTG_DISABLE_0 | ANALOG_PWRDOWN) - &~FORCE_SUSPEND_0), &phy->phypwr); + clrbits_le32(&phy->phypwr, PHY_0_SLEEP | OTG_DISABLE_0 | + ANALOG_PWRDOWN | FORCE_SUSPEND_0); else /* C110 GONI */ - writel((readl(&phy->phypwr) &~(OTG_DISABLE_0 | ANALOG_PWRDOWN) - &~FORCE_SUSPEND_0), &phy->phypwr); + clrbits_le32(&phy->phypwr, OTG_DISABLE_0 | ANALOG_PWRDOWN | FORCE_SUSPEND_0); if (s5p_cpu_id == 0x4412) - writel((readl(&phy->phyclk) & ~(EXYNOS4X12_ID_PULLUP0 | - EXYNOS4X12_COMMON_ON_N0)) | EXYNOS4X12_CLK_SEL_24MHZ, - &phy->phyclk); /* PLL 24Mhz */ + clrsetbits_le32(&phy->phyclk, EXYNOS4X12_ID_PULLUP0 | EXYNOS4X12_COMMON_ON_N0, + EXYNOS4X12_CLK_SEL_24MHZ); /* PLL 24Mhz */ else - writel((readl(&phy->phyclk) & ~(ID_PULLUP0 | COMMON_ON_N0)) | - CLK_SEL_24MHZ, &phy->phyclk); /* PLL 24Mhz */ + clrsetbits_le32(&phy->phyclk, ID_PULLUP0 | COMMON_ON_N0, + CLK_SEL_24MHZ); /* PLL 24Mhz */ - writel((readl(&phy->rstcon) &~(LINK_SW_RST | PHYLNK_SW_RST)) - | PHY_SW_RST0, &phy->rstcon); + clrsetbits_le32(&phy->rstcon, LINK_SW_RST | PHYLNK_SW_RST, PHY_SW_RST0); udelay(10); - writel(readl(&phy->rstcon) - &~(PHY_SW_RST0 | LINK_SW_RST | PHYLNK_SW_RST), &phy->rstcon); + clrbits_le32(&phy->rstcon, PHY_SW_RST0 | LINK_SW_RST | PHYLNK_SW_RST); udelay(10); } @@ -86,13 +81,11 @@ void otg_phy_off(struct dwc2_udc *dev) writel(readl(&phy->phypwr) &~PHY_SW_RST0, &phy->rstcon); udelay(20); - writel(readl(&phy->phypwr) | OTG_DISABLE_0 | ANALOG_PWRDOWN - | FORCE_SUSPEND_0, &phy->phypwr); + setbits_le32(&phy->phypwr, OTG_DISABLE_0 | ANALOG_PWRDOWN | FORCE_SUSPEND_0); - writel(readl(usb_phy_ctrl) &~USB_PHY_CTRL_EN0, usb_phy_ctrl); + clrbits_le32(usb_phy_ctrl, USB_PHY_CTRL_EN0); - writel((readl(&phy->phyclk) & ~(ID_PULLUP0 | COMMON_ON_N0)), - &phy->phyclk); + clrbits_le32(&phy->phyclk, ID_PULLUP0 | COMMON_ON_N0); udelay(10000); diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c index 2be93592c423df7a9acea473b0e84e1f948999be..fca052b4556a7d2ae4fe516e39820611d7082e2f 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -31,15 +31,11 @@ int clear_feature_flag; static inline void dwc2_udc_ep0_zlp(struct dwc2_udc *dev) { - u32 ep_ctrl; - writel(phys_to_bus((unsigned long)usb_ctrl_dma_addr), &reg->device_regs.in_endp[EP0_CON].diepdma); writel(FIELD_PREP(DXEPTSIZ_PKTCNT_MASK, 1), &reg->device_regs.in_endp[EP0_CON].dieptsiz); - ep_ctrl = readl(&reg->device_regs.in_endp[EP0_CON].diepctl); - writel(ep_ctrl | DXEPCTL_EPENA | DXEPCTL_CNAK, - &reg->device_regs.in_endp[EP0_CON].diepctl); + setbits_le32(&reg->device_regs.in_endp[EP0_CON].diepctl, DXEPCTL_EPENA | DXEPCTL_CNAK); debug_cond(DEBUG_EP0 != 0, "%s:EP0 ZLP DIEPCTL0 = 0x%x\n", __func__, readl(&reg->device_regs.in_endp[EP0_CON].diepctl)); @@ -48,8 +44,6 @@ static inline void dwc2_udc_ep0_zlp(struct dwc2_udc *dev) static void dwc2_udc_pre_setup(void) { - u32 ep_ctrl; - debug_cond(DEBUG_IN_EP, "%s : Prepare Setup packets.\n", __func__); @@ -58,20 +52,16 @@ static void dwc2_udc_pre_setup(void) writel(phys_to_bus((unsigned long)usb_ctrl_dma_addr), &reg->device_regs.out_endp[EP0_CON].doepdma); - ep_ctrl = readl(&reg->device_regs.out_endp[EP0_CON].doepctl); - writel(ep_ctrl | DXEPCTL_EPENA, &reg->device_regs.out_endp[EP0_CON].doepctl); + setbits_le32(&reg->device_regs.out_endp[EP0_CON].doepctl, DXEPCTL_EPENA); debug_cond(DEBUG_EP0 != 0, "%s:EP0 ZLP DIEPCTL0 = 0x%x\n", __func__, readl(&reg->device_regs.in_endp[EP0_CON].diepctl)); debug_cond(DEBUG_EP0 != 0, "%s:EP0 ZLP DOEPCTL0 = 0x%x\n", __func__, readl(&reg->device_regs.out_endp[EP0_CON].doepctl)); - } static inline void dwc2_ep0_complete_out(void) { - u32 ep_ctrl; - debug_cond(DEBUG_EP0 != 0, "%s:EP0 ZLP DIEPCTL0 = 0x%x\n", __func__, readl(&reg->device_regs.in_endp[EP0_CON].diepctl)); debug_cond(DEBUG_EP0 != 0, "%s:EP0 ZLP DOEPCTL0 = 0x%x\n", @@ -85,15 +75,12 @@ static inline void dwc2_ep0_complete_out(void) writel(phys_to_bus((unsigned long)usb_ctrl_dma_addr), &reg->device_regs.out_endp[EP0_CON].doepdma); - ep_ctrl = readl(&reg->device_regs.out_endp[EP0_CON].doepctl); - writel(ep_ctrl | DXEPCTL_EPENA | DXEPCTL_CNAK, - &reg->device_regs.out_endp[EP0_CON].doepctl); + setbits_le32(&reg->device_regs.out_endp[EP0_CON].doepctl, DXEPCTL_EPENA | DXEPCTL_CNAK); debug_cond(DEBUG_EP0 != 0, "%s:EP0 ZLP DIEPCTL0 = 0x%x\n", __func__, readl(&reg->device_regs.in_endp[EP0_CON].diepctl)); debug_cond(DEBUG_EP0 != 0, "%s:EP0 ZLP DOEPCTL0 = 0x%x\n", __func__, readl(&reg->device_regs.out_endp[EP0_CON].doepctl)); - } static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req) @@ -136,12 +123,11 @@ static int setdma_rx(struct dwc2_ep *ep, struct dwc2_request *req) readl(&reg->device_regs.out_endp[ep_num].doepctl), buf, pktcnt, length); return 0; - } static int setdma_tx(struct dwc2_ep *ep, struct dwc2_request *req) { - u32 *buf, ctrl = 0; + u32 *buf; u32 length, pktcnt; u32 ep_num = ep_index(ep); @@ -171,16 +157,10 @@ static int setdma_tx(struct dwc2_ep *ep, struct dwc2_request *req) FIELD_PREP(DXEPTSIZ_XFERSIZE_MASK, length), &reg->device_regs.in_endp[ep_num].dieptsiz); - ctrl = readl(&reg->device_regs.in_endp[ep_num].diepctl); - - /* Write the FIFO number to be used for this endpoint */ - ctrl &= ~DXEPCTL_TXFNUM_MASK; - ctrl |= FIELD_PREP(DXEPCTL_TXFNUM_MASK, ep->fifo_num); - - /* Clear reserved (Next EP) bits */ - ctrl &= ~DXEPCTL_NEXTEP_MASK; - - writel(DXEPCTL_EPENA | DXEPCTL_CNAK | ctrl, &reg->device_regs.in_endp[ep_num].diepctl); + clrsetbits_le32(&reg->device_regs.in_endp[ep_num].diepctl, + DXEPCTL_TXFNUM_MASK | DXEPCTL_NEXTEP_MASK, + FIELD_PREP(DXEPCTL_TXFNUM_MASK, ep->fifo_num) | + DXEPCTL_EPENA | DXEPCTL_CNAK); debug_cond(DEBUG_IN_EP, "%s:EP%d TX DMA start : DIEPDMA0 = 0x%x," @@ -766,9 +746,7 @@ static int dwc2_fifo_read(struct dwc2_ep *ep, void *cp, int max) */ static void udc_set_address(struct dwc2_udc *dev, unsigned char address) { - u32 ctrl = readl(&reg->device_regs.dcfg); - - writel(FIELD_PREP(DCFG_DEVADDR_MASK, address) | ctrl, &reg->device_regs.dcfg); + setbits_le32(&reg->device_regs.dcfg, FIELD_PREP(DCFG_DEVADDR_MASK, address)); dwc2_udc_ep0_zlp(dev); @@ -892,7 +870,6 @@ static int dwc2_udc_get_status(struct dwc2_udc *dev, { u8 ep_num = crq->wIndex & 0x3; u16 g_status = 0; - u32 ep_ctrl; debug_cond(DEBUG_SETUP != 0, "%s: *** USB_REQ_GET_STATUS\n", __func__); @@ -940,9 +917,7 @@ static int dwc2_udc_get_status(struct dwc2_udc *dev, writel(FIELD_PREP(DXEPTSIZ_PKTCNT_MASK, 1) | FIELD_PREP(DXEPTSIZ_XFERSIZE_MASK, 2), &reg->device_regs.in_endp[EP0_CON].dieptsiz); - ep_ctrl = readl(&reg->device_regs.in_endp[EP0_CON].diepctl); - writel(ep_ctrl | DXEPCTL_EPENA | DXEPCTL_CNAK, - &reg->device_regs.in_endp[EP0_CON].diepctl); + setbits_le32(&reg->device_regs.in_endp[EP0_CON].diepctl, DXEPCTL_EPENA | DXEPCTL_CNAK); dev->ep0state = WAIT_FOR_NULL_COMPLETE; return 0; @@ -951,21 +926,16 @@ static int dwc2_udc_get_status(struct dwc2_udc *dev, static void dwc2_udc_set_nak(struct dwc2_ep *ep) { u8 ep_num; - u32 ep_ctrl = 0; ep_num = ep_index(ep); debug("%s: ep_num = %d, ep_type = %d\n", __func__, ep_num, ep->ep_type); if (ep_is_in(ep)) { - ep_ctrl = readl(&reg->device_regs.in_endp[ep_num].diepctl); - ep_ctrl |= DXEPCTL_SNAK; - writel(ep_ctrl, &reg->device_regs.in_endp[ep_num].diepctl); + setbits_le32(&reg->device_regs.in_endp[ep_num].diepctl, DXEPCTL_SNAK); debug("%s: set NAK, DIEPCTL%d = 0x%x\n", __func__, ep_num, readl(&reg->device_regs.in_endp[ep_num].diepctl)); } else { - ep_ctrl = readl(&reg->device_regs.out_endp[ep_num].doepctl); - ep_ctrl |= DXEPCTL_SNAK; - writel(ep_ctrl, &reg->device_regs.out_endp[ep_num].doepctl); + setbits_le32(&reg->device_regs.out_endp[ep_num].doepctl, DXEPCTL_SNAK); debug("%s: set NAK, DOEPCTL%d = 0x%x\n", __func__, ep_num, readl(&reg->device_regs.out_endp[ep_num].doepctl)); } @@ -995,12 +965,8 @@ static void dwc2_udc_ep_set_stall(struct dwc2_ep *ep) __func__, ep_num, readl(&reg->device_regs.in_endp[ep_num].diepctl)); } else { - ep_ctrl = readl(&reg->device_regs.out_endp[ep_num].doepctl); - /* set the stall bit */ - ep_ctrl |= DXEPCTL_STALL; - - writel(ep_ctrl, &reg->device_regs.out_endp[ep_num].doepctl); + setbits_le32(&reg->device_regs.out_endp[ep_num].doepctl, DXEPCTL_STALL); debug("%s: set stall, DOEPCTL%d = 0x%x\n", __func__, ep_num, readl(&reg->device_regs.out_endp[ep_num].doepctl)); } @@ -1145,9 +1111,8 @@ static void dwc2_udc_ep_activate(struct dwc2_ep *ep) } /* Unmask EP Interrtupt */ - writel(readl(&reg->device_regs.daintmsk) | daintmsk, &reg->device_regs.daintmsk); + setbits_le32(&reg->device_regs.daintmsk, daintmsk); debug("%s: DAINTMSK = 0x%x\n", __func__, readl(&reg->device_regs.daintmsk)); - } static int dwc2_udc_clear_feature(struct usb_ep *_ep) --- base-commit: 05051cfdf0ed6258a945ec181e36d14b7e450dbf change-id: 20250125-dwc2-clrsetbits-refactor-e485db93d296 prerequisite-message-id: <20250110-dwc2-dev-v4-0-987f4fd6f8b2(a)pigmoral.tech> prerequisite-patch-id: f05fe7f02791b8f5f6e89e3768584622c49e2ed7 prerequisite-patch-id: ba89fc49fb08beb94bc5c69c4b82e198a27c334d prerequisite-patch-id: bc3632796d0010d5711be9597c4222c23adbf9f7 prerequisite-patch-id: b30e9c649999f42bc5c659bde5650e8aa2a33acd prerequisite-patch-id: d6623dbacae347c4c7e339a294c60402667a359b prerequisite-patch-id: 64e64d31939ea7f69818883fbafb8c1906b53ecb prerequisite-patch-id: 9de6c80cd2996924b8f94a33f3e2a3dd63f1f57b prerequisite-patch-id: e1752a8f249752de133bda41a387b3d147d60453 Best regards, -- Junhui Liu <junhui.liu(a)pigmoral.tech>

3 2

[PATCH v3 00/13] Add imx8mp video support
by Miquel Raynal 28 Jan '25

28 Jan '25

In order to display a boot picture or an error message, the i.MX8MP display pipeline must be enabled. The SoC has support for various interfaces (LVDS, HDMI, DSI). The one supported in this series is the standard 4-lane LVDS output. The minimal setup is thus composed of: * An LCD InterFace (LCDIF) with an AXI/APB interface, generating a pixel stream * One LVDS Display Bridge (LDB), also named pixel mapper, which receives the pixel stream and route it to one or two (possibly combined) LVDS displays. * All necessary clocks and power controls coming from the MEDIAMIX control block. Patch 1 adds a very useful helper to the core in order to grab devices through endpoints instead of being limited to phandles. Video pipelines being often described using graphs endpoints, the introduced helper is used several times in the serires (there are 3 LCDIF, one of them being connected to the LDB, itself having 2 ports). Patch 2 is a fix which is necessary for this series to work properly, but is way broader than just this use case. In practice, when assigned clocks are defined in the device tree, the clock uclass tries to assign the parents first and then sets them to the correct frequency. This only works if the parents have been enabled themselves. Otherwise we end-up with a non-clocked parent. I believe this is not the intended behavior in general, but more importantly on the i.MX8MP, there are "clock slices" which have pre-requisites in order to be modified and selecting an ungated parent is one of them. All the other patches progressively build support for the whole video pipeline. Regarding the LCDIF driver, there is already a similar driver for older i.MX SoCs but I didn't manage to get it to work. It was written more than a decade ago while device-model, clocks and others were not yet generically supported. Thus, numerous ad-hoc solutions were implemented, which no longer fit today's requirements. I preferred to add a new "clean" driver instead of modifying the existing one because of the too high risk of breaking these platforms. Once proper clocks/power-domain descriptions will be added to them they might be converted (and tested) to work with the "new" implementation, but going the opposite way felt drawback. --- Changes in v3: - Fix a clock name in the imx8mp clock driver (mismatch between Linux and U-Boot). - Fixed the Azure tests with extra changes in the test files and sandbox configurations: https://dev.azure.com/u-boot/u-boot/_build/results?buildId=10296&view=resul… - Link to v2: https://lore.kernel.org/r/20241205-ge-mainline-display-support-v2-0-4683bb4… Changes in v2: - Add ISP clocks to avoid harmless errors when shutting down the pipeline. - Add power domain refcounting to avoid shutting down a power domain already disabled. This is useful when a device points several times to the same power domain in the DT. - Ensure the mediamix driver frees all the power domains it got a reference on. - Add an in-tree user as requested by Fabio: the EVK. - Use the same Kconfig prompts as in Linux. - Add sandbox tests for uclass_get_device_by_endpoint(). - Enclosed media clocks definitions within #if CONFIG_IS_ENABLED() guards to avoid bloating the SPL and configurations without video support, as Adam and Fabio advised. - Disable the enabled clocks in the remove path of the mediamix block driver. - Fix many typos. - Fix checkpatch warnings. - Rebase on next. - Collect tags - Link to v1: https://lore.kernel.org/r/20240910101344.110633-1-miquel.raynal@bootlin.com --- Miquel Raynal (13): dm: doc: Fix example dm: core: Add a helper to retrieve devices through graph endpoints sandbox: Add a fake DSI controller and link it to the panel test: dm: test-fdt: Add checks for uclass_get_device_by_endpoint() power-domain: Add refcounting clk: Ensure the parent clocks are enabled while reparenting clk: imx8mp: Add media related clocks imx: power-domain: Describe the i.MX8 MEDIAMIX domain imx: power-domain: Add support for the MEDIAMIX control block video: imx: Fix Makefile in order to be able to add other imx drivers video: imx: Add LDB driver video: imx: Add LCDIF driver imx8mp_evk: Enable display support arch/sandbox/dts/test.dts | 23 ++ configs/imx8mp_evk_defconfig | 7 + configs/sandbox64_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + doc/develop/driver-model/design.rst | 2 +- drivers/clk/clk-uclass.c | 21 +- drivers/clk/imx/clk-imx8mp.c | 69 +++++ drivers/core/uclass.c | 62 +++++ drivers/firmware/scmi/sandbox-scmi_devices.c | 1 + drivers/power/domain/Kconfig | 7 + drivers/power/domain/Makefile | 1 + drivers/power/domain/imx8m-power-domain.c | 17 ++ drivers/power/domain/imx8mp-mediamix.c | 208 +++++++++++++++ drivers/power/domain/power-domain-uclass.c | 37 ++- drivers/power/domain/sandbox-power-domain-test.c | 1 + drivers/video/Makefile | 2 +- drivers/video/imx/Kconfig | 9 + drivers/video/imx/Makefile | 4 +- drivers/video/imx/lcdif.c | 314 +++++++++++++++++++++++ drivers/video/imx/ldb.c | 251 ++++++++++++++++++ include/dm/uclass.h | 21 ++ include/power-domain.h | 4 +- test/dm/power-domain.c | 2 +- test/dm/test-fdt.c | 20 +- 24 files changed, 1072 insertions(+), 13 deletions(-) --- base-commit: c498b6cace9e0de45ea12146312f5a6f43a03a9b change-id: 20241205-ge-mainline-display-support-00cf60fbd2cc Best regards, -- Miquel Raynal <miquel.raynal(a)bootlin.com>

3 28

[PATCH] boot: android: handle boot images with missing DTB
by Sam Day 28 Jan '25

28 Jan '25

607b07554e2 removed the check on the return status of the android_image_get_dtb_img_addr call from android_image_get_dtb_by_index, which results in null pointer accesses shortly after when trying to check the header of a nonexistent DTB. Fixes: 607b07554e2 ("android: boot: move to andr_image_data structure") Signed-off-by: Sam Day <me(a)samcday.com> --- boot/image-android.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/boot/image-android.c b/boot/image-android.c index 60a422dfb74a6c683b3cf9d2b19b3ad1dbd0d151..4fdf56dd1bd4ee26cd4d030532f75d8f48c0b8ee 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -696,7 +696,10 @@ bool android_image_get_dtb_by_index(ulong hdr_addr, ulong vendor_boot_img, ulong dtb_addr; /* address of DTB blob with specified index */ u32 i; /* index iterator */ - android_image_get_dtb_img_addr(hdr_addr, vendor_boot_img, &dtb_img_addr); + if (!android_image_get_dtb_img_addr(hdr_addr, vendor_boot_img, + &dtb_img_addr)) + return false; + /* Check if DTB area of boot image is in DTBO format */ if (android_dt_check_header(dtb_img_addr)) { return android_dt_get_fdt_by_index(dtb_img_addr, index, addr, --- base-commit: a3b71cc6f5cc74d4edc5808790a3d2999ea3f7fe change-id: 20250123-android-handle-no-dtb-ac3e49f7bec6 Best regards, -- Sam Day <me(a)samcday.com>

2 1

[PATCH v7 1/3] bloblist: add api to get blob with size
by Raymond Mao 28 Jan '25

28 Jan '25

bloblist_find function only returns the pointer of blob data, which is fine for those self-describing data like FDT. But as a common scenario, an interface is needed to retrieve both the pointer and the size of the blob data. Add a few ut test cases for the new api. Signed-off-by: Raymond Mao <raymond.mao(a)linaro.org> Reviewed-by: Simon Glass <sjg(a)chromium.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Changes in v2 - Rename function argument. - Add ut tests. Changes in v3 - None. Changes in v4 - None. Changes in v5 - None. Changes in v6 - None. Changes in v7 - None. common/bloblist.c | 17 +++++++++++++++-- include/bloblist.h | 18 ++++++++++++++++++ test/common/bloblist.c | 4 ++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/common/bloblist.c b/common/bloblist.c index 110bb9dc44..ab48a3cdb9 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -222,14 +222,27 @@ static int bloblist_ensurerec(uint tag, struct bloblist_rec **recp, int size, } void *bloblist_find(uint tag, int size) +{ + void *blob = NULL; + int blob_size; + + blob = bloblist_get_blob(tag, &blob_size); + + if (size && size != blob_size) + return NULL; + + return blob; +} + +void *bloblist_get_blob(uint tag, int *sizep) { struct bloblist_rec *rec; rec = bloblist_findrec(tag); if (!rec) return NULL; - if (size && size != rec->size) - return NULL; + + *sizep = rec->size; return (void *)rec + rec_hdr_size(rec); } diff --git a/include/bloblist.h b/include/bloblist.h index f999391f74..52ba0ddcf8 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -250,6 +250,24 @@ static inline void *bloblist_check_magic(ulong addr) return ptr; } +#if CONFIG_IS_ENABLED(BLOBLIST) +/** + * bloblist_get_blob() - Find a blob and get the size of it + * + * Searches the bloblist and returns the blob with the matching tag + * + * @tag: Tag to search for (enum bloblist_tag_t) + * @sizep: Size of the blob found + * Return: pointer to bloblist if found, or NULL if not found + */ +void *bloblist_get_blob(uint tag, int *sizep); +#else +static inline void *bloblist_get_blob(uint tag, int *sizep) +{ + return NULL; +} +#endif + /** * bloblist_find() - Find a blob * diff --git a/test/common/bloblist.c b/test/common/bloblist.c index 4bca62110a..324127596f 100644 --- a/test/common/bloblist.c +++ b/test/common/bloblist.c @@ -98,10 +98,12 @@ static int bloblist_test_blob(struct unit_test_state *uts) struct bloblist_hdr *hdr; struct bloblist_rec *rec, *rec2; char *data; + int size = 0; /* At the start there should be no records */ hdr = clear_bloblist(); ut_assertnull(bloblist_find(TEST_TAG, TEST_BLOBLIST_SIZE)); + ut_assertnull(bloblist_get_blob(TEST_TAG, &size)); ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0, 0)); ut_asserteq(sizeof(struct bloblist_hdr), bloblist_get_size()); ut_asserteq(TEST_BLOBLIST_SIZE, bloblist_get_total_size()); @@ -114,6 +116,8 @@ static int bloblist_test_blob(struct unit_test_state *uts) ut_asserteq_addr(rec + 1, data); data = bloblist_find(TEST_TAG, TEST_SIZE); ut_asserteq_addr(rec + 1, data); + ut_asserteq_addr(bloblist_get_blob(TEST_TAG, &size), data); + ut_asserteq(size, TEST_SIZE); /* Check the data is zeroed */ ut_assertok(check_zero(data, TEST_SIZE)); -- 2.25.1

2 3

[PATCH 0/2] Snapdragon SC7280 pinctrl
by Caleb Connolly 28 Jan '25

28 Jan '25

Introduce and enable pinctrl support for SC7280 and QCM6490, similarly to other platforms. This was missed during RB3 Gen 2 bringup. --- Caleb Connolly (2): pinctrl: qcom: add sc7280 pinctrl driver qcom_defconfig: enable PINCTRL_QCOM_SC7280 configs/qcom_defconfig | 1 + drivers/pinctrl/qcom/Kconfig | 7 +++ drivers/pinctrl/qcom/Makefile | 1 + drivers/pinctrl/qcom/pinctrl-sc7280.c | 106 ++++++++++++++++++++++++++++++++++ 4 files changed, 115 insertions(+) --- base-commit: 639cd409987acf173eaffebe7876968b42fd7c32 // Caleb (they/them)

2 3

[PATCH v3 0/6] Reconfigure TPM when active hash algorithms dismatch
by Raymond Mao 28 Jan '25

28 Jan '25

This patch set implements PCR allocate command to handle the algorithm dismatches among TPM device, eventlog from previous boot stage and what U-Boot supports. It re-configurates TPM device if any active algorithms are not supported by U-Boot or does not exist in the eventlog passed in. To re-configurate, a PCR allocate command will be sent with new algorithm configurations, followed by a shutdown command and a hardware reset to activate those new configurations. If any of the algorithms from the eventlog does not supported by U-Boot or TPM device does not support all U-Boot algorithms, exit with error. This new feature is under control by a new introduced kconfig TPM_PCR_ALLOCATE. Raymond Mao (6): tpm: add TPM2_Shutdown command tpm: add TPM2_PCR_Allocate command tpm: add wrapper and helper APIs for PCR allocate tpm: add PCR allocate into the eventlog handling tpm: PCR allocate during PCR extend to disable the unsupported algorithms board: qemu-arm: select TPM_PCR_ALLOCATE cmd/tpm-v2.c | 128 ++++++++++++++++- configs/qemu_arm64_defconfig | 1 + include/tpm-v2.h | 53 ++++++- lib/Kconfig | 12 ++ lib/tpm-v2.c | 259 ++++++++++++++++++++++++++++++++++- lib/tpm_api.c | 4 +- lib/tpm_tcg2.c | 52 +++---- 7 files changed, 463 insertions(+), 46 deletions(-) -- 2.25.1

2 8