From: "William A. Kennington III" <william@wkennington.com>
To: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Michal Pecio <michal.pecio@gmail.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
"William A. Kennington III" <william@wkennington.com>
Subject: [PATCH v2] usb: ehci: skip companion handoff when no companion exists
Date: Mon, 16 Nov 2026 06:31:04 +0000 [thread overview]
Message-ID: <20261116063104.1018358-1-william@wkennington.com> (raw)
EHCI controllers without an integrated root-hub transaction translator
unconditionally set PORT_OWNER whenever a root port sees low-speed line
state before reset, finishes reset without enabling High-Speed mode, or
is relinquished by usbcore after enumeration fails. When no companion
controller is present or enabled, setting PORT_OWNER routes the port
away from EHCI to a nonexistent or disabled controller. A single missed
High-Speed chirp or transient D+/D- bounce during reset then strands
downstream USB 2.0 hubs until EHCI is rebound, and connecting a USB 1.1
device leaves the port dead to later USB 2.0 devices.
Check during ehci_setup() whether the root hub has an integrated
transaction translator (ehci_is_TDI()), HCSPARAMS reports zero
companions (HCS_N_CC == 0), both CONFIG_USB_OHCI_HCD and
CONFIG_USB_UHCI_HCD are disabled in Kconfig (such as in
aspeed_g4_defconfig, aspeed_g5_defconfig, and BMC builds without UHCI
or OHCI), or a Device Tree companion phandle points to a disabled node.
Runtime companion binding is intentionally not checked at setup time so
modular or later-probing companion drivers still receive handoffs.
When no companion is available, set ehci->no_companion so the handoff
and companion sysfs paths check a single flag, keeping port ownership
on EHCI when no companion exists. USB 1.1 full- and low-speed devices
still cannot enumerate without an integrated TT or companion controller
and will fail usbcore's normal reset retries instead of triggering a
PORT_OWNER handoff.
Signed-off-by: William A. Kennington III <william@wkennington.com>
---
Changes in v2:
- Fold ehci_is_TDI() and its comment into ehci_has_companion() so all
handoff and sysfs sites check ehci->no_companion alone (Michal Pecio).
- Drop Alan Stern's v1 Acked-by due to the refactored check.
- Link to v1: https://lore.kernel.org/linux-usb/20261114051653.1353346-1-william@wkennington.com/
drivers/usb/host/ehci-hcd.c | 35 +++++++++++++++++++++++++++++++++++
drivers/usb/host/ehci-hub.c | 20 ++++++++------------
drivers/usb/host/ehci-sysfs.c | 6 ++----
drivers/usb/host/ehci.h | 1 +
4 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 75f780ec3ba0..2a9b25a5a94d 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -26,6 +26,7 @@
#include <linux/moduleparam.h>
#include <linux/dma-mapping.h>
#include <linux/debugfs.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
@@ -679,6 +680,37 @@ static int ehci_run (struct usb_hcd *hcd)
return 0;
}
+static bool ehci_has_companion(struct ehci_hcd *ehci)
+{
+ struct device *dev = ehci_to_hcd(ehci)->self.controller;
+
+ /* with integrated TT there is no companion! */
+ if (ehci_is_TDI(ehci))
+ return false;
+
+ if (HCS_N_CC(ehci->hcs_params) == 0)
+ return false;
+
+ if (!IS_ENABLED(CONFIG_USB_OHCI_HCD) &&
+ !IS_ENABLED(CONFIG_USB_UHCI_HCD))
+ return false;
+
+ if (dev && dev->of_node) {
+ struct device_node *node;
+
+ node = of_parse_phandle(dev->of_node, "companion", 0);
+ if (node) {
+ bool avail = of_device_is_available(node);
+
+ of_node_put(node);
+ if (!avail)
+ return false;
+ }
+ }
+
+ return true;
+}
+
int ehci_setup(struct usb_hcd *hcd)
{
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
@@ -691,6 +723,9 @@ int ehci_setup(struct usb_hcd *hcd)
/* cache this readonly data; minimize chip reads */
ehci->hcs_params = ehci_readl(ehci, &ehci->caps->hcs_params);
+ ehci->no_companion = !ehci_has_companion(ehci);
+ if (ehci->no_companion)
+ ehci_dbg(ehci, "no companion controller, disabling port handoff\n");
ehci->sbrn = HCD_USB2;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index e676c98b6baa..23644acda144 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -617,19 +617,16 @@ static int check_reset_complete (
/* if reset finished and it's still not enabled -- handoff */
if (!(port_status & PORT_PE)) {
-
- /* with integrated TT, there's nobody to hand it to! */
- if (ehci_is_TDI(ehci)) {
- ehci_dbg (ehci,
- "Failed to enable port %d on root hub TT\n",
- index+1);
+ if (ehci->no_companion) {
+ ehci_dbg(ehci, "Failed to enable port %d%s\n",
+ index + 1,
+ ehci_is_TDI(ehci) ? " on root hub TT" : "");
return port_status;
}
ehci_dbg (ehci, "port %d full speed --> companion\n",
index + 1);
- // what happens if HCS_N_CC(params) == 0 ?
port_status |= PORT_OWNER;
port_status &= ~PORT_RWC_BITS;
ehci_writel(ehci, port_status, status_reg);
@@ -1145,9 +1142,8 @@ int ehci_hub_control(
* which can be fine if this root hub has a
* transaction translator built in.
*/
- if ((temp & (PORT_PE|PORT_CONNECT)) == PORT_CONNECT
- && !ehci_is_TDI(ehci)
- && PORT_USB11 (temp)) {
+ if ((temp & (PORT_PE | PORT_CONNECT)) == PORT_CONNECT &&
+ !ehci->no_companion && PORT_USB11(temp)) {
ehci_dbg (ehci,
"port %d low speed --> companion\n",
wIndex + 1);
@@ -1244,7 +1240,7 @@ static void ehci_relinquish_port(struct usb_hcd *hcd, int portnum)
{
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
- if (ehci_is_TDI(ehci))
+ if (ehci->no_companion)
return;
set_owner(ehci, --portnum, PORT_OWNER);
}
@@ -1254,7 +1250,7 @@ static int ehci_port_handed_over(struct usb_hcd *hcd, int portnum)
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
u32 __iomem *reg;
- if (ehci_is_TDI(ehci))
+ if (ehci->no_companion)
return 0;
reg = ehci_portsc(ehci, portnum - 1);
return ehci_readl(ehci, reg) & PORT_OWNER;
diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c
index 5e6b545c30e6..d6db2b818a9f 100644
--- a/drivers/usb/host/ehci-sysfs.c
+++ b/drivers/usb/host/ehci-sysfs.c
@@ -145,8 +145,7 @@ static inline int create_sysfs_files(struct ehci_hcd *ehci)
struct device *controller = ehci_to_hcd(ehci)->self.controller;
int i = 0;
- /* with integrated TT there is no companion! */
- if (!ehci_is_TDI(ehci))
+ if (!ehci->no_companion)
i = device_create_file(controller, &dev_attr_companion);
if (i)
goto out;
@@ -160,8 +159,7 @@ static inline void remove_sysfs_files(struct ehci_hcd *ehci)
{
struct device *controller = ehci_to_hcd(ehci)->self.controller;
- /* with integrated TT there is no companion! */
- if (!ehci_is_TDI(ehci))
+ if (!ehci->no_companion)
device_remove_file(controller, &dev_attr_companion);
device_remove_file(controller, &dev_attr_uframe_periodic_max);
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 855a9d08b019..8ab5c696717a 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -238,6 +238,7 @@ struct ehci_hcd { /* one per controller */
unsigned no_configured_flag:1;
unsigned no_tdi_mode:1;
unsigned no_fsls_isoc:1;
+ unsigned no_companion:1;
/* required for usb32 quirk */
#define OHCI_CTRL_HCFS (3 << 6)
--
2.56.0.611.g1030f0b940-goog
next reply other threads:[~2026-11-16 6:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 6:31 William A. Kennington III [this message]
2026-11-16 6:41 ` [PATCH v2] usb: ehci: skip companion handoff when no companion exists sashiko-bot
2026-11-16 18:31 ` Alan Stern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116063104.1018358-1-william@wkennington.com \
--to=william@wkennington.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=michal.pecio@gmail.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.