Linux USB
 help / color / mirror / Atom feed
* [PATCH v6 0/3] usb: core: Pair ports of different host controllers through their connector
@ 2026-11-19 10:03 Arun Iyengar via B4 Relay
  2026-11-19 10:03 ` [PATCH v6 1/3] usb: core: Pair ports of different hubs " Arun Iyengar via B4 Relay
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 10:03 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Alan Stern
  Cc: linux-usb, linux-kernel, Mathias Nyman, Chen-Yu Tsai, Rob Herring,
	Arun Iyengar

On the RK3588, the USB 2.0 lines of the USB 3.0 host 2 connector go to
a separate EHCI, so the USB core pairs its SuperSpeed port with the
wrong USB 2.0 port, and a USB 3 device present at boot stays at 480 Mb/s.

Patch 1 pairs the ports through their usb-connector. Patch 2 fixes the
connect_type of a dwc3 SuperSpeed port with a USB 2.0 device node. Patch
3 resets the USB 2.0 port of such a device once, so that it retries
SuperSpeed. The Orange Pi 5 DT follows separately and needs Chen-Yu
Tsai's usb-hcd binding [1].

Tested on an Orange Pi 5 (7.3-based kernel with KASAN): a USB 3 disk
that enumerated on the USB 2.0 port moved to 5 Gb/s in 3/3 boots, 6/6
xHCI rebinds and 2/2 runtime-suspended resets. With DT overlays: ports
whose connector peer is not a USB node are paired by default, and a
SuperSpeed port shaped like the lckfb one reads hotplug. Not tested with
an external USB 3 hub; a device that stays at high speed was tested on
v5 only.

Developed with Claude (Anthropic), which wrote the code and the commit
messages. I reviewed every change.

[1] https://lore.kernel.org/all/20261014082037.1774672-2-wenst@chromium.org/

---
Changes in v6:
- Patch 1: take a connector peer only if it is or is under a "usb" node
  (Sashiko)
- Patch 1: connector_peer as a :1 bitfield, set before the port is
  registered (Alan Stern, Sashiko)
- New patch 2: dwc3 SuperSpeed port connect_type from the graph first (Sashiko)
- Link to v5: https://patch.msgid.link/20261118-usb-port-pairing-v5-0-5f1a26789270@gmail.com

---
Arun Iyengar (3):
      usb: core: Pair ports of different hubs through their connector
      usb: core: Prefer the graph for a dwc3 SuperSpeed port's connect_type
      usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer

 drivers/usb/core/hub.c  | 158 ++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/core/hub.h  |   5 ++
 drivers/usb/core/of.c   | 148 ++++++++++++++++++++++++++++++++++++++++-----
 drivers/usb/core/port.c |  89 ++++++++++++++++++++++++---
 include/linux/usb/of.h  |  13 ++++
 5 files changed, 390 insertions(+), 23 deletions(-)
---
base-commit: f11fe7603df07fbb9fa02b0d385c1696c87a6dab
change-id: 20261110-usb-port-pairing-af0f66f0ab2e

Best regards,
--  
Arun Iyengar <aiyengar1990@gmail.com>



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v6 1/3] usb: core: Pair ports of different hubs through their connector
  2026-11-19 10:03 [PATCH v6 0/3] usb: core: Pair ports of different host controllers through their connector Arun Iyengar via B4 Relay
@ 2026-11-19 10:03 ` Arun Iyengar via B4 Relay
  2026-11-19 10:34   ` sashiko-bot
  2026-11-19 10:03 ` [PATCH v6 2/3] usb: core: Prefer the graph for a dwc3 SuperSpeed port's connect_type Arun Iyengar via B4 Relay
  2026-11-19 10:03 ` [PATCH v6 3/3] usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer Arun Iyengar via B4 Relay
  2 siblings, 1 reply; 7+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 10:03 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Alan Stern
  Cc: linux-usb, linux-kernel, Mathias Nyman, Chen-Yu Tsai, Rob Herring,
	Arun Iyengar

From: Arun Iyengar <aiyengar1990@gmail.com>

On the RK3588, USB 3.0 host 2 is SuperSpeed-only and its connector's
USB 2.0 lines go to a separate EHCI, so pairing by port number gives the
SuperSpeed port a dead USB 2.0 peer.

When ports 0 (USB 2.0) and 1 (SuperSpeed) of a usb-connector graph lead
to different hubs, pair them through the connector. The peer must be a
"usb" node (usb.yaml) or under one; a mux or PHY there keeps today's
pairing. Root hub ports are found by the controller port number; graphs
in the dwc3 numbering don't match and keep today's pairing, as xHCI
registers both root hubs before devices enumerate. connect_type is
looked up the same way, so such a SuperSpeed port reads "hotplug".

Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
 drivers/usb/core/hub.h  |  2 +
 drivers/usb/core/of.c   | 97 +++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/core/port.c | 87 ++++++++++++++++++++++++++++++++++++++++----
 include/linux/usb/of.h  |  8 ++++
 4 files changed, 187 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 9ebc5ef54a32..ab80164b4b46 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -97,6 +97,7 @@ struct usb_hub {
  * @usb3_lpm_u2_permit: whether USB3 U2 LPM is permitted.
  * @early_stop: whether port initialization will be stopped earlier.
  * @ignore_event: whether events of the port are ignored.
+ * @connector_peer: peer found through a connector.
  */
 struct usb_port {
 	struct usb_device *child;
@@ -118,6 +119,7 @@ struct usb_port {
 	unsigned int is_superspeed:1;
 	unsigned int usb3_lpm_u1_permit:1;
 	unsigned int usb3_lpm_u2_permit:1;
+	unsigned int connector_peer:1;
 };
 
 #define to_usb_port(_dev) \
diff --git a/drivers/usb/core/of.c b/drivers/usb/core/of.c
index a6ee20d8774e..eebfc9cd0c88 100644
--- a/drivers/usb/core/of.c
+++ b/drivers/usb/core/of.c
@@ -145,6 +145,103 @@ enum usb_port_connect_type usb_of_get_connect_type(struct usb_device *hub, int p
 }
 EXPORT_SYMBOL_GPL(usb_of_get_connect_type);
 
+static bool usb_of_in_usb_node(const struct device_node *np)
+{
+	for (; np; np = np->parent)
+		if (of_node_name_eq(np, "usb"))
+			return true;
+	return false;
+}
+
+static bool usb_of_is_connector(const struct device_node *np)
+{
+	return of_device_is_compatible(np, "usb-a-connector") ||
+	       of_device_is_compatible(np, "usb-b-connector") ||
+	       of_device_is_compatible(np, "usb-c-connector");
+}
+
+static struct device_node *usb_of_connector_remote(struct device_node *con,
+						   u32 con_port, u32 *port)
+{
+	struct device_node *ep, *remote;
+	struct of_endpoint endpoint;
+
+	ep = of_graph_get_endpoint_by_regs(con, con_port, -1);
+	if (!ep)
+		return NULL;
+
+	remote = of_graph_get_remote_endpoint(ep);
+	of_node_put(ep);
+	if (!remote)
+		return NULL;
+
+	if (of_graph_parse_endpoint(remote, &endpoint)) {
+		of_node_put(remote);
+		return NULL;
+	}
+	*port = endpoint.port;
+
+	ep = remote;
+	remote = of_graph_get_port_parent(ep);
+	of_node_put(ep);
+
+	return remote;
+}
+
+/**
+ * usb_of_get_connector_peer() - find a port's peer through its connector
+ * @hub: hub to which the port belongs
+ * @port: graph port of the port
+ * @superspeed: whether @hub is a SuperSpeed hub
+ * @peer_port: returns the graph port of the peer
+ *
+ * Return: the node with the peer port, with a reference, if the other half
+ * of @port's connector leads to a different node that is or is under a "usb"
+ * node. NULL otherwise.
+ */
+struct device_node *usb_of_get_connector_peer(struct usb_device *hub, u32 port,
+					      bool superspeed, u32 *peer_port)
+{
+	struct device_node *np = hub->dev.of_node;
+	struct device_node *ep, *con, *remote, *peer = NULL;
+	u32 remote_port;
+
+	if (!np || !of_graph_is_present(np))
+		return NULL;
+
+	ep = of_graph_get_endpoint_by_regs(np, port, -1);
+	if (!ep)
+		return NULL;
+
+	con = of_graph_get_remote_port_parent(ep);
+	of_node_put(ep);
+	if (!con)
+		return NULL;
+
+	if (!usb_of_is_connector(con) || !of_device_is_available(con))
+		goto out;
+
+	remote = usb_of_connector_remote(con, superspeed ? 1 : 0, &remote_port);
+	if (!remote)
+		goto out;
+	of_node_put(remote);
+	if (remote != np || remote_port != port)
+		goto out;
+
+	/* Same-node peers are paired by port number */
+	peer = usb_of_connector_remote(con, superspeed ? 0 : 1, peer_port);
+	if (peer && (peer == np || !*peer_port ||
+		     !of_device_is_available(peer) ||
+		     !usb_of_in_usb_node(peer))) {
+		of_node_put(peer);
+		peer = NULL;
+	}
+out:
+	of_node_put(con);
+	return peer;
+}
+EXPORT_SYMBOL_GPL(usb_of_get_connector_peer);
+
 /**
  * usb_of_get_interface_node() - get a USB interface node
  * @udev: USB device of interface
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index b4452b665f59..154f6bfc0805 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -649,12 +649,70 @@ static int match_location(struct usb_device *peer_hdev, void *p)
 	return 0;
 }
 
+static u32 usb_port_graph_id(struct usb_device *hdev, int port1)
+{
+	if (hdev->parent)
+		return port1;
+	return usb_hcd_find_raw_port_number(bus_to_hcd(hdev->bus), port1);
+}
+
+struct usb_connector_peer {
+	struct usb_port *port_dev;
+	struct usb_port *peer;
+	struct device_node *np;
+	u32 port;
+};
+
+static int match_connector_peer(struct usb_device *peer_hdev, void *p)
+{
+	struct usb_connector_peer *cp = p;
+	struct usb_hub *peer_hub = usb_hub_to_struct_hub(peer_hdev);
+	int port1;
+
+	if (!peer_hub || !peer_hdev->maxchild ||
+	    peer_hdev->dev.of_node != cp->np ||
+	    hub_is_superspeed(peer_hdev) == cp->port_dev->is_superspeed)
+		return 0;
+
+	for (port1 = 1; port1 <= peer_hdev->maxchild; port1++) {
+		if (usb_port_graph_id(peer_hdev, port1) == cp->port) {
+			cp->peer = peer_hub->ports[port1 - 1];
+			break;
+		}
+	}
+	return 1;
+}
+
+/* Set before device_register(): sysfs stores write the same word */
+static struct usb_port *find_connector_peer(struct usb_hub *hub, int port1)
+{
+	struct usb_port *port_dev = hub->ports[port1 - 1];
+	struct usb_device *hdev = hub->hdev;
+	struct usb_connector_peer cp;
+	bool found;
+
+	cp.np = usb_of_get_connector_peer(hdev, usb_port_graph_id(hdev, port1),
+					  port_dev->is_superspeed, &cp.port);
+	if (!cp.np)
+		return NULL;
+
+	cp.port_dev = port_dev;
+	cp.peer = NULL;
+	found = usb_for_each_dev(&cp, match_connector_peer);
+	of_node_put(cp.np);
+	/* Without the peer hub yet, wait for it */
+	if (cp.peer || !found)
+		port_dev->connector_peer = 1;
+	return cp.peer;
+}
+
 /*
  * Find the peer port either via explicit platform firmware "location"
- * data, the peer hcd for root hubs, or the upstream peer relationship
- * for all other hubs.
+ * data, a DT connector, the peer hcd for root hubs, or the upstream peer
+ * relationship for all other hubs.
  */
-static void find_and_link_peer(struct usb_hub *hub, int port1)
+static void find_and_link_peer(struct usb_hub *hub, int port1,
+			       struct usb_port *con_peer)
 {
 	struct usb_port *port_dev = hub->ports[port1 - 1], *peer;
 	struct usb_device *hdev = hub->hdev;
@@ -671,7 +729,15 @@ static void find_and_link_peer(struct usb_hub *hub, int port1)
 		/* we link the peer in match_location() if found */
 		usb_for_each_dev(port_dev, match_location);
 		return;
-	} else if (!hdev->parent) {
+	}
+
+	if (port_dev->connector_peer) {
+		if (con_peer)
+			link_peers_report(port_dev, con_peer);
+		return;
+	}
+
+	if (!hdev->parent) {
 		struct usb_hcd *hcd = bus_to_hcd(hdev->bus);
 		struct usb_hcd *peer_hcd = hcd->shared_hcd;
 
@@ -703,7 +769,7 @@ static void find_and_link_peer(struct usb_hub *hub, int port1)
 	 * does not have location data
 	 */
 	peer = peer_hub->ports[port1 - 1];
-	if (peer && peer->location == 0)
+	if (peer && peer->location == 0 && !peer->connector_peer)
 		link_peers_report(port_dev, peer);
 }
 
@@ -754,6 +820,8 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
 {
 	struct usb_port *port_dev;
 	struct usb_device *hdev = hub->hdev;
+	struct usb_port *con_peer;
+	u32 graph_id;
 	int retval;
 
 	port_dev = kzalloc_obj(*port_dev);
@@ -766,7 +834,11 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
 		return -ENOMEM;
 	}
 
-	port_dev->connect_type = usb_of_get_connect_type(hdev, port1);
+	graph_id = usb_port_graph_id(hdev, port1);
+	port_dev->connect_type = usb_of_get_connect_type(hdev, graph_id);
+	/* dwc3 graphs give the SuperSpeed port port@1 */
+	if (port_dev->connect_type == USB_PORT_NOT_USED && graph_id != port1)
+		port_dev->connect_type = usb_of_get_connect_type(hdev, port1);
 	hub->ports[port1 - 1] = port_dev;
 	port_dev->portnum = port1;
 	set_bit(port1, hub->power_bits);
@@ -778,6 +850,7 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
 		port_dev->dev.groups = port_dev_usb3_group;
 	} else
 		port_dev->dev.groups = port_dev_group;
+	con_peer = find_connector_peer(hub, port1);
 	port_dev->dev.type = &usb_port_device_type;
 	port_dev->dev.driver = &usb_port_driver;
 	dev_set_name(&port_dev->dev, "%s-port%d", dev_name(&hub->hdev->dev),
@@ -809,7 +882,7 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
 		goto err_put_kn;
 	}
 
-	find_and_link_peer(hub, port1);
+	find_and_link_peer(hub, port1, con_peer);
 
 	/*
 	 * Enable runtime pm and hold a refernce that hub_configure()
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
index de42f14bd280..4be581bd2758 100644
--- a/include/linux/usb/of.h
+++ b/include/linux/usb/of.h
@@ -20,6 +20,8 @@ int of_usb_update_otg_caps(struct device_node *np,
 			struct usb_otg_caps *otg_caps);
 enum usb_port_connect_type usb_of_get_connect_type(struct usb_device *hub, int port1);
 struct device_node *usb_of_get_device_node(struct usb_device *hub, int port1);
+struct device_node *usb_of_get_connector_peer(struct usb_device *hub, u32 port,
+					      bool superspeed, u32 *peer_port);
 bool usb_of_has_combined_node(struct usb_device *udev);
 struct device_node *usb_of_get_interface_node(struct usb_device *udev,
 		u8 config, u8 ifnum);
@@ -49,6 +51,12 @@ usb_of_get_device_node(struct usb_device *hub, int port1)
 {
 	return NULL;
 }
+static inline struct device_node *
+usb_of_get_connector_peer(struct usb_device *hub, u32 port, bool superspeed,
+			  u32 *peer_port)
+{
+	return NULL;
+}
 static inline bool usb_of_has_combined_node(struct usb_device *udev)
 {
 	return false;

-- 
2.55.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v6 2/3] usb: core: Prefer the graph for a dwc3 SuperSpeed port's connect_type
  2026-11-19 10:03 [PATCH v6 0/3] usb: core: Pair ports of different host controllers through their connector Arun Iyengar via B4 Relay
  2026-11-19 10:03 ` [PATCH v6 1/3] usb: core: Pair ports of different hubs " Arun Iyengar via B4 Relay
