usb: changes for v5.13-rc1

GIT PULL Peter Chen 2 participants 5 messages Apr 11, 2021 – Apr 12, 2021 USB

lore

Share & tools

lore

Peter Chen

author

2021-04-11 22:35 UTC #0 lore raw

The following changes since commit 5e17812c22bcd65fa9202595eef4bbf8fa814144:

usb: dwc3: document usb_psy in struct dwc3 (2021-03-03 11:09:29 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git/ tags/usb-v5.13-rc1

for you to fetch changes up to 6ef82c8acf5ca40d8912947696e9d52956a03cec:

usb: cdnsp: Fixes issue with Configure Endpoint command (2021-04-10 09:10:44 +0800)

----------------------------------------------------------------
Several Cadence3 improvements are introduced in v5.13-rc1:
- Add recovery during resume if the controller was lost power at system suspend
- Reduce DMA memory footprint
- Other small improvements

----------------------------------------------------------------
Colin Ian King (1):
usb: cdnsp: remove redundant initialization of variable ret

Dmitry Osipenko (1):
usb: chipidea: tegra: Silence deferred probe error

Frank Li (3):
usb: cdns3: add power lost support for system resume
usb: cdns3: imx: add power lost support for system resume
usb: cdns3: fix static checker warning.

Pawel Laszczak (1):
usb: cdnsp: Fixes issue with Configure Endpoint command

Peter Chen (1):

      usb: cdns3: trace: delete the trace parameter for request->trb

Sanket Parmar (2):
usb: cdns3: Use dma_pool_* api to alloc trb pool
usb: cdns3: Optimize DMA request buffer allocation

Wang Qing (1):
usb: cdns3: delete repeated clear operations

Wei Yongjun (1):
usb: cdns3: imx: mark cdns_imx_system_resume as __maybe_unused

 drivers/usb/cdns3/cdns3-gadget.c     | 73 ++++++++++++++++++++++--------------
 drivers/usb/cdns3/cdns3-gadget.h     |  3 ++
 drivers/usb/cdns3/cdns3-imx.c        | 34 +++++++++++++++++
 drivers/usb/cdns3/cdns3-plat.c       | 23 +++++++++++-
 drivers/usb/cdns3/cdns3-trace.h      |  5 +--
 drivers/usb/cdns3/cdnsp-gadget.c     | 17 ++++++---
 drivers/usb/cdns3/cdnsp-gadget.h     |  1 +
 drivers/usb/cdns3/cdnsp-mem.c        |  3 +-
 drivers/usb/cdns3/core.c             | 29 +++++++++++++-
 drivers/usb/cdns3/drd.c              | 15 ++++++++
 drivers/usb/cdns3/drd.h              |  2 +-
 drivers/usb/chipidea/ci_hdrc_tegra.c |  8 ++--
 12 files changed, 165 insertions(+), 48 deletions(-)

Signature · 2 lines

Thanks,
Peter Chen

Greg KH

maintainer

2021-04-12 09:53 UTC #1 lore raw

Quoted 46 lines · Peter Chen

The following changes since commit 5e17812c22bcd65fa9202595eef4bbf8fa814144:
usb: dwc3: document usb_psy in struct dwc3 (2021-03-03 11:09:29 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git/ tags/usb-v5.13-rc1
for you to fetch changes up to 6ef82c8acf5ca40d8912947696e9d52956a03cec:
usb: cdnsp: Fixes issue with Configure Endpoint command (2021-04-10 09:10:44 +0800)
----------------------------------------------------------------
Several Cadence3 improvements are introduced in v5.13-rc1:
- Add recovery during resume if the controller was lost power at system suspend
- Reduce DMA memory footprint
- Other small improvements
----------------------------------------------------------------
Colin Ian King (1):
usb: cdnsp: remove redundant initialization of variable ret
Dmitry Osipenko (1):
usb: chipidea: tegra: Silence deferred probe error
Frank Li (3):
usb: cdns3: add power lost support for system resume
usb: cdns3: imx: add power lost support for system resume
usb: cdns3: fix static checker warning.
Pawel Laszczak (1):
usb: cdnsp: Fixes issue with Configure Endpoint command
Peter Chen (1):
      usb: cdns3: trace: delete the trace parameter for request->trb
Sanket Parmar (2):
usb: cdns3: Use dma_pool_* api to alloc trb pool
usb: cdns3: Optimize DMA request buffer allocation
Wang Qing (1):
usb: cdns3: delete repeated clear operations
Wei Yongjun (1):
usb: cdns3: imx: mark cdns_imx_system_resume as __maybe_unused

Quoted 13 lines

 drivers/usb/cdns3/cdns3-gadget.c     | 73 ++++++++++++++++++++++--------------
 drivers/usb/cdns3/cdns3-gadget.h     |  3 ++
 drivers/usb/cdns3/cdns3-imx.c        | 34 +++++++++++++++++
 drivers/usb/cdns3/cdns3-plat.c       | 23 +++++++++++-
 drivers/usb/cdns3/cdns3-trace.h      |  5 +--
 drivers/usb/cdns3/cdnsp-gadget.c     | 17 ++++++---
 drivers/usb/cdns3/cdnsp-gadget.h     |  1 +
 drivers/usb/cdns3/cdnsp-mem.c        |  3 +-
 drivers/usb/cdns3/core.c             | 29 +++++++++++++-
 drivers/usb/cdns3/drd.c              | 15 ++++++++
 drivers/usb/cdns3/drd.h              |  2 +-
 drivers/usb/chipidea/ci_hdrc_tegra.c |  8 ++--
 12 files changed, 165 insertions(+), 48 deletions(-)

This merge is odd, why am I getting merge conflicts in:
drivers/usb/dwc3/gadget.c drivers/usb/typec/tipd/core.c

when I pull this?

According to the above there should not be any changes in those files.

When I resolve those conflicts, I get a _lot_ of additional patches in this branch than you list here.

How did you create this pull request? What branch of mine is it against?

confused,

greg k-h

Peter Chen

author

2021-04-12 10:44 UTC #2 lore raw

Quoted 68 lines · Greg KH

Quoted 46 lines · Peter Chen
The following changes since commit 5e17812c22bcd65fa9202595eef4bbf8fa814144:
usb: dwc3: document usb_psy in struct dwc3 (2021-03-03 11:09:29 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git/ tags/usb-v5.13-rc1
for you to fetch changes up to 6ef82c8acf5ca40d8912947696e9d52956a03cec:
usb: cdnsp: Fixes issue with Configure Endpoint command (2021-04-10 09:10:44 +0800)
----------------------------------------------------------------
Several Cadence3 improvements are introduced in v5.13-rc1:
- Add recovery during resume if the controller was lost power at system suspend
- Reduce DMA memory footprint
- Other small improvements
----------------------------------------------------------------
Colin Ian King (1):
usb: cdnsp: remove redundant initialization of variable ret
Dmitry Osipenko (1):
usb: chipidea: tegra: Silence deferred probe error
Frank Li (3):
usb: cdns3: add power lost support for system resume
usb: cdns3: imx: add power lost support for system resume
usb: cdns3: fix static checker warning.
Pawel Laszczak (1):
usb: cdnsp: Fixes issue with Configure Endpoint command
Peter Chen (1):
      usb: cdns3: trace: delete the trace parameter for request->trb
Sanket Parmar (2):
usb: cdns3: Use dma_pool_* api to alloc trb pool
usb: cdns3: Optimize DMA request buffer allocation
Wang Qing (1):
usb: cdns3: delete repeated clear operations
Wei Yongjun (1):
usb: cdns3: imx: mark cdns_imx_system_resume as __maybe_unused
Quoted 13 lines
 drivers/usb/cdns3/cdns3-gadget.c     | 73 ++++++++++++++++++++++--------------
 drivers/usb/cdns3/cdns3-gadget.h     |  3 ++
 drivers/usb/cdns3/cdns3-imx.c        | 34 +++++++++++++++++
 drivers/usb/cdns3/cdns3-plat.c       | 23 +++++++++++-
 drivers/usb/cdns3/cdns3-trace.h      |  5 +--
 drivers/usb/cdns3/cdnsp-gadget.c     | 17 ++++++---
 drivers/usb/cdns3/cdnsp-gadget.h     |  1 +
 drivers/usb/cdns3/cdnsp-mem.c        |  3 +-
 drivers/usb/cdns3/core.c             | 29 +++++++++++++-
 drivers/usb/cdns3/drd.c              | 15 ++++++++
 drivers/usb/cdns3/drd.h              |  2 +-
 drivers/usb/chipidea/ci_hdrc_tegra.c |  8 ++--
 12 files changed, 165 insertions(+), 48 deletions(-)
This merge is odd, why am I getting merge conflicts in:
drivers/usb/dwc3/gadget.c drivers/usb/typec/tipd/core.c
when I pull this?

Quoted 8 lines

According to the above there should not be any changes in those files.
When I resolve those conflicts, I get a _lot_ of additional patches in this branch than you list here.
How did you create this pull request? What branch of mine is it against?

Sorry about that, my branch was checkout from your usb-next at early of this release cycle, it seems your branch may forced update. I will apply the patches on top of v5.12-rc1, and re-send the pull request.

Signature · 2 lines

Thanks,
Peter Chen

Greg KH

maintainer

2021-04-12 10:56 UTC #3 lore raw

Quoted 74 lines · Peter Chen

Quoted 73 lines · Greg KH
Quoted 46 lines · Peter Chen
The following changes since commit 5e17812c22bcd65fa9202595eef4bbf8fa814144:
usb: dwc3: document usb_psy in struct dwc3 (2021-03-03 11:09:29 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git/ tags/usb-v5.13-rc1
for you to fetch changes up to 6ef82c8acf5ca40d8912947696e9d52956a03cec:
usb: cdnsp: Fixes issue with Configure Endpoint command (2021-04-10 09:10:44 +0800)
----------------------------------------------------------------
Several Cadence3 improvements are introduced in v5.13-rc1:
- Add recovery during resume if the controller was lost power at system suspend
- Reduce DMA memory footprint
- Other small improvements
----------------------------------------------------------------
Colin Ian King (1):
usb: cdnsp: remove redundant initialization of variable ret
Dmitry Osipenko (1):
usb: chipidea: tegra: Silence deferred probe error
Frank Li (3):
usb: cdns3: add power lost support for system resume
usb: cdns3: imx: add power lost support for system resume
usb: cdns3: fix static checker warning.
Pawel Laszczak (1):
usb: cdnsp: Fixes issue with Configure Endpoint command
Peter Chen (1):
      usb: cdns3: trace: delete the trace parameter for request->trb
Sanket Parmar (2):
usb: cdns3: Use dma_pool_* api to alloc trb pool
usb: cdns3: Optimize DMA request buffer allocation
Wang Qing (1):
usb: cdns3: delete repeated clear operations
Wei Yongjun (1):
usb: cdns3: imx: mark cdns_imx_system_resume as __maybe_unused
Quoted 13 lines
 drivers/usb/cdns3/cdns3-gadget.c     | 73 ++++++++++++++++++++++--------------
 drivers/usb/cdns3/cdns3-gadget.h     |  3 ++
 drivers/usb/cdns3/cdns3-imx.c        | 34 +++++++++++++++++
 drivers/usb/cdns3/cdns3-plat.c       | 23 +++++++++++-
 drivers/usb/cdns3/cdns3-trace.h      |  5 +--
 drivers/usb/cdns3/cdnsp-gadget.c     | 17 ++++++---
 drivers/usb/cdns3/cdnsp-gadget.h     |  1 +
 drivers/usb/cdns3/cdnsp-mem.c        |  3 +-
 drivers/usb/cdns3/core.c             | 29 +++++++++++++-
 drivers/usb/cdns3/drd.c              | 15 ++++++++
 drivers/usb/cdns3/drd.h              |  2 +-
 drivers/usb/chipidea/ci_hdrc_tegra.c |  8 ++--
 12 files changed, 165 insertions(+), 48 deletions(-)
This merge is odd, why am I getting merge conflicts in:
drivers/usb/dwc3/gadget.c drivers/usb/typec/tipd/core.c
when I pull this?
According to the above there should not be any changes in those files.
When I resolve those conflicts, I get a _lot_ of additional patches in this branch than you list here.

Quoted 7 lines

Quoted 3 lines
How did you create this pull request? What branch of mine is it against?
Sorry about that, my branch was checkout from your usb-next at early of this release cycle, it seems your branch may forced update. I will apply the patches on top of v5.12-rc1, and re-send the pull request.

Ah, yeah, that's the problem here.

And no, stay away from v5.12-rc1, that's why I had to rebase, you never want to allow a user to bisect back to that point if at all possible. Please just use 5.12-rc7 if you are going to rebase.

thanks,

greg k-h

Peter Chen

author

2021-04-12 12:18 UTC #4 lore raw

Quoted 83 lines · Greg KH

Quoted 74 lines · Peter Chen
Quoted 73 lines · Greg KH
Quoted 46 lines · Peter Chen
The following changes since commit 5e17812c22bcd65fa9202595eef4bbf8fa814144:
usb: dwc3: document usb_psy in struct dwc3 (2021-03-03 11:09:29 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git/ tags/usb-v5.13-rc1
for you to fetch changes up to 6ef82c8acf5ca40d8912947696e9d52956a03cec:
usb: cdnsp: Fixes issue with Configure Endpoint command (2021-04-10 09:10:44 +0800)
----------------------------------------------------------------
Several Cadence3 improvements are introduced in v5.13-rc1:
- Add recovery during resume if the controller was lost power at system suspend
- Reduce DMA memory footprint
- Other small improvements
----------------------------------------------------------------
Colin Ian King (1):
usb: cdnsp: remove redundant initialization of variable ret
Dmitry Osipenko (1):
usb: chipidea: tegra: Silence deferred probe error
Frank Li (3):
usb: cdns3: add power lost support for system resume
usb: cdns3: imx: add power lost support for system resume
usb: cdns3: fix static checker warning.
Pawel Laszczak (1):
usb: cdnsp: Fixes issue with Configure Endpoint command
Peter Chen (1):
      usb: cdns3: trace: delete the trace parameter for request->trb
Sanket Parmar (2):
usb: cdns3: Use dma_pool_* api to alloc trb pool
usb: cdns3: Optimize DMA request buffer allocation
Wang Qing (1):
usb: cdns3: delete repeated clear operations
Wei Yongjun (1):
usb: cdns3: imx: mark cdns_imx_system_resume as __maybe_unused
Quoted 13 lines
 drivers/usb/cdns3/cdns3-gadget.c     | 73 ++++++++++++++++++++++--------------
 drivers/usb/cdns3/cdns3-gadget.h     |  3 ++
 drivers/usb/cdns3/cdns3-imx.c        | 34 +++++++++++++++++
 drivers/usb/cdns3/cdns3-plat.c       | 23 +++++++++++-
 drivers/usb/cdns3/cdns3-trace.h      |  5 +--
 drivers/usb/cdns3/cdnsp-gadget.c     | 17 ++++++---
 drivers/usb/cdns3/cdnsp-gadget.h     |  1 +
 drivers/usb/cdns3/cdnsp-mem.c        |  3 +-
 drivers/usb/cdns3/core.c             | 29 +++++++++++++-
 drivers/usb/cdns3/drd.c              | 15 ++++++++
 drivers/usb/cdns3/drd.h              |  2 +-
 drivers/usb/chipidea/ci_hdrc_tegra.c |  8 ++--
 12 files changed, 165 insertions(+), 48 deletions(-)
This merge is odd, why am I getting merge conflicts in:
drivers/usb/dwc3/gadget.c drivers/usb/typec/tipd/core.c
when I pull this?
According to the above there should not be any changes in those files.
When I resolve those conflicts, I get a _lot_ of additional patches in this branch than you list here.
Quoted 7 lines
Quoted 3 lines
How did you create this pull request? What branch of mine is it against?
Sorry about that, my branch was checkout from your usb-next at early of this release cycle, it seems your branch may forced update. I will apply the patches on top of v5.12-rc1, and re-send the pull request.

Quoted 6 lines

Ah, yeah, that's the problem here.
And no, stay away from v5.12-rc1, that's why I had to rebase, you never want to allow a user to bisect back to that point if at all possible. Please just use 5.12-rc7 if you are going to rebase.

Will do that, thanks.

Signature · 2 lines

Thanks,
Peter Chen