From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.214.169 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794810668; b=PpPEq9fN8usR2LZghp/CHeVbvgu4K+0DS509O436GaQQwgFw0K6EO/1yvRODGfCw8of2 h4N+AN+qrRljUnMrgizl5ya6B496xBmL6Nm1W4W9GNhKdxiIqUstC8Z38Ky/7PIubGk2p f7VvF80GMyly8tz/cTD2VQGB5Iv2y7w0DzWteTO0rhbRatjG1eToCePihk6FlR11OvNYz LKAVfQCi7kCHBy3icFszLhg4/5Uv9jTJjE9x70xF+5v3SOnw3TWWJZTVvrTZGb3rGcXTt mI3Dm5EoD4Pxkg6BzjhLoo/2orjKQyG43A+15O/ShN8zEWFYTHQjqx3aQkIHvklEmHg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794810668; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; bh=1781s8QsZSAD5YDP2EWvZHZDwaJdMMZnVfV8pdQz5DQ=; b=H5eh8llOeUk3bqmmyel1IJv5l+rsYFy9RFU8w9WuN6VKBvHYG1sQRNjm623tCJvG4gvM ON6nfBkM5hVGMeuKNp89HEwVVMunmk2jPwBzG1O9A/gbB6uz8DvLzK0rjR7+W1y1Kkg0R 9FnkvEHp6zukhadWEikdEw+ZnoKiQ6EG0qQQf41mdtsI3IJMZ/SmiJzynDes5UxVYJ/sc Vi+gUSLlWg8qxi0q7QiLD9hYUxWTo0sTodJH6soX78pp2UaJ9l3eIYot9XAqQuISjiJzz Z3a0M2NGtBjwnZEHrnRA0eKFoM//7JADHpMiGfDmqVNHVAUkXbC2tNa+MKBI1ugk1/Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=wkennington.com; spf=none smtp.mailfrom=wkennington.com; dkim=pass header.d=wkennington-com.20260707.gappssmtp.com header.i=@wkennington-com.20260707.gappssmtp.com header.a=rsa-sha256 header.s=20260707 header.b=U7Q758hW; arc=none smtp.remote-ip=209.85.214.169 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 905C2606A335 for ; Mon, 16 Nov 2026 06:31:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 905C2606A335 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=wkennington.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=wkennington.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=wkennington-com.20260707.gappssmtp.com header.i=@wkennington-com.20260707.gappssmtp.com header.a=rsa-sha256 header.s=20260707 header.b=U7Q758hW Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2e95bd1c14cso37865785ad.2 for ; Sun, 15 Nov 2026 22:31:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wkennington-com.20260707.gappssmtp.com; s=20260707; t=1794810667; x=1795415467; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=1781s8QsZSAD5YDP2EWvZHZDwaJdMMZnVfV8pdQz5DQ=; b=U7Q758hWO6hJAFfinRXD/gGa7xl8G78+m4MdD0mfpl16Uc9ay3X7a6+O0Y20ylw0LR nMRm7v5bmS7jWYzY9M7xaQF3sGkokklrS81dcBHRKF4pD9xJYbKHWsa+kAAoDhWt+msS JiXwe2Gs6TcTELgGVggZtHNXvIhe6zLpaUj52TWQHZ36y8I6IOE8NQFt68HlA9nfBFgh GqUIZBOd5glxs0uuoTAGcn0M1njrkhoZErDuybb1l0a5f+wKqYLVe2pZudwn+dktGmAU ydMQcYyjWP5wjaUQkAewNvvPlivudT2xjzwE/8DnwowGLxWwdi7lHcy6rhpScalq+6BS BeYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794810667; x=1795415467; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1781s8QsZSAD5YDP2EWvZHZDwaJdMMZnVfV8pdQz5DQ=; b=PUm+Na1wf2C+9MxpD0S2BkWdunsYjL4XgqG0pC95L530JZMK+F4cJVa4sK/5MwokjN oAk+Ksrm4F9rujCUlgZAtcH0SQkgE6+dBgOKtP3Zdc1wPQR1nyXM0MkoVvXzmtXEl3Ip gBiDKw0JY7UncD2nlQ13iW1dxktKEP7/RQZ3TO6Z50XpvMTUlXxPprnbyCxqh+p6YgYp waLWo8+CcOvnxz49cvzTX+rgXS4+J79BMJqlHh9MNGily+urj941KbNplQhNYJPUoscB HEQ+avhhEb3+/IVmWzEeXQ4sYFNg+J+7TlUGDHNiJ95B+bjAgq/LHeZDJrGuVZCLXWkq EGaw== X-Forwarded-Encrypted: i=1; AL+hErGEwrGJk7gfzey+BBS9vnCOlAeqkbBi8x80UliBe3dV4PxS+Y7YMH2M9o4+KUzl5k8Om2m3JsIEtsKf3U8=@vger.kernel.org X-Gm-Message-State: APuU4Z8WhkWj9S3sEGB2GXiPSUuMGOmohS9uOjdhfTav9DcHSm5rvy1X MvAFtiQs+MTt/J8hc1flH5ZD4P59ITVgf5/z5WzKpD+lX0CbC+H35lr8nUZvBcvfv+I= X-Gm-Gg: AZFdTZfo2oaLwwzH3jfubJd4BtFPI3UyMxnDA07B+9wGoLrQWBmcnyAyQKS6MCRWUVg 8DHSWdF6jEuVvKNKewtULA25m2GrWV3nAz5+drnGHWuGHXgqEfaJMdFtQ/nTKlbUlUJqMhcNRV7 Fr0cALR33acdVqP9tjksArpVBirFw5srGvMGwCpmI0lTEh9y04Wh/D75fRE27dfiSLcGNhdu7pV l93odRDirAi08+N0ooc8eY3TxAsYnh45A18JUPTVHKySgobkUJ6wgUckQ5DvlbWW70SZ+KQzs7Y VpjZGbPXaqrDVyJ5X1x7nr43gtraiGmnlewBZ0u9YwNUzYB8JDEnnYOUWa+Ho9rwkwgytG4Ztgz 5uR6/G+j4+TZvcOeoWppJGypYL/ANoOfIzqTiLkhWpMlpVwgpDiFsu6C19dR3qAh+tOFW4DGOFj HvxQIeXfDRhvNqXG3b4uzV7PPhJFODNIAAbb11KKlHHhjfS7Zpq33nmdQb79xKIHpvI+IfpmcRF 9wX1WPu/k1ccNiV2i6EXDnu9yM+QqobkxgOZvvdZDrAnKfRk8VuysX4sO8GM5muIGW7OZF1nLrZ TWoiZJlEx6ARt7aIabqZYRIHwWuHHA4uwaj+tszcr1n1fAun9pxX3MBtNAKDBjxAgOZzNGS25Ol a7TfN9TEcLkwVV/Za6sbmy2oHbUN0HwV5Ysg= X-Received: by 2002:a17:902:db08:b0:2ed:3be3:c648 with SMTP id d9443c01a7336-2ee0dd9f13emr100875765ad.22.1794810666732; Sun, 15 Nov 2026 22:31:06 -0800 (PST) Received: from wak.c.googlers.com.com (246.21.127.34.bc.googleusercontent.com. [34.127.21.246]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ee0f76007bsm33453735ad.24.2026.11.15.22.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Nov 2026 22:31:06 -0800 (PST) From: "William A. Kennington III" To: Alan Stern Cc: Greg Kroah-Hartman , Michal Pecio , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, "William A. Kennington III" Subject: [PATCH v2] usb: ehci: skip companion handoff when no companion exists Date: Mon, 16 Nov 2026 06:31:04 +0000 Message-ID: <20261116063104.1018358-1-william@wkennington.com> X-Mailer: git-send-email 2.56.0.567.gdb80ae8cd5-goog X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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 #include #include +#include #include #include @@ -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