@ 2026-11-19 10:03 ` Arun Iyengar via B4 Relay
  2026-11-19 10:09   ` sashiko-bot
  2026-11-19 10:03 ` [PATCH v6 3/3] usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer Arun Iyengar via B4 Relay
  2 siblings, 1 reply; 7+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 10:03 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Alan Stern
  Cc: linux-usb, linux-kernel, Mathias Nyman, Chen-Yu Tsai, Rob Herring,
	Arun Iyengar

From: Arun Iyengar <aiyengar1990@gmail.com>

A SuperSpeed root port not found by its controller port number gets the
connect_type of its root hub port number, as before this series. On a
dwc3 that is 1, and a child node with reg 1 is the USB 2.0 device there,
so a SuperSpeed port with port@1 to a connector reads "hardwired", and
its devices are "fixed" and authorized as internal.

In that fallback, port@1 leading to an available node means "hotplug".
This changes rk3576-lckfb-tspi-3m and sc7180-ecs-liva-qc710.

Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
 drivers/usb/core/of.c   | 51 +++++++++++++++++++++++++++++++++----------------
 drivers/usb/core/port.c |  6 ++++--
 include/linux/usb/of.h  |  5 +++++
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/drivers/usb/core/of.c b/drivers/usb/core/of.c
index eebfc9cd0c88..5596936c5605 100644
--- a/drivers/usb/core/of.c
+++ b/drivers/usb/core/of.c
@@ -90,6 +90,38 @@ static bool usb_of_has_devices_or_graph(const struct usb_device *hub)
 	return false;
 }
 
+/**
+ * usb_of_port_is_hotplug() - check for a hotplug port in the OF graph
+ * @hub: hub to which port is for @port1
+ * @port1: graph port of the port
+ *
+ * Hotplug ports are connected to an available remote node, e.g.
+ * usb-a-connector compatible node, in the OF graph.
+ *
+ * Return: true if @port1 leads to an available node in the graph.
+ */
+bool usb_of_port_is_hotplug(struct usb_device *hub, int port1)
+{
+	struct device_node *np = hub->dev.of_node;
+	struct device_node *ep, *remote_np;
+	bool ret;
+
+	if (!of_graph_is_present(np))
+		return false;
+
+	ep = of_graph_get_endpoint_by_regs(np, port1, -1);
+	if (!ep)
+		return false;
+
+	remote_np = of_graph_get_remote_port_parent(ep);
+	of_node_put(ep);
+	ret = of_device_is_available(remote_np);
+	of_node_put(remote_np);
+
+	return ret;
+}
+EXPORT_SYMBOL_GPL(usb_of_port_is_hotplug);
+
 /**
  * usb_of_get_connect_type() - get a USB hub's port connect_type
  * @hub: hub to which port is for @port1
@@ -106,7 +138,7 @@ static bool usb_of_has_devices_or_graph(const struct usb_device *hub)
  */
 enum usb_port_connect_type usb_of_get_connect_type(struct usb_device *hub, int port1)
 {
-	struct device_node *np, *child, *ep, *remote_np;
+	struct device_node *child;
 	enum usb_port_connect_type connect_type;
 
 	/* Only set connect_type if binding has ports/hardwired devices. */
@@ -116,21 +148,8 @@ enum usb_port_connect_type usb_of_get_connect_type(struct usb_device *hub, int p
 	/* Assume port is unused if there's a graph or a child node. */
 	connect_type = USB_PORT_NOT_USED;
 
-	np = hub->dev.of_node;
-	/*
-	 * Hotplug ports are connected to an available remote node, e.g.
-	 * usb-a-connector compatible node, in the OF graph.
-	 */
-	if (of_graph_is_present(np)) {
-		ep = of_graph_get_endpoint_by_regs(np, port1, -1);
-		if (ep) {
-			remote_np = of_graph_get_remote_port_parent(ep);
-			of_node_put(ep);
-			if (of_device_is_available(remote_np))
-				connect_type = USB_PORT_CONNECT_TYPE_HOT_PLUG;
-			of_node_put(remote_np);
-		}
-	}
+	if (usb_of_port_is_hotplug(hub, port1))
+		connect_type = USB_PORT_CONNECT_TYPE_HOT_PLUG;
 
 	/*
 	 * Hard-wired ports are child nodes with a reg property corresponding
diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index 154f6bfc0805..2cb23fa9f75f 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -836,9 +836,11 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1)
 
 	graph_id = usb_port_graph_id(hdev, port1);
 	port_dev->connect_type = usb_of_get_connect_type(hdev, graph_id);
-	/* dwc3 graphs give the SuperSpeed port port@1 */
+	/* dwc3: port@1 is the SuperSpeed port, child reg 1 the USB 2.0 one */
 	if (port_dev->connect_type == USB_PORT_NOT_USED && graph_id != port1)
-		port_dev->connect_type = usb_of_get_connect_type(hdev, port1);
+		port_dev->connect_type = usb_of_port_is_hotplug(hdev, port1) ?
+					 USB_PORT_CONNECT_TYPE_HOT_PLUG :
+					 usb_of_get_connect_type(hdev, port1);
 	hub->ports[port1 - 1] = port_dev;
 	port_dev->portnum = port1;
 	set_bit(port1, hub->power_bits);
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
index 4be581bd2758..6de8029749b4 100644
--- a/include/linux/usb/of.h
+++ b/include/linux/usb/of.h
@@ -18,6 +18,7 @@ enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *np, int arg0);
 bool of_usb_host_tpl_support(struct device_node *np);
 int of_usb_update_otg_caps(struct device_node *np,
 			struct usb_otg_caps *otg_caps);
+bool usb_of_port_is_hotplug(struct usb_device *hub, int port1);
 enum usb_port_connect_type usb_of_get_connect_type(struct usb_device *hub, int port1);
 struct device_node *usb_of_get_device_node(struct usb_device *hub, int port1);
 struct device_node *usb_of_get_connector_peer(struct usb_device *hub, u32 port,
@@ -41,6 +42,10 @@ static inline int of_usb_update_otg_caps(struct device_node *np,
 {
 	return 0;
 }
+static inline bool usb_of_port_is_hotplug(struct usb_device *hub, int port1)
+{
+	return false;
+}
 static inline enum usb_port_connect_type
 usb_of_get_connect_type(const struct usb_device *hub, int port1)
 {

-- 
2.55.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v6 3/3] usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer
  2026-11-19 10:03 [PATCH v6 0/3] usb: core: Pair ports of different host controllers through their connector Arun Iyengar via B4 Relay
  2026-11-19 10:03 ` [PATCH v6 1/3] usb: core: Pair ports of different hubs " Arun Iyengar via B4 Relay
  2026-11-19 10:03 ` [PATCH v6 2/3] usb: core: Prefer the graph for a dwc3 SuperSpeed port's connect_type Arun Iyengar via B4 Relay
@ 2026-11-19 10:03 ` Arun Iyengar via B4 Relay
  2026-11-19 10:23   ` sashiko-bot
  2 siblings, 1 reply; 7+ messages in thread
From: Arun Iyengar via B4 Relay @ 2026-11-19 10:03 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Alan Stern
  Cc: linux-usb, linux-kernel, Mathias Nyman, Chen-Yu Tsai, Rob Herring,
	Arun Iyengar

From: Arun Iyengar <aiyengar1990@gmail.com>

With VBUS always on, a USB 3 device present at boot connects to the EHCI
before the SuperSpeed-only xHCI is up, and stays at 480 Mb/s until a USB
2.0 bus reset.

When such a SuperSpeed root hub starts, reset the USB 2.0 peer port of a
SuperSpeed-capable device (not a hub) once with usb_reset_device(). If
the device appears on the SuperSpeed port within 1 s, the USB 2.0 device
is disconnected; otherwise the reset completes at high speed.

Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>
---
 drivers/usb/core/hub.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/usb/core/hub.h |   3 +
 2 files changed, 161 insertions(+)

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 199d3f535a89..65d0728d4330 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -144,6 +144,8 @@ EXPORT_SYMBOL_GPL(ehci_cf_port_reset_rwsem);
 
 static int usb_reset_and_verify_device(struct usb_device *udev);
 static int hub_port_disable(struct usb_hub *hub, int port1, int set_state);
+static void hub_queue_peer_reset(struct usb_hub *hub);
+static void hub_peer_reset_work(struct work_struct *ws);
 static bool hub_port_warm_reset_required(struct usb_hub *hub, int port1,
 		u16 portstatus);
 
@@ -1346,6 +1348,10 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 
 	/* Scan all ports that need attention */
 	kick_hub_wq(hub);
+
+	if (!hdev->parent && hub_is_superspeed(hdev) &&
+	    (type == HUB_INIT2 || type == HUB_INIT3))
+		hub_queue_peer_reset(hub);
  abort:
 	if (type == HUB_INIT2 || type == HUB_INIT3) {
 		/* Allow autosuspend if it was suppressed */
@@ -1419,6 +1425,10 @@ static void hub_quiesce(struct usb_hub *hub, enum hub_quiescing_type type)
 	/* Stop hub_wq and related activity */
 	timer_delete_sync(&hub->irq_urb_retry);
 	flush_delayed_work(&hub->post_resume_work);
+	if (cancel_work_sync(&hub->peer_reset_work)) {
+		usb_autopm_put_interface_no_suspend(to_usb_interface(hub->intfdev));
+		hub_put(hub);
+	}
 	usb_kill_urb(hub->urb);
 	if (hub->has_indicators)
 		cancel_delayed_work_sync(&hub->leds);
@@ -1978,6 +1988,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
 	INIT_DELAYED_WORK(&hub->leds, led_work);
 	INIT_DELAYED_WORK(&hub->init_work, NULL);
 	INIT_DELAYED_WORK(&hub->post_resume_work, hub_post_resume);
+	INIT_WORK(&hub->peer_reset_work, hub_peer_reset_work);
 	INIT_WORK(&hub->events, hub_event);
 	INIT_LIST_HEAD(&hub->onboard_devs);
 	spin_lock_init(&hub->irq_urb_lock);
@@ -3278,6 +3289,116 @@ static void usb_unlock_port(struct usb_port *port_dev)
 	__release(&port_dev->status_lock);
 }
 
+static void hub_reset_peer_child(struct usb_hub *hub, int port1,
+				 struct usb_device *peer_hdev, int peer_port1)
+{
+	struct usb_port *ss_port = hub->ports[port1 - 1];
+	struct usb_port *port_dev;
+	struct usb_hub *peer_hub;
+	struct usb_device *udev;
+	u16 portstatus, portchange;
+
+	/* Keep hub_wq off the SuperSpeed port until the USB 2.0 device is gone */
+	mutex_lock_nested(&ss_port->status_lock, SINGLE_DEPTH_NESTING);
+	usb_lock_device(peer_hdev);
+	if (hub->quiescing)
+		goto out;
+	peer_hub = usb_hub_to_struct_hub(peer_hdev);
+	if (!peer_hub || peer_port1 > peer_hdev->maxchild)
+		goto out;
+
+	port_dev = peer_hub->ports[peer_port1 - 1];
+	udev = port_dev->child;
+	if (!udev || udev->speed != USB_SPEED_HIGH ||
+	    udev->descriptor.bDeviceClass == USB_CLASS_HUB)
+		goto out;
+
+	if (usb_hub_port_status(hub, port1, &portstatus, &portchange) ||
+	    (portstatus & USB_PORT_STAT_CONNECTION))
+		goto out;
+
+	usb_lock_device(udev);
+	if (udev->state != USB_STATE_NOTATTACHED &&
+	    udev->bos && udev->bos->ss_cap) {
+		dev_info(&udev->dev,
+			 "SuperSpeed peer port available, resetting\n");
+		port_dev->ss_retry = ss_port;
+		usb_reset_device(udev);
+		port_dev->ss_retry = NULL;
+	}
+	usb_unlock_device(udev);
+
+	/* As hub_port_connect() would */
+	if (udev->state == USB_STATE_NOTATTACHED) {
+		struct usb_hcd *hcd = bus_to_hcd(peer_hdev->bus);
+
+		if (hcd->usb_phy)
+			usb_phy_notify_disconnect(hcd->usb_phy, udev->speed);
+		usb_disconnect(&port_dev->child);
+	}
+out:
+	usb_unlock_device(peer_hdev);
+	mutex_unlock(&ss_port->status_lock);
+}
+
+static void hub_peer_reset_work(struct work_struct *ws)
+{
+	struct usb_hub *hub = container_of(ws, struct usb_hub, peer_reset_work);
+	struct usb_device *hdev = hub->hdev;
+	int port1;
+
+	for (port1 = 1; ; port1++) {
+		struct usb_device *peer_hdev = NULL;
+		struct usb_port *port_dev;
+		int peer_port1 = 0;
+
+		mutex_lock(&usb_port_peer_mutex);
+		if (port1 > hdev->maxchild || hub->quiescing) {
+			mutex_unlock(&usb_port_peer_mutex);
+			break;
+		}
+		port_dev = hub->ports[port1 - 1];
+		if (port_dev->connector_peer && port_dev->peer) {
+			peer_hdev = to_usb_device(port_dev->peer->dev.parent->parent);
+			peer_port1 = port_dev->peer->portnum;
+			if (peer_hdev->parent ||
+			    peer_hdev->bus->controller == hdev->bus->controller)
+				peer_hdev = NULL;
+			else
+				usb_get_dev(peer_hdev);
+		}
+		mutex_unlock(&usb_port_peer_mutex);
+
+		if (peer_hdev) {
+			hub_reset_peer_child(hub, port1, peer_hdev, peer_port1);
+			usb_put_dev(peer_hdev);
+		}
+	}
+
+	usb_autopm_put_interface_async(to_usb_interface(hub->intfdev));
+	hub_put(hub);
+}
+
+static void hub_queue_peer_reset(struct usb_hub *hub)
+{
+	struct usb_interface *intf = to_usb_interface(hub->intfdev);
+	int port1;
+
+	for (port1 = 1; port1 <= hub->hdev->maxchild; port1++) {
+		if (hub->ports[port1 - 1]->connector_peer)
+			break;
+	}
+	if (port1 > hub->hdev->maxchild)
+		return;
+
+	usb_autopm_get_interface_no_resume(intf);
+	hub_get(hub);
+	if (!queue_work(hub_wq, &hub->peer_reset_work)) {
+		usb_autopm_put_interface_async(intf);
+		hub_put(hub);
+	}
+}
+
 #ifdef	CONFIG_PM
 
 /* Check if a port is suspended(USB2.0 port) or in U3 state(USB3.0 port) */
@@ -4899,6 +5020,37 @@ static int get_bMaxPacketSize0(struct usb_device *udev,
 
 #define GET_DESCRIPTOR_BUFSIZE	64
 
+/* -ENOTCONN if the device moved to its SuperSpeed peer port */
+static int hub_wait_ss_retry(struct usb_hub *hub, int port1,
+			     struct usb_port *ss_port)
+{
+	struct usb_device *ss_hdev = to_usb_device(ss_port->dev.parent->parent);
+	struct usb_hub *ss_hub = usb_hub_to_struct_hub(ss_hdev);
+	u16 portstatus, portchange;
+	int i;
+
+	for (i = 0; i < 20; i++) {
+		msleep(50);
+		if (!ss_hub ||
+		    usb_hub_port_status(ss_hub, ss_port->portnum, &portstatus,
+					&portchange))
+			return 0;
+		if (portstatus & USB_PORT_STAT_CONNECTION)
+			break;
+	}
+	if (i == 20)
+		return 0;
+
+	/* Else hub_wq resets the port again */
+	for (i = 0; i < 20; i++) {
+		if (usb_hub_port_status(hub, port1, &portstatus, &portchange) ||
+		    !(portstatus & USB_PORT_STAT_CONNECTION))
+			break;
+		msleep(50);
+	}
+	return -ENOTCONN;
+}
+
 /* Reset device, (re)assign address, get device descriptor.
  * Device connection must be stable, no more debouncing needed.
  * Returns device in USB_STATE_ADDRESS, except on error.
@@ -4959,6 +5111,12 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1,
 		goto fail;
 	/* success, speed is known */
 
+	if (port_dev->ss_retry) {
+		retval = hub_wait_ss_retry(hub, port1, port_dev->ss_retry);
+		if (retval)
+			goto fail;
+	}
+
 	retval = -ENODEV;
 
 	/* Don't allow speed changes at reset, except usb 3.0 to faster */
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index ab80164b4b46..70241024e169 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -71,6 +71,7 @@ struct usb_hub {
 	struct delayed_work	leds;
 	struct delayed_work	init_work;
 	struct delayed_work	post_resume_work;
+	struct work_struct	peer_reset_work;
 	struct work_struct      events;
 	spinlock_t		irq_urb_lock;
 	struct timer_list	irq_urb_retry;
@@ -98,12 +99,14 @@ struct usb_hub {
  * @early_stop: whether port initialization will be stopped earlier.
  * @ignore_event: whether events of the port are ignored.
  * @connector_peer: peer found through a connector.
+ * @ss_retry: SuperSpeed port a device may move to on reset.
  */
 struct usb_port {
 	struct usb_device *child;
 	struct device dev;
 	struct usb_dev_state *port_owner;
 	struct usb_port *peer;
+	struct usb_port *ss_retry;
 	struct typec_connector *connector;
 	struct dev_pm_qos_request *req;
 	enum usb_port_connect_type connect_type;

-- 
2.55.0



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v6 2/3] usb: core: Prefer the graph for a dwc3 SuperSpeed port's connect_type
  2026-11-19 10:03 ` [PATCH v6 2/3] usb: core: Prefer the graph for a dwc3 SuperSpeed port's connect_type Arun Iyengar via B4 Relay
