Re: [PULL] u-boot-usb/next
On Sat, Sep 16, 2023 at 12:16:18PM +0200, Marek Vasut wrote: > The following changes since commit 2fe4b54556ea6271237b35de68dc458bfceab94c: > > Merge branch '2023-09-14-remove-NEEDS_MANUAL_RELOC' into next (2023-09-14 > 16:23:49 -0400) > > are available in the Git repository at: > > git://source.denx.de/u-boot-usb.git next > > for you to fetch changes up to 2caf974b5fac69a1b778e64503f2c107a8d7c3a3: > > board: usb: Replace legacy usb_gadget_handle_interrupts() (2023-09-15 > 23:38:02 +0200) > Applied to u-boot/next, thanks! -- Tom signature.asc Description: PGP signature
Re: [PULL] u-boot-usb/next
On Tue, Sep 05, 2023 at 03:50:11PM +0200, Marek Vasut wrote: > The following changes since commit f2bb6d9ffd9ba0d0d89c00445a70cf81327a7af2: > > Merge tag 'doc-next' of https://source.denx.de/u-boot/custodians/u-boot-efi > into next (2023-09-02 09:08:34 -0400) > > are available in the Git repository at: > > git://source.denx.de/u-boot-usb.git next > > for you to fetch changes up to adee3ba577a6d5902b5af6c2368faf5f509003c6: > > usb: host: ohci-generic: Make usage of clock/reset bulk() API (2023-09-04 > 18:25:20 +0200) > Applied to u-boot/next, thanks! -- Tom signature.asc Description: PGP signature
Re: [PULL] u-boot-usb/next
On Thu, May 18, 2023 at 05:01:23PM +0200, Marek Vasut wrote: > The following changes since commit 5d0b3dde115b0d26d414199678983d01b738ad1b: > > Merge branch '2023-05-15-build-system-updates' into next (2023-05-15 > 15:26:54 -0400) > > are available in the Git repository at: > > git://source.denx.de/u-boot-usb.git next > > for you to fetch changes up to da83ada02a2684f743fadaf3b915e92f83d74628: > > usb: gadget: Add and use matching SPL USB ethernet gadget Kconfig symbols > (2023-05-17 01:51:39 +0200) > Applied to u-boot/next, thanks! -- Tom signature.asc Description: PGP signature
Re: [PULL] u-boot-usb/next
On Fri, Mar 03, 2023 at 01:05:10AM +0100, Marek Vasut wrote: > The following changes since commit 49cba67852f1fb5ef481bef3532b2cda96816e45: > > Merge branch 'next' of > https://source.denx.de/u-boot/custodians/u-boot-marvell into next > (2023-03-01 11:00:22 -0500) > > are available in the Git repository at: > > git://source.denx.de/u-boot-usb.git next > > for you to fetch changes up to ea436dbc40e01a6c483c41d7ec1e4a419fc6b7c0: > > dt-bindings: usb: mtk-xhci: add support mt8195 (2023-03-02 22:43:44 +0100) > Applied to u-boot/next, thanks! -- Tom signature.asc Description: PGP signature
Re: [PULL] u-boot-usb/next
On Wed, Feb 22, 2023 at 11:09:00PM +0100, Marek Vasut wrote: > On 2/22/23 19:37, Tom Rini wrote: > > On Wed, Feb 22, 2023 at 04:36:08PM +0100, Marek Vasut wrote: > > > > > The following changes since commit > > > 4eb7c5030d3f3c707c02a64dc8ea90de3da89928: > > > > > >Merge tag 'efi-2023-04-rc3' of > > > https://source.denx.de/u-boot/custodians/u-boot-efi (2023-02-19 17:03:30 > > > -0500) > > > > > > are available in the Git repository at: > > > > > >git://source.denx.de/u-boot-usb.git next > > > > This seems to be based on current master and not current next, can you > > please rebase? > > Try below, build just passed > > The following changes since commit 2bfd217a16978794b43f0a30111b7472fba232b6: > > Merge tag 'dm-next-valentine' of > https://source.denx.de/u-boot/custodians/u-boot-dm into next (2023-02-14 > 15:11:37 -0500) > > are available in the Git repository at: > > git://source.denx.de/u-boot-usb.git next > > for you to fetch changes up to aeb8b59f2f4aeb02ac87ec39f834177a0e260f85: > > uniphier_defconfig: Disable USB_XHCI_DWC3 (2023-02-22 19:40:11 +0100) > > > Kunihiko Hayashi (9): > usb: dwc3-generic: Allow different controller DT node pattern > usb: dwc3-generic: Add clock initialization in child DT node > usb: dwc3-generic: Export glue structures and functions > usb: dwc3-generic: Add the size of regs property to glue structure > reset: uniphier: Add USB glue reset support > clk: uniphier: Add missing USB SS-PHY clocks > phy: socionext: Add UniPhier USB3 PHY driver > usb: dwc3-uniphier: Use dwc3-generic instead of xhci-dwc3 > uniphier_defconfig: Disable USB_XHCI_DWC3 > > Marek Vasut (1): > usb: dwc3: Look up reference clock DT phandle in both controller DT > nodes > > configs/uniphier_v7_defconfig | 1 - > configs/uniphier_v8_defconfig | 1 - > drivers/clk/uniphier/clk-uniphier-sys.c | 5 +++ > drivers/phy/socionext/Kconfig | 8 + > drivers/phy/socionext/Makefile| 1 + > drivers/phy/socionext/phy-uniphier-usb3.c | 168 > +++ > drivers/reset/reset-uniphier.c| 78 > +- > drivers/usb/dwc3/Kconfig | 4 ++- > drivers/usb/dwc3/dwc3-generic.c | 132 > --- > drivers/usb/dwc3/dwc3-generic.h | 33 ++ > drivers/usb/dwc3/dwc3-uniphier.c | 116 > +-- > 11 files changed, 453 insertions(+), 94 deletions(-) > create mode 100644 drivers/phy/socionext/phy-uniphier-usb3.c > create mode 100644 drivers/usb/dwc3/dwc3-generic.h Applied to u-boot/next, thanks! -- Tom signature.asc Description: PGP signature
Re: [PULL] u-boot-usb/next
On 2/23/23 02:50, Tom Rini wrote: On Wed, Feb 22, 2023 at 11:09:00PM +0100, Marek Vasut wrote: On 2/22/23 19:37, Tom Rini wrote: On Wed, Feb 22, 2023 at 04:36:08PM +0100, Marek Vasut wrote: The following changes since commit 4eb7c5030d3f3c707c02a64dc8ea90de3da89928: Merge tag 'efi-2023-04-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi (2023-02-19 17:03:30 -0500) are available in the Git repository at: git://source.denx.de/u-boot-usb.git next This seems to be based on current master and not current next, can you please rebase? Try below, build just passed The following changes since commit 2bfd217a16978794b43f0a30111b7472fba232b6: Merge tag 'dm-next-valentine' of https://source.denx.de/u-boot/custodians/u-boot-dm into next (2023-02-14 15:11:37 -0500) are available in the Git repository at: git://source.denx.de/u-boot-usb.git next for you to fetch changes up to aeb8b59f2f4aeb02ac87ec39f834177a0e260f85: uniphier_defconfig: Disable USB_XHCI_DWC3 (2023-02-22 19:40:11 +0100) Kunihiko Hayashi (9): usb: dwc3-generic: Allow different controller DT node pattern usb: dwc3-generic: Add clock initialization in child DT node usb: dwc3-generic: Export glue structures and functions usb: dwc3-generic: Add the size of regs property to glue structure reset: uniphier: Add USB glue reset support clk: uniphier: Add missing USB SS-PHY clocks phy: socionext: Add UniPhier USB3 PHY driver usb: dwc3-uniphier: Use dwc3-generic instead of xhci-dwc3 uniphier_defconfig: Disable USB_XHCI_DWC3 Marek Vasut (1): usb: dwc3: Look up reference clock DT phandle in both controller DT nodes Getting there. I see: +(uniphier_v8 uniphier_v7) WARNING: unmet direct dependencies detected for PHY_UNIPHIER_USB3 +(uniphier_v8 uniphier_v7) Depends on [n]: PHY [=n] && ARCH_UNIPHIER [=y] +(uniphier_v8 uniphier_v7) Selected by [y]: +(uniphier_v8 uniphier_v7) - USB_DWC3_UNIPHIER [=y] && USB [=y] && ARCH_UNIPHIER [=y] && USB_DWC3 [=y] Which I will take a quick run at fixing, if you don't, shortly. I just sent this one, that should help: [PATCH] usb: dwc3-uniphier: Imply PHY
Re: [PULL] u-boot-usb/next
On Wed, Feb 22, 2023 at 11:09:00PM +0100, Marek Vasut wrote: > On 2/22/23 19:37, Tom Rini wrote: > > On Wed, Feb 22, 2023 at 04:36:08PM +0100, Marek Vasut wrote: > > > > > The following changes since commit > > > 4eb7c5030d3f3c707c02a64dc8ea90de3da89928: > > > > > >Merge tag 'efi-2023-04-rc3' of > > > https://source.denx.de/u-boot/custodians/u-boot-efi (2023-02-19 17:03:30 > > > -0500) > > > > > > are available in the Git repository at: > > > > > >git://source.denx.de/u-boot-usb.git next > > > > This seems to be based on current master and not current next, can you > > please rebase? > > Try below, build just passed > > The following changes since commit 2bfd217a16978794b43f0a30111b7472fba232b6: > > Merge tag 'dm-next-valentine' of > https://source.denx.de/u-boot/custodians/u-boot-dm into next (2023-02-14 > 15:11:37 -0500) > > are available in the Git repository at: > > git://source.denx.de/u-boot-usb.git next > > for you to fetch changes up to aeb8b59f2f4aeb02ac87ec39f834177a0e260f85: > > uniphier_defconfig: Disable USB_XHCI_DWC3 (2023-02-22 19:40:11 +0100) > > > Kunihiko Hayashi (9): > usb: dwc3-generic: Allow different controller DT node pattern > usb: dwc3-generic: Add clock initialization in child DT node > usb: dwc3-generic: Export glue structures and functions > usb: dwc3-generic: Add the size of regs property to glue structure > reset: uniphier: Add USB glue reset support > clk: uniphier: Add missing USB SS-PHY clocks > phy: socionext: Add UniPhier USB3 PHY driver > usb: dwc3-uniphier: Use dwc3-generic instead of xhci-dwc3 > uniphier_defconfig: Disable USB_XHCI_DWC3 > > Marek Vasut (1): > usb: dwc3: Look up reference clock DT phandle in both controller DT > nodes Getting there. I see: +(uniphier_v8 uniphier_v7) WARNING: unmet direct dependencies detected for PHY_UNIPHIER_USB3 +(uniphier_v8 uniphier_v7) Depends on [n]: PHY [=n] && ARCH_UNIPHIER [=y] +(uniphier_v8 uniphier_v7) Selected by [y]: +(uniphier_v8 uniphier_v7) - USB_DWC3_UNIPHIER [=y] && USB [=y] && ARCH_UNIPHIER [=y] && USB_DWC3 [=y] Which I will take a quick run at fixing, if you don't, shortly. -- Tom signature.asc Description: PGP signature
Re: [PULL] u-boot-usb/next
On 2/22/23 19:37, Tom Rini wrote: On Wed, Feb 22, 2023 at 04:36:08PM +0100, Marek Vasut wrote: The following changes since commit 4eb7c5030d3f3c707c02a64dc8ea90de3da89928: Merge tag 'efi-2023-04-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi (2023-02-19 17:03:30 -0500) are available in the Git repository at: git://source.denx.de/u-boot-usb.git next This seems to be based on current master and not current next, can you please rebase? Try below, build just passed The following changes since commit 2bfd217a16978794b43f0a30111b7472fba232b6: Merge tag 'dm-next-valentine' of https://source.denx.de/u-boot/custodians/u-boot-dm into next (2023-02-14 15:11:37 -0500) are available in the Git repository at: git://source.denx.de/u-boot-usb.git next for you to fetch changes up to aeb8b59f2f4aeb02ac87ec39f834177a0e260f85: uniphier_defconfig: Disable USB_XHCI_DWC3 (2023-02-22 19:40:11 +0100) Kunihiko Hayashi (9): usb: dwc3-generic: Allow different controller DT node pattern usb: dwc3-generic: Add clock initialization in child DT node usb: dwc3-generic: Export glue structures and functions usb: dwc3-generic: Add the size of regs property to glue structure reset: uniphier: Add USB glue reset support clk: uniphier: Add missing USB SS-PHY clocks phy: socionext: Add UniPhier USB3 PHY driver usb: dwc3-uniphier: Use dwc3-generic instead of xhci-dwc3 uniphier_defconfig: Disable USB_XHCI_DWC3 Marek Vasut (1): usb: dwc3: Look up reference clock DT phandle in both controller DT nodes configs/uniphier_v7_defconfig | 1 - configs/uniphier_v8_defconfig | 1 - drivers/clk/uniphier/clk-uniphier-sys.c | 5 +++ drivers/phy/socionext/Kconfig | 8 + drivers/phy/socionext/Makefile| 1 + drivers/phy/socionext/phy-uniphier-usb3.c | 168 +++ drivers/reset/reset-uniphier.c| 78 +- drivers/usb/dwc3/Kconfig | 4 ++- drivers/usb/dwc3/dwc3-generic.c | 132 --- drivers/usb/dwc3/dwc3-generic.h | 33 ++ drivers/usb/dwc3/dwc3-uniphier.c | 116 +-- 11 files changed, 453 insertions(+), 94 deletions(-) create mode 100644 drivers/phy/socionext/phy-uniphier-usb3.c create mode 100644 drivers/usb/dwc3/dwc3-generic.h
Re: [PULL] u-boot-usb/next
On Wed, Feb 22, 2023 at 04:36:08PM +0100, Marek Vasut wrote: > The following changes since commit 4eb7c5030d3f3c707c02a64dc8ea90de3da89928: > > Merge tag 'efi-2023-04-rc3' of > https://source.denx.de/u-boot/custodians/u-boot-efi (2023-02-19 17:03:30 > -0500) > > are available in the Git repository at: > > git://source.denx.de/u-boot-usb.git next This seems to be based on current master and not current next, can you please rebase? -- Tom signature.asc Description: PGP signature
Re: [PULL] u-boot-usb/next
This is without the DWC2 patch. The following changes since commit 26acc6395fee680cea72e51348bd59e206eb0464: Merge branch '2020-09-30-assorted-network-improvements' into next (2020-10-01 09:46:10 -0400) are available in the Git repository at: git://git.denx.de/u-boot-usb.git next for you to fetch changes up to e15e817f3eb13dd4b58f465b009164ecd8b997cf: usb: xhci-rcar: Add support for R8A774A1 SoC (2020-10-01 19:43:05 +0200) Chunfeng Yun (9): usb: xhci: add a member hci_version in xhci_ctrl struct usb: xhci: create one unified function to calculate TRB TD remainder usb: xhci: add quirks flag to support MediaTek xHCI 0.96 usb: xhci: convert to HCS_MAX_PORTS() usb: xhci: convert to TRB_TYPE() usb: xhci: convert to TRB_LEN() and TRB_INTR_TARGET() usb: xhci: convert to TRB_TX_TYPE() usb: xhci: use macros with parameter to fill ep_info2 usb: xhci: convert to readx_poll_sleep_timeout() Lad Prabhakar (1): usb: xhci-rcar: Add support for R8A774A1 SoC drivers/usb/host/xhci-mem.c | 18 +- drivers/usb/host/xhci-mtk.c | 1 + drivers/usb/host/xhci-rcar.c | 1 + drivers/usb/host/xhci-ring.c | 141 +++- drivers/usb/host/xhci.c | 37 include/usb/xhci.h | 18 -- 6 files changed, 98 insertions(+), 118 deletions(-)
Re: [PULL] u-boot-usb/next
On Thu, Oct 01, 2020 at 07:42:51PM +0200, Marek Vasut wrote:
> On 10/1/20 7:09 PM, Tom Rini wrote:
> > On Thu, Oct 01, 2020 at 10:29:11AM +0200, Marek Vasut wrote:
> >
> >> The following changes since commit
> >> ae52e75d23ce11f36b3eae758045da95a871f263:
> >>
> >> Merge tag 'for-v2021.01-next' of
> >> https://gitlab.denx.de/u-boot/custodians/u-boot-i2c into next
> >> (2020-09-17 09:55:01 -0400)
> >>
> >> are available in the Git repository at:
> >>
> >> git://git.denx.de/u-boot-usb.git next
> >>
> >> for you to fetch changes up to 4fb50766433626f4d57e7491e638bc55d80badef:
> >>
> >> usb: xhci-rcar: Add support for R8A774A1 SoC (2020-09-22 13:40:27 +0200)
> >>
> >
> > NAK. Introduces a failure to build on:
>
> Interesting, this must be new.
Hmm? 4fb507664336 has this fail to build.
> > rpi_4 poplar odroid-c4 odroid-n2 khadas-vim libretech-ac libretech-cc
> > khadas-vim2 libretech-s905d-pc libretech-s912-pc sei510 sei610 u200
> > khadas-vim3 khadas-vim3l odroid-go2 evb-px30 firefly-px30 roc-cc-rk3308
> > evb-rk3308 evb-rk3328 roc-cc-rk3328 rock-pi-e-rk3328 rock64-rk3328
> > such as:
> > +(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c: In function
> > 'process_ep_out_intr':
> > +(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c:425:18: error: cast
> > from pointer to integer of different size [-Werror=pointer-to-int-cast]
> > +(rpi_4) 425 | u32 epsiz_reg = (u32)>out_endp[ep_num].doeptsiz;
> > +(rpi_4) | ^
> > +(rpi_4) In file included from drivers/usb/gadget/dwc2_udc_otg.c:42:
> > +(rpi_4) arch/arm/include/asm/io.h:45:28: error: cast to pointer from
> > integer of different size [-Werror=int-to-pointer-cast]
> > +(rpi_4)45 | #define __arch_getl(a) (*(volatile unsigned int *)(a))
> > +(rpi_4) |^
> > +(rpi_4) arch/arm/include/asm/io.h:127:31: note: in expansion of macro
> > '__arch_getl'
> > +(rpi_4) 127 | #define readl(c) ({ u32 __v = __arch_getl(c); __iormb();
> > __v; })
> > +(rpi_4) | ^~~
> > +(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c:447:15: note: in
> > expansion of macro 'readl'
> > +(rpi_4) 447 | ep_tsr = readl(epsiz_reg);
> > +(rpi_4) | ^
> > +(rpi_4) cc1: all warnings being treated as errors
> > +(rpi_4) make[2]: *** [drivers/usb/gadget/dwc2_udc_otg.o] Error 1
> > +(rpi_4) make[1]: *** [drivers/usb/gadget] Error 2
> > +(rpi_4) make: *** [sub-make] Error 2
> >
> > Since you'll have to dig in here anyhow, there's also a typo in the
> > commit message of:
> > commit d033774655ee4dd7b3fc45bc5273b8c7a892a5b2
> > Author: Chance.Yang
> > Date: Tue Sep 22 16:48:42 2020 +0800
> >
> > usb: dwc2: Fix contorl OUT transfer issue
>
> It would be useful to CC the author of that patch.
> I will drop the patch for now and wait for a fixed one.
... it is likely that the patch I flagged only because of the typo is
also the patch that introduced breakage, in hindsight.
--
Tom
signature.asc
Description: PGP signature
Re: [PULL] u-boot-usb/next
On 10/1/20 7:09 PM, Tom Rini wrote:
> On Thu, Oct 01, 2020 at 10:29:11AM +0200, Marek Vasut wrote:
>
>> The following changes since commit ae52e75d23ce11f36b3eae758045da95a871f263:
>>
>> Merge tag 'for-v2021.01-next' of
>> https://gitlab.denx.de/u-boot/custodians/u-boot-i2c into next
>> (2020-09-17 09:55:01 -0400)
>>
>> are available in the Git repository at:
>>
>> git://git.denx.de/u-boot-usb.git next
>>
>> for you to fetch changes up to 4fb50766433626f4d57e7491e638bc55d80badef:
>>
>> usb: xhci-rcar: Add support for R8A774A1 SoC (2020-09-22 13:40:27 +0200)
>>
>
> NAK. Introduces a failure to build on:
Interesting, this must be new.
> rpi_4 poplar odroid-c4 odroid-n2 khadas-vim libretech-ac libretech-cc
> khadas-vim2 libretech-s905d-pc libretech-s912-pc sei510 sei610 u200
> khadas-vim3 khadas-vim3l odroid-go2 evb-px30 firefly-px30 roc-cc-rk3308
> evb-rk3308 evb-rk3328 roc-cc-rk3328 rock-pi-e-rk3328 rock64-rk3328
> such as:
> +(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c: In function
> 'process_ep_out_intr':
> +(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c:425:18: error: cast from
> pointer to integer of different size [-Werror=pointer-to-int-cast]
> +(rpi_4) 425 | u32 epsiz_reg = (u32)>out_endp[ep_num].doeptsiz;
> +(rpi_4) | ^
> +(rpi_4) In file included from drivers/usb/gadget/dwc2_udc_otg.c:42:
> +(rpi_4) arch/arm/include/asm/io.h:45:28: error: cast to pointer from integer
> of different size [-Werror=int-to-pointer-cast]
> +(rpi_4)45 | #define __arch_getl(a) (*(volatile unsigned int *)(a))
> +(rpi_4) |^
> +(rpi_4) arch/arm/include/asm/io.h:127:31: note: in expansion of macro
> '__arch_getl'
> +(rpi_4) 127 | #define readl(c) ({ u32 __v = __arch_getl(c); __iormb();
> __v; })
> +(rpi_4) | ^~~
> +(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c:447:15: note: in
> expansion of macro 'readl'
> +(rpi_4) 447 | ep_tsr = readl(epsiz_reg);
> +(rpi_4) | ^
> +(rpi_4) cc1: all warnings being treated as errors
> +(rpi_4) make[2]: *** [drivers/usb/gadget/dwc2_udc_otg.o] Error 1
> +(rpi_4) make[1]: *** [drivers/usb/gadget] Error 2
> +(rpi_4) make: *** [sub-make] Error 2
>
> Since you'll have to dig in here anyhow, there's also a typo in the
> commit message of:
> commit d033774655ee4dd7b3fc45bc5273b8c7a892a5b2
> Author: Chance.Yang
> Date: Tue Sep 22 16:48:42 2020 +0800
>
> usb: dwc2: Fix contorl OUT transfer issue
It would be useful to CC the author of that patch.
I will drop the patch for now and wait for a fixed one.
Re: [PULL] u-boot-usb/next
On Thu, Oct 01, 2020 at 10:29:11AM +0200, Marek Vasut wrote:
> The following changes since commit ae52e75d23ce11f36b3eae758045da95a871f263:
>
> Merge tag 'for-v2021.01-next' of
> https://gitlab.denx.de/u-boot/custodians/u-boot-i2c into next
> (2020-09-17 09:55:01 -0400)
>
> are available in the Git repository at:
>
> git://git.denx.de/u-boot-usb.git next
>
> for you to fetch changes up to 4fb50766433626f4d57e7491e638bc55d80badef:
>
> usb: xhci-rcar: Add support for R8A774A1 SoC (2020-09-22 13:40:27 +0200)
>
NAK. Introduces a failure to build on:
rpi_4 poplar odroid-c4 odroid-n2 khadas-vim libretech-ac libretech-cc
khadas-vim2 libretech-s905d-pc libretech-s912-pc sei510 sei610 u200
khadas-vim3 khadas-vim3l odroid-go2 evb-px30 firefly-px30 roc-cc-rk3308
evb-rk3308 evb-rk3328 roc-cc-rk3328 rock-pi-e-rk3328 rock64-rk3328
such as:
+(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c: In function
'process_ep_out_intr':
+(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c:425:18: error: cast from
pointer to integer of different size [-Werror=pointer-to-int-cast]
+(rpi_4) 425 | u32 epsiz_reg = (u32)>out_endp[ep_num].doeptsiz;
+(rpi_4) | ^
+(rpi_4) In file included from drivers/usb/gadget/dwc2_udc_otg.c:42:
+(rpi_4) arch/arm/include/asm/io.h:45:28: error: cast to pointer from integer
of different size [-Werror=int-to-pointer-cast]
+(rpi_4)45 | #define __arch_getl(a) (*(volatile unsigned int *)(a))
+(rpi_4) |^
+(rpi_4) arch/arm/include/asm/io.h:127:31: note: in expansion of macro
'__arch_getl'
+(rpi_4) 127 | #define readl(c) ({ u32 __v = __arch_getl(c); __iormb(); __v;
})
+(rpi_4) | ^~~
+(rpi_4) drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c:447:15: note: in expansion
of macro 'readl'
+(rpi_4) 447 | ep_tsr = readl(epsiz_reg);
+(rpi_4) | ^
+(rpi_4) cc1: all warnings being treated as errors
+(rpi_4) make[2]: *** [drivers/usb/gadget/dwc2_udc_otg.o] Error 1
+(rpi_4) make[1]: *** [drivers/usb/gadget] Error 2
+(rpi_4) make: *** [sub-make] Error 2
Since you'll have to dig in here anyhow, there's also a typo in the
commit message of:
commit d033774655ee4dd7b3fc45bc5273b8c7a892a5b2
Author: Chance.Yang
Date: Tue Sep 22 16:48:42 2020 +0800
usb: dwc2: Fix contorl OUT transfer issue
Thanks!
--
Tom
signature.asc
Description: PGP signature
Re: [PULL] u-boot-usb/next
On Mon, Mar 30, 2020 at 11:32:39AM +0200, Marek Vasut wrote: > A couple of fixed/cleans, this is for next: > > The following changes since commit 350c44dfb99017e9147ee07d37a40626bde62250: > > Merge branch '2020-03-27-master-imports' (2020-03-27 17:54:38 -0400) > > are available in the Git repository at: > > git://git.denx.de/u-boot-usb.git next > > for you to fetch changes up to ac28e59a574dd231a4787752d923f618587e3d10: > > usb: Migrate to support live DT for some driver (2020-03-30 03:48:53 > +0200) > Applied to u-boot/next, thanks! -- Tom signature.asc Description: PGP signature
Re: [U-Boot] U-Boot git usage model (was: Re: [PULL] u-boot-usb/next)
On Tue, Oct 09, 2012 at 02:32:08PM -0700, Tom Rini wrote: On Tue, Oct 09, 2012 at 03:03:28PM -0600, Stephen Warren wrote: [snip] The problem with rebasing when pulling is that git commit IDs change, so it's much more difficult to determine when a commit is merged into a parent tree; one has to search by commit subject rather than just executing e.g. git branch -a --contains XXX. I thought Albert just agreed to use merges rather than rebases for u-boot-arm for this and perhaps other reasons. The short answer is that right now, u-boot/next follows the linux-next model and we rebase as needed. I'm going to reply to myself, in hopes of clearing things up. We don't follow the linux-next model, really, I miss-spoke. History is important. But so is getting the amount of process for the size of the project. The other thing is that we're doing simultaneous development for both the current release and the next release. So for the master branch of the master repo, it must never rebase. And as Wolfgang encourages users to use the custodian repository of mainline isn't quite up to what they need, custodian repositories must also keep their master branch un-rebased as much as humanly possible (my rule of thumb would be once it's been in the wild for a few days, it's too late). The next branch however can be rebased, as needed. In the case of post-v2012.10, it will be rebased as we want the commit to change how ARM and unaligned accesses are handled to be the first thing. I don't think perfect changes A-G were done in repository X against tree Y is the most useful bit of information. When we rebase we may lose that boards 1/2/3 worked at point Y but we gain change D is when board 2 broke as part of being merged with other changes. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot git usage model (was: Re: [PULL] u-boot-usb/next)
On 10/11/2012 11:38:00 AM, Tom Rini wrote: On Tue, Oct 09, 2012 at 02:32:08PM -0700, Tom Rini wrote: On Tue, Oct 09, 2012 at 03:03:28PM -0600, Stephen Warren wrote: [snip] The problem with rebasing when pulling is that git commit IDs change, so it's much more difficult to determine when a commit is merged into a parent tree; one has to search by commit subject rather than just executing e.g. git branch -a --contains XXX. I thought Albert just agreed to use merges rather than rebases for u-boot-arm for this and perhaps other reasons. The short answer is that right now, u-boot/next follows the linux-next model and we rebase as needed. I'm going to reply to myself, in hopes of clearing things up. We don't follow the linux-next model, really, I miss-spoke. History is important. But so is getting the amount of process for the size of the project. The other thing is that we're doing simultaneous development for both the current release and the next release. So for the master branch of the master repo, it must never rebase. And as Wolfgang encourages users to use the custodian repository of mainline isn't quite up to what they need, custodian repositories must also keep their master branch un-rebased as much as humanly possible (my rule of thumb would be once it's been in the wild for a few days, it's too late). The next branch however can be rebased, as needed. Why is the next branch any different? Users and custodians will both be affected by any rebase, just as if a master branch gets rebased. This hybrid of the Linux approach and what was described in this thread as the U-Boot approach is worse than consistently doing one or the other IMHO. In the case of post-v2012.10, it will be rebased as we want the commit to change how ARM and unaligned accesses are handled to be the first thing. Any particular reason, short of telling people whose patches have already been accepted that they need to respin them? I don't think perfect changes A-G were done in repository X against tree Y is the most useful bit of information. When we rebase we may lose that boards 1/2/3 worked at point Y but we gain change D is when board 2 broke as part of being merged with other changes. I don't follow. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] U-Boot git usage model (was: Re: [PULL] u-boot-usb/next)
On 10/09/2012 08:23 AM, Tom Rini wrote: On Sun, Oct 07, 2012 at 08:49:00PM +0200, Marek Vasut wrote: NOTE: I get a few more size issues with ELDK 4.2 on IXP (that big-endian ARM) after this patchset is applied. I wonder if we shouldn't just throw these away, since they're dead code mostly. The following changes since commit c7ee66a8222660b565e9240775efa4c82cb348c2: Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next (2012-10-02 10:16:40 -0700) are available in the git repository at: git://git.denx.de/u-boot-usb.git next for you to fetch changes up to f0ede0e8305bc3c959862446bce40cb028b36293: usb.h: Add udc_disconnect prototype to usb.h (2012-10-07 02:08:48 +0200) I had to rebase this locally to merge (such is next), and now it's applied to u-boot/next, thanks! Hmm. Can't git merge solve merge conflicts just as well as git rebase? The problem with rebasing when pulling is that git commit IDs change, so it's much more difficult to determine when a commit is merged into a parent tree; one has to search by commit subject rather than just executing e.g. git branch -a --contains XXX. I thought Albert just agreed to use merges rather than rebases for u-boot-arm for this and perhaps other reasons. It would be awesome if U-Boot could adopt something more similar to the Linux kernel's git usage model, namely: * All downstream branches are based off some known stable point in the master branch (e.g. 2012.10-rc1). Before these branches are merged into any other branch, they can be rebased if absolutely needed, but preferably not. * Once a downstream branch is merged upwards, the downstream branch doesn't merge upstream back down into the downstream branch, but either: a) Keeps adding to the existing branch so that incremental pull requests can be sent. Or often when u-boot/master has made a complete new release does: b) Creates a new branch based on the latest rc or release from u-boot/master. (in practice, downstream branches typically end up with something like for-3.5 based on v3.4-rcN, for-3.6 based on v3.5-rcN, for-3.7 based on v3.6-rcN, some running in parallel containing either important bugfixes for the release or new development as determined by the current state of the various releases in the mainline tree). * When a branch is merged from a repo to a parent repo, it's always a git merge --no-ff; never a rebase or fast-forward. * In order to resolve merge conflicts/dependencies between different downstream branches, one of the following happens: 1) a) The first downstream branch gets merged into u-boot/master. b) The second downstream branch creates a new branch starting at an an rc or release in u-boot-master that contains it the required patches. c) The dependent patches are applied to the second downstream branch. d) The second downstream branch gets merged into u-boot/master. 2) All the patches that would usually be merged through downstream branch 2 actually get ack'd by the maintainer of downstream branch 2 and applied to downstream branch 1 after the patches they depend on. This is simplest, but may cause complications if both branches need to take patches that build on the merged patches they're merged into an rc or release in u-boot/master. 3) A topic branch is created by one of the downstream maintainers, branched from a u-boot/master rc or release, and containing just the patches that other patches depend on, and this topic branch gets merged into both the two downstream branches for further work. Yes, this does all take a little bit more thought, planning, and co-ordination, but I think having a simpler and more stable git history is worth it. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot git usage model (was: Re: [PULL] u-boot-usb/next)
On Tue, Oct 09, 2012 at 03:03:28PM -0600, Stephen Warren wrote: On 10/09/2012 08:23 AM, Tom Rini wrote: On Sun, Oct 07, 2012 at 08:49:00PM +0200, Marek Vasut wrote: NOTE: I get a few more size issues with ELDK 4.2 on IXP (that big-endian ARM) after this patchset is applied. I wonder if we shouldn't just throw these away, since they're dead code mostly. The following changes since commit c7ee66a8222660b565e9240775efa4c82cb348c2: Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next (2012-10-02 10:16:40 -0700) are available in the git repository at: git://git.denx.de/u-boot-usb.git next for you to fetch changes up to f0ede0e8305bc3c959862446bce40cb028b36293: usb.h: Add udc_disconnect prototype to usb.h (2012-10-07 02:08:48 +0200) I had to rebase this locally to merge (such is next), and now it's applied to u-boot/next, thanks! Hmm. Can't git merge solve merge conflicts just as well as git rebase? The problem with rebasing when pulling is that git commit IDs change, so it's much more difficult to determine when a commit is merged into a parent tree; one has to search by commit subject rather than just executing e.g. git branch -a --contains XXX. I thought Albert just agreed to use merges rather than rebases for u-boot-arm for this and perhaps other reasons. The short answer is that right now, u-boot/next follows the linux-next model and we rebase as needed. It would be awesome if U-Boot could adopt something more similar to the Linux kernel's git usage model, namely: * All downstream branches are based off some known stable point in the master branch (e.g. 2012.10-rc1). Before these branches are merged into any other branch, they can be rebased if absolutely needed, but preferably not. * Once a downstream branch is merged upwards, the downstream branch doesn't merge upstream back down into the downstream branch, but either: a) Keeps adding to the existing branch so that incremental pull requests can be sent. Or often when u-boot/master has made a complete new release does: b) Creates a new branch based on the latest rc or release from u-boot/master. (in practice, downstream branches typically end up with something like for-3.5 based on v3.4-rcN, for-3.6 based on v3.5-rcN, for-3.7 based on v3.6-rcN, some running in parallel containing either important bugfixes for the release or new development as determined by the current state of the various releases in the mainline tree). * When a branch is merged from a repo to a parent repo, it's always a git merge --no-ff; never a rebase or fast-forward. * In order to resolve merge conflicts/dependencies between different downstream branches, one of the following happens: 1) a) The first downstream branch gets merged into u-boot/master. b) The second downstream branch creates a new branch starting at an an rc or release in u-boot-master that contains it the required patches. c) The dependent patches are applied to the second downstream branch. d) The second downstream branch gets merged into u-boot/master. 2) All the patches that would usually be merged through downstream branch 2 actually get ack'd by the maintainer of downstream branch 2 and applied to downstream branch 1 after the patches they depend on. This is simplest, but may cause complications if both branches need to take patches that build on the merged patches they're merged into an rc or release in u-boot/master. 3) A topic branch is created by one of the downstream maintainers, branched from a u-boot/master rc or release, and containing just the patches that other patches depend on, and this topic branch gets merged into both the two downstream branches for further work. Yes, this does all take a little bit more thought, planning, and co-ordination, but I think having a simpler and more stable git history is worth it. Interesting. As this is more work on the custodians end, what does everyone else say? -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] U-Boot git usage model (was: Re: [PULL] u-boot-usb/next)
Hi Tom, On Tue, 9 Oct 2012 14:32:08 -0700, Tom Rini tr...@ti.com wrote: On Tue, Oct 09, 2012 at 03:03:28PM -0600, Stephen Warren wrote: On 10/09/2012 08:23 AM, Tom Rini wrote: On Sun, Oct 07, 2012 at 08:49:00PM +0200, Marek Vasut wrote: NOTE: I get a few more size issues with ELDK 4.2 on IXP (that big-endian ARM) after this patchset is applied. I wonder if we shouldn't just throw these away, since they're dead code mostly. The following changes since commit c7ee66a8222660b565e9240775efa4c82cb348c2: Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next (2012-10-02 10:16:40 -0700) are available in the git repository at: git://git.denx.de/u-boot-usb.git next for you to fetch changes up to f0ede0e8305bc3c959862446bce40cb028b36293: usb.h: Add udc_disconnect prototype to usb.h (2012-10-07 02:08:48 +0200) I had to rebase this locally to merge (such is next), and now it's applied to u-boot/next, thanks! Hmm. Can't git merge solve merge conflicts just as well as git rebase? The problem with rebasing when pulling is that git commit IDs change, so it's much more difficult to determine when a commit is merged into a parent tree; one has to search by commit subject rather than just executing e.g. git branch -a --contains XXX. I thought Albert just agreed to use merges rather than rebases for u-boot-arm for this and perhaps other reasons. The short answer is that right now, u-boot/next follows the linux-next model and we rebase as needed. It would be awesome if U-Boot could adopt something more similar to the Linux kernel's git usage model, namely: * All downstream branches are based off some known stable point in the master branch (e.g. 2012.10-rc1). Before these branches are merged into any other branch, they can be rebased if absolutely needed, but preferably not. * Once a downstream branch is merged upwards, the downstream branch doesn't merge upstream back down into the downstream branch, but either: a) Keeps adding to the existing branch so that incremental pull requests can be sent. Or often when u-boot/master has made a complete new release does: b) Creates a new branch based on the latest rc or release from u-boot/master. (in practice, downstream branches typically end up with something like for-3.5 based on v3.4-rcN, for-3.6 based on v3.5-rcN, for-3.7 based on v3.6-rcN, some running in parallel containing either important bugfixes for the release or new development as determined by the current state of the various releases in the mainline tree). * When a branch is merged from a repo to a parent repo, it's always a git merge --no-ff; never a rebase or fast-forward. * In order to resolve merge conflicts/dependencies between different downstream branches, one of the following happens: 1) a) The first downstream branch gets merged into u-boot/master. b) The second downstream branch creates a new branch starting at an an rc or release in u-boot-master that contains it the required patches. c) The dependent patches are applied to the second downstream branch. d) The second downstream branch gets merged into u-boot/master. 2) All the patches that would usually be merged through downstream branch 2 actually get ack'd by the maintainer of downstream branch 2 and applied to downstream branch 1 after the patches they depend on. This is simplest, but may cause complications if both branches need to take patches that build on the merged patches they're merged into an rc or release in u-boot/master. 3) A topic branch is created by one of the downstream maintainers, branched from a u-boot/master rc or release, and containing just the patches that other patches depend on, and this topic branch gets merged into both the two downstream branches for further work. Yes, this does all take a little bit more thought, planning, and co-ordination, but I think having a simpler and more stable git history is worth it. Interesting. As this is more work on the custodians end, what does everyone else say? IIUC the current rule for U-Boot is that master branches do not rebase while next branches can (as Tom said). Apart from this, I'm not sure why forbidding fast-forward is a good thing, but if there are benefits, why not. Re merging from upstream back into downstream branches, I tend to think that must be allowed considering custodian trees are supposed to be useable, and as such may need to merge back from mainline. And I am pretty sure we don't need to create branches for such version based on such version all the time; keeping each custodian master current enough should suffice IMO. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
