Commit 4dfb9ce8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v5.7-rc2' of... 

Merge tag 'fixes-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

USB: fixes for v5.7-rc2

DWC3 learns how to properly set maxpacket limit and got a fix for a
request completion bug. The raw gadget got a fix for
copy_to/from_user() checks. Atmel got an improvement on vbus
disconnect handling.

We're also adding support for another SoC to the Renesas DRD driver.

* tag 'fixes-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb:
  usb: raw-gadget: Fix copy_to/from_user() checks
  usb: raw-gadget: fix raw_event_queue_fetch locking
  usb: gadget: udc: atmel: Fix vbus disconnect handling
  usb: dwc3: gadget: Fix request completion check
  usb: dwc3: gadget: Do link recovery for SS and SSP
  dt-bindings: usb: renesas,usb3-peri: add r8a77961 support
  dt-bindings: usb: renesas,usbhs: add r8a77961 support
  dt-bindings: usb: usb-xhci: add r8a77961 support
  docs: dt: qcom,dwc3.txt: fix cross-reference for a converted file
  usb: dwc3: gadget: Properly set maxpacket limit
  usb: dwc3: Fix GTXFIFOSIZ.TXFDEP macro name
  usb: gadget: udc: bdc: Remove unnecessary NULL checks in bdc_req_complete
parents be34a585 a7b77835

Documentation/devicetree/bindings/usb/qcom,dwc3.txt

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ the node is not important. The content of the node is defined in dwc3.txt. 


Phy documentation is provided in the following places:

Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt    - USB3 QMP PHY

Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt - USB2 QUSB2 PHY

Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml - USB2 QUSB2 PHY



Example device nodes:

Documentation/devicetree/bindings/usb/renesas,usb3-peri.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
          - renesas,r8a774c0-usb3-peri # RZ/G2E

          - renesas,r8a7795-usb3-peri  # R-Car H3

          - renesas,r8a7796-usb3-peri  # R-Car M3-W

          - renesas,r8a77961-usb3-peri # R-Car M3-W+

          - renesas,r8a77965-usb3-peri # R-Car M3-N

          - renesas,r8a77990-usb3-peri # R-Car E3

      - const: renesas,rcar-gen3-usb3-peri

Documentation/devicetree/bindings/usb/renesas,usbhs.yaml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ properties: 
              - renesas,usbhs-r8a774c0 # RZ/G2E

              - renesas,usbhs-r8a7795  # R-Car H3

              - renesas,usbhs-r8a7796  # R-Car M3-W

              - renesas,usbhs-r8a77961 # R-Car M3-W+

              - renesas,usbhs-r8a77965 # R-Car M3-N

              - renesas,usbhs-r8a77990 # R-Car E3

              - renesas,usbhs-r8a77995 # R-Car D3

Documentation/devicetree/bindings/usb/usb-xhci.txt

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ Required properties: 
    - "renesas,xhci-r8a7791" for r8a7791 SoC

    - "renesas,xhci-r8a7793" for r8a7793 SoC

    - "renesas,xhci-r8a7795" for r8a7795 SoC

    - "renesas,xhci-r8a7796" for r8a7796 SoC

    - "renesas,xhci-r8a7796" for r8a77960 SoC

    - "renesas,xhci-r8a77961" for r8a77961 SoC

    - "renesas,xhci-r8a77965" for r8a77965 SoC

    - "renesas,xhci-r8a77990" for r8a77990 SoC

    - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 or RZ/G1 compatible

drivers/usb/dwc3/core.h

+6 −2
Original line number Diff line number Diff line
@@ -307,10 +307,14 @@ 


/* Global TX Fifo Size Register */

#define DWC31_GTXFIFOSIZ_TXFRAMNUM	BIT(15)		/* DWC_usb31 only */

#define DWC31_GTXFIFOSIZ_TXFDEF(n)	((n) & 0x7fff)	/* DWC_usb31 only */

#define DWC3_GTXFIFOSIZ_TXFDEF(n)	((n) & 0xffff)

#define DWC31_GTXFIFOSIZ_TXFDEP(n)	((n) & 0x7fff)	/* DWC_usb31 only */

#define DWC3_GTXFIFOSIZ_TXFDEP(n)	((n) & 0xffff)

#define DWC3_GTXFIFOSIZ_TXFSTADDR(n)	((n) & 0xffff0000)



/* Global RX Fifo Size Register */

#define DWC31_GRXFIFOSIZ_RXFDEP(n)	((n) & 0x7fff)	/* DWC_usb31 only */

#define DWC3_GRXFIFOSIZ_RXFDEP(n)	((n) & 0xffff)



/* Global Event Size Registers */

#define DWC3_GEVNTSIZ_INTMASK		BIT(31)

#define DWC3_GEVNTSIZ_SIZE(n)		((n) & 0xffff)

CRA Git | Maintained and supported by SUSTech CRA and CCSE