@ 2026-11-19 10:09   ` sashiko-bot
  0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-11-19 10:09 UTC (permalink / raw)
  To: Arun Iyengar; +Cc: linux-usb

> From: Arun Iyengar <aiyengar1990@gmail.com>
> 
> A SuperSpeed root port not found by its controller port number gets the
> connect_type of its root hub port number, as before this series. On a
> dwc3 that is 1, and a child node with reg 1 is the USB 2.0 device there,
> so a SuperSpeed port with port@1 to a connector reads "hardwired", and
> its devices are "fixed" and authorized as internal.
> 
> In that fallback, port@1 leading to an available node means "hotplug".
> This changes rk3576-lckfb-tspi-3m and sc7180-ecs-liva-qc710.
> 
> Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>

Sashiko has reviewed this patch and found no issues.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261119-usb-port-pairing-v6-0-32bd7e36e426@gmail.com?part=2


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v6 3/3] usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer
  2026-11-19 10:03 ` [PATCH v6 3/3] usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer Arun Iyengar via B4 Relay
@ 2026-11-19 10:23   ` sashiko-bot
  0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-11-19 10:23 UTC (permalink / raw)
  To: Arun Iyengar; +Cc: linux-usb

Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Medium] usb: hub: missing sync with peer hub init in
  hub_reset_peer_child()
--

commit 7d4ffb5084a3369e5c00127c3a48cf92988241d0
Author: Arun Iyengar <aiyengar1990@gmail.com>

usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer

When a SuperSpeed root hub starts, this commit resets the USB 2.0 peer
port of any SuperSpeed-capable device so that it can move to the
SuperSpeed port.

> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
> index 199d3f535a891..65d0728d43306 100644
> --- a/drivers/usb/core/hub.c
> +++ b/drivers/usb/core/hub.c

[ ... ]

> @@ -3278,6 +3289,116 @@ static void usb_unlock_port(struct usb_port *port_dev)
>  	__release(&port_dev->status_lock);
>  }
>  
> +static void hub_reset_peer_child(struct usb_hub *hub, int port1,
> +				 struct usb_device *peer_hdev, int peer_port1)
> +{
> +	struct usb_port *ss_port = hub->ports[port1 - 1];
> +	struct usb_port *port_dev;
> +	struct usb_hub *peer_hub;
> +	struct usb_device *udev;
> +	u16 portstatus, portchange;
> +
> +	/* Keep hub_wq off the SuperSpeed port until the USB 2.0 device is gone */
> +	mutex_lock_nested(&ss_port->status_lock, SINGLE_DEPTH_NESTING);
> +	usb_lock_device(peer_hdev);
> +	if (hub->quiescing)
> +		goto out;
> +	peer_hub = usb_hub_to_struct_hub(peer_hdev);
> +	if (!peer_hub || peer_port1 > peer_hdev->maxchild)
> +		goto out;
> +
> +	port_dev = peer_hub->ports[peer_port1 - 1];
> +	udev = port_dev->child;
> +	if (!udev || udev->speed != USB_SPEED_HIGH ||
> +	    udev->descriptor.bDeviceClass == USB_CLASS_HUB)
> +		goto out;

[Severity: Medium]
Can hub_reset_peer_child() observe port_dev->child == NULL and bail out
before peer_hub has finished enumerating a boot-connected device?

In hub_activate(peer_hub, HUB_INIT2), a USB 2.0 root hub with a connected
device sees USB_PORT_STAT_C_CONNECTION, sets need_debounce_delay = true,
queues peer_hub->init_work for HUB_DEBOUNCE_STABLE (100 ms), and unlocks
peer_hdev->dev.  Even after hub_init_func3() runs kick_hub_wq(peer_hub),
peer_hdev->dev is unlocked again before hub_event() enumerates the device
and assigns port_dev->child.

Meanwhile, the SuperSpeed root hub has no connection on its port during
HUB_INIT2, so it skips the 100 ms debounce delay and queues
peer_reset_work immediately:

peer_hub (USB 2.0)                hub (SuperSpeed)
------------------                ----------------
hub_activate(HUB_INIT2)
  need_debounce_delay = true
  queue_delayed_work(init_work,
                     100 ms)
  device_unlock(&peer_hdev->dev)
                                  hub_activate(HUB_INIT2)
                                    need_debounce_delay = false
                                    hub_queue_peer_reset(hub)
                                  hub_peer_reset_work()
                                    hub_reset_peer_child()
                                      usb_lock_device(peer_hdev)
                                      udev = port_dev->child; <-- NULL
                                      goto out;
hub_init_func3()
  ...
  hub_port_connect()
    port_dev->child = udev;

Whenever the SuperSpeed root hub probes while peer_hub->init_work or
peer_hub->events is still pending, hub_reset_peer_child() exits without
resetting the peer port, leaving the device at high speed.  Flushing
peer_hub->init_work and peer_hub->events before checking port_dev->child
would avoid this race.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261119-usb-port-pairing-v6-0-32bd7e36e426@gmail.com?part=3

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v6 1/3] usb: core: Pair ports of different hubs through their connector
  2026-11-19 10:03 ` [PATCH v6 1/3] usb: core: Pair ports of different hubs " Arun Iyengar via B4 Relay
