mbox series

[PULL] u-boot-usb/next

Message ID de721513-9738-dbac-e6ad-34748b15465a@denx.de
State Accepted
Delegated to: Tom Rini
Headers show
Series [PULL] u-boot-usb/next | expand

Pull-request

git://git.denx.de/u-boot-usb.git next

Message

Marek Vasut Oct. 1, 2020, 8:29 a.m. UTC
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)

----------------------------------------------------------------
Chance.Yang (1):
      usb: dwc2: Fix contorl OUT transfer issue

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/gadget/dwc2_udc_otg_xfer_dma.c |  16 +++++++++--
 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 ++++--------
 7 files changed, 111 insertions(+), 121 deletions(-)

Comments

Tom Rini Oct. 1, 2020, 5:09 p.m. UTC | #1
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)&reg->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 <chance.yang@vatics.com>
Date:   Tue Sep 22 16:48:42 2020 +0800

    usb: dwc2: Fix contorl OUT transfer issue

Thanks!
Marek Vasut Oct. 1, 2020, 5:42 p.m. UTC | #2
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)&reg->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 <chance.yang@vatics.com>
> 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.
Tom Rini Oct. 1, 2020, 6:09 p.m. UTC | #3
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)&reg->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 <chance.yang@vatics.com>
> > 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.
Marek Vasut Oct. 1, 2020, 6:38 p.m. UTC | #4
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(-)