Skip to content

Commit 6c90bbd

Browse files
committed
Merge tag 'usb-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH: "Here are a lot of small USB driver fixes for 5.4-rc3. syzbot has stepped up its testing of the USB driver stack, now able to trigger fun race conditions between disconnect and probe functions. Because of that we have a lot of fixes in here from Johan and others fixing these reported issues that have been around since almost all time. We also are just deleting the rio500 driver, making all of the syzbot bugs found in it moot as it turns out no one has been using it for years as there is a userspace version that is being used instead. There are also a number of other small fixes in here, all resolving reported issues or regressions. All have been in linux-next without any reported issues" * tag 'usb-5.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (65 commits) USB: yurex: fix NULL-derefs on disconnect USB: iowarrior: use pr_err() USB: iowarrior: drop redundant iowarrior mutex USB: iowarrior: drop redundant disconnect mutex USB: iowarrior: fix use-after-free after driver unbind USB: iowarrior: fix use-after-free on release USB: iowarrior: fix use-after-free on disconnect USB: chaoskey: fix use-after-free on release USB: adutux: fix use-after-free on release USB: ldusb: fix NULL-derefs on driver unbind USB: legousbtower: fix use-after-free on release usb: cdns3: Fix for incorrect DMA mask. usb: cdns3: fix cdns3_core_init_role() usb: cdns3: gadget: Fix full-speed mode USB: usb-skeleton: drop redundant in-urb check USB: usb-skeleton: fix use-after-free after driver unbind USB: usb-skeleton: fix NULL-deref on disconnect usb:cdns3: Fix for CV CH9 running with g_zero driver. usb: dwc3: Remove dev_err() on platform_get_irq() failure usb: dwc3: Switch to platform_get_irq_byname_optional() ...
2 parents 328fefa + aafb00a commit 6c90bbd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+431
-961
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ A child node must exist to represent the core DWC2 IP block. The name of
8585
the node is not important. The content of the node is defined in dwc2.txt.
8686

8787
PHY documentation is provided in the following places:
88-
- Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt
89-
- Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt
88+
- Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
89+
- Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
9090

9191
Example device nodes:
9292
usb: usb@ffe09000 {

Documentation/devicetree/bindings/usb/generic-ehci.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ properties:
6363
description:
6464
Set this flag to force EHCI reset after resume.
6565

66-
phys: true
66+
phys:
67+
description: PHY specifier for the USB PHY
68+
69+
phy-names:
70+
const: usb
6771

6872
required:
6973
- compatible
@@ -89,6 +93,7 @@ examples:
8993
interrupts = <39>;
9094
clocks = <&ahb_gates 1>;
9195
phys = <&usbphy 1>;
96+
phy-names = "usb";
9297
};
9398
9499
...

Documentation/devicetree/bindings/usb/generic-ohci.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ properties:
6767
description:
6868
Overrides the detected port count
6969

70-
phys: true
70+
phys:
71+
description: PHY specifier for the USB PHY
72+
73+
phy-names:
74+
const: usb
7175

7276
required:
7377
- compatible
@@ -84,6 +88,7 @@ examples:
8488
interrupts = <64>;
8589
clocks = <&usb_clk 6>, <&ahb_gates 2>;
8690
phys = <&usbphy 1>;
91+
phy-names = "usb";
8792
};
8893
8994
...

Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Required properties:
3333
"dma_ck": dma_bus clock for data transfer by DMA,
3434
"xhci_ck": controller clock
3535

36-
- phys : see usb-hcd.txt in the current directory
36+
- phys : see usb-hcd.yaml in the current directory
3737

3838
Optional properties:
3939
- wakeup-source : enable USB remote wakeup;
@@ -53,7 +53,7 @@ Optional properties:
5353
See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
5454
- imod-interval-ns: default interrupt moderation interval is 5000ns
5555

56-
additionally the properties from usb-hcd.txt (in the current directory) are
56+
additionally the properties from usb-hcd.yaml (in the current directory) are
5757
supported.
5858

5959
Example:

Documentation/devicetree/bindings/usb/mediatek,mtu3.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Required properties:
1717
- clock-names : must contain "sys_ck" for clock of controller,
1818
the following clocks are optional:
1919
"ref_ck", "mcu_ck" and "dma_ck";
20-
- phys : see usb-hcd.txt in the current directory
20+
- phys : see usb-hcd.yaml in the current directory
2121
- dr_mode : should be one of "host", "peripheral" or "otg",
2222
refer to usb/generic.txt
2323

@@ -60,7 +60,7 @@ Optional properties:
6060
- mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,
6161
bit1 for u3port1, ... etc;
6262

63-
additionally the properties from usb-hcd.txt (in the current directory) are
63+
additionally the properties from usb-hcd.yaml (in the current directory) are
6464
supported.
6565

6666
Sub-nodes:

Documentation/devicetree/bindings/usb/usb-hcd.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ properties:
1818
description:
1919
List of all the USB PHYs on this HCD
2020

21+
phy-names:
22+
description:
23+
Name specifier for the USB PHY
24+
2125
examples:
2226
- |
2327
usb {
2428
phys = <&usb2_phy1>, <&usb3_phy1>;
29+
phy-names = "usb";
2530
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Required properties:
66
- reg : Should contain 1 register ranges(address and length)
77
- interrupts : UHCI controller interrupt
88

9-
additionally the properties from usb-hcd.txt (in the current directory) are
9+
additionally the properties from usb-hcd.yaml (in the current directory) are
1010
supported.
1111

1212
Example:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ Optional properties:
4141
- usb3-lpm-capable: determines if platform is USB3 LPM capable
4242
- quirk-broken-port-ped: set if the controller has broken port disable mechanism
4343
- imod-interval-ns: default interrupt moderation interval is 5000ns
44-
- phys : see usb-hcd.txt in the current directory
44+
- phys : see usb-hcd.yaml in the current directory
4545

46-
additionally the properties from usb-hcd.txt (in the current directory) are
46+
additionally the properties from usb-hcd.yaml (in the current directory) are
4747
supported.
4848

4949

Documentation/usb/rio.rst

Lines changed: 0 additions & 109 deletions
This file was deleted.

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16764,13 +16764,6 @@ W: http://www.linux-usb.org/usbnet
1676416764
S: Maintained
1676516765
F: drivers/net/usb/dm9601.c
1676616766

16767-
USB DIAMOND RIO500 DRIVER
16768-
M: Cesar Miquel <[email protected]>
16769-
16770-
W: http://rio500.sourceforge.net
16771-
S: Maintained
16772-
F: drivers/usb/misc/rio500*
16773-
1677416767
USB EHCI DRIVER
1677516768
M: Alan Stern <[email protected]>
1677616769

0 commit comments

Comments
 (0)