[PATCH v4 64/64] usb: fix build after resync of DWC3 with kernel v6.16

[Tom Rini]

On Wed, Jul 01, 2026 at 08:03:22PM +0300, Ilias Apalodimas wrote:
> Hi Mattjis
> 
> On Wed, 1 Jul 2026 at 13:52, Mattijs Korpershoek
> <mkorpershoek at kernel.org> wrote:
> >
> > On Tue, Jun 30, 2026 at 12:38, Marek Vasut <marex at nabladev.com> wrote:
> >
> > > On 6/29/26 10:44 AM, Jens Wiklander wrote:
> > >> From: Jerome Forissier <jerome.forissier at linaro.org>
> > >>
> > >> Fix build errors after the re-sync of the DWC3 driver with the kernel.
> > >> U-Boot has different needs than the kernel: buses, interrupts, internal
> > >> APIs (DMA, traces, DT...) so many adaptations are required. This commit
> > >> re-introduces many of the changes that were done locally after the
> > >> initial import of the DWC3 code from kernel 3.19-rc1 11 years ago, as
> > >> well as other fixes. This is compile-tested only.
> > >>
> > >> Signed-off-by: Jerome Forissier <jerome.forissier at linaro.org>
> > >> Signed-off-by: Jens Wiklander <jens.wiklander at linaro.org>
> > >> Tested-by: Alexey Charkov <alchark at flipper.net>
> > >> ---
> > >>   drivers/usb/cdns3/ep0.c                |    8 +-
> > >>   drivers/usb/common/common.c            |   23 +
> > >>   drivers/usb/dwc3/Makefile              |   57 +-
> > >>   drivers/usb/dwc3/core.c                | 1761 ++++++------------------
> > >>   drivers/usb/dwc3/core.h                |   39 +-
> > >>   drivers/usb/dwc3/dwc3-am62.c           |  424 +-----
> > >>   drivers/usb/dwc3/dwc3-omap.c           |    2 -
> > >>   drivers/usb/dwc3/ep0.c                 |  110 +-
> > >>   drivers/usb/dwc3/gadget.c              |  786 +++--------
> > >>   drivers/usb/dwc3/gadget.h              |    4 +-
> > >>   drivers/usb/dwc3/io.h                  |   28 +-
> > >>   drivers/usb/dwc3/ti_usb_phy.c          |    2 -
> > >>   drivers/usb/gadget/at91_udc.c          |   46 -
> > >>   drivers/usb/gadget/atmel_usba_udc.c    |  102 +-
> > >>   drivers/usb/gadget/ci_udc.c            |  470 -------
> > >>   drivers/usb/gadget/composite.c         |    2 +-
> > >>   drivers/usb/gadget/dwc2_udc_otg.c      |  174 +--
> > >>   drivers/usb/gadget/epautoconf.c        |    2 -
> > >>   drivers/usb/gadget/ether.c             |   21 +-
> > >>   drivers/usb/gadget/f_acm.c             |   20 +-
> > >>   drivers/usb/gadget/f_fastboot.c        |   10 +-
> > >>   drivers/usb/gadget/f_mass_storage.c    |    5 +-
> > >>   drivers/usb/gadget/f_rockusb.c         |   11 +-
> > >>   drivers/usb/gadget/f_sdp.c             |   12 +-
> > >>   drivers/usb/gadget/f_thor.c            |   19 +-
> > >>   drivers/usb/gadget/udc/Makefile        |    1 +
> > >>   drivers/usb/gadget/udc/udc-core.c      | 1026 +++-----------
> > >>   drivers/usb/host/xhci-dwc3.c           |    4 +-
> > >>   drivers/usb/host/xhci-exynos5.c        |    2 +-
> > >>   drivers/usb/mtu3/mtu3_gadget_ep0.c     |   16 +-
> > >>   drivers/usb/musb-new/musb_gadget_ep0.c |   24 +-
> > >>   drivers/usb/musb-new/musb_uboot.c      |   39 -
> > >>   include/dm/device_compat.h             |   13 +
> > >>   include/dm/read.h                      |   46 +
> > >>   include/linux/compat.h                 |   15 +
> > >>   include/linux/usb/ch9.h                |   25 +-
> > >>   include/linux/usb/gadget.h             |  520 ++-----
> > >>   include/linux/usb/otg.h                |   10 +
> > >>   include/linux/usb/phy.h                |   56 +
> > >>   39 files changed, 1351 insertions(+), 4584 deletions(-)
> > > This patch needs to be split up, this is unreviewable, sorry.
> >
> > I agree with Marek, this is quite difficult to review. Can we split it,
> > please?
> 
> Sure this is reasonable. As long as we all agree that the current
> approach of rebasing is acceptable. This will make the 'breakage'
> window a little bigger, but as long as it's explicitly mentioned in
> the commit messages, I personally don't mind

I also think that while not ideal, but especially if we bring this in as
a merge commit (in other words, b4 shazam -SM it, then include that
merge commit in the USB PR), we can limit the range of bisectability
not being possible. Since you can test commits manually when doing a
bisect, a "git checkout ...tree prior to this merge commit...", test and
confirm this being where the problem is, or isn't. And then if we can
commit to keeping in-sync in the future, we'll be more easily able to
drop in the changes from kernel release N-1 to kernel release N, without
the whole undo-and-redo-U-Boot-support dance.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20260701/82e84b66/attachment.sig>