@ 2026-11-19 10:34   ` sashiko-bot
  0 siblings, 0 replies; 7+ messages in thread
From: sashiko-bot @ 2026-11-19 10:34 UTC (permalink / raw)
  To: Arun Iyengar; +Cc: linux-usb

> From: Arun Iyengar <aiyengar1990@gmail.com>
> 
> On the RK3588, USB 3.0 host 2 is SuperSpeed-only and its connector's
> USB 2.0 lines go to a separate EHCI, so pairing by port number gives the
> SuperSpeed port a dead USB 2.0 peer.
> 
> When ports 0 (USB 2.0) and 1 (SuperSpeed) of a usb-connector graph lead
> to different hubs, pair them through the connector. The peer must be a
> "usb" node (usb.yaml) or under one; a mux or PHY there keeps today's
> pairing. Root hub ports are found by the controller port number; graphs
> in the dwc3 numbering don't match and keep today's pairing, as xHCI
> registers both root hubs before devices enumerate. connect_type is
> looked up the same way, so such a SuperSpeed port reads "hotplug".
> 
> Signed-off-by: Arun Iyengar <aiyengar1990@gmail.com>

Sashiko has reviewed this patch and found no issues.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261119-usb-port-pairing-v6-0-32bd7e36e426@gmail.com?part=1


^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2026-11-19 10:34 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 10:03 [PATCH v6 0/3] usb: core: Pair ports of different host controllers through their connector Arun Iyengar via B4 Relay
2026-11-19 10:03 ` [PATCH v6 1/3] usb: core: Pair ports of different hubs " Arun Iyengar via B4 Relay
2026-11-19 10:34   ` sashiko-bot
2026-11-19 10:03 ` [PATCH v6 2/3] usb: core: Prefer the graph for a dwc3 SuperSpeed port's connect_type Arun Iyengar via B4 Relay
2026-11-19 10:09   ` sashiko-bot
2026-11-19 10:03 ` [PATCH v6 3/3] usb: hub: Retry SuperSpeed for a device stuck on its USB 2.0 peer Arun Iyengar via B4 Relay
2026-11-19 10:23   ` sashiko-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox