From: "Thang Q. Nguyen" <tqnguyen@apm.com>
To: Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Thang Nguyen <tqnguyen@apm.com>, Phong Vo <pvo@apm.com>,
Loc Ho <lho@apm.com>, Tung Nguyen <tunguyen@apm.com>,
patches@apm.com
Subject: [v2,1/1] usb: xhci: do not create and register shared_hcd when USB3.0 is disabled
Date: Mon, 29 Jan 2018 17:24:34 +0700 [thread overview]
Message-ID: <1517221474-19627-1-git-send-email-tqnguyen@apm.com> (raw)
From: Tung Nguyen <tunguyen@apm.com>
Currently, hcd->shared_hcd always creates and registers to the usb-core.
If, for some reasons, USB3 downstream port is disabled, no roothub port for
USB3.0 is found. This causes kernel to display an error:
hub 2-0:1.0: config failed, hub doesn't have any ports! (err -19)
This patch checks and registers shared_hcd if USB3.0 downstream
port is available.
Signed-off-by: Tung Nguyen <tunguyen@apm.com>
---
drivers/usb/host/xhci-plat.c | 9 ++++++---
drivers/usb/host/xhci.c | 13 +++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 6f03830..bdb3975 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -293,9 +293,12 @@ static int xhci_plat_probe(struct platform_device *pdev)
if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
xhci->shared_hcd->can_do_streams = 1;
- ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
- if (ret)
- goto dealloc_usb2_hcd;
+ /* Just add the shared_hcd when USB3.0 downstream port is available */
+ if (xhci->num_usb3_ports > 0) {
+ ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED);
+ if (ret)
+ goto dealloc_usb2_hcd;
+ }
device_enable_async_suspend(&pdev->dev);
pm_runtime_put_noidle(&pdev->dev);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 1eeb339..9d3b1ab 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -611,6 +611,19 @@ int xhci_run(struct usb_hcd *hcd)
if (ret)
xhci_free_command(xhci, command);
}
+ /*
+ * In case that the USB3.0 downstream port is not available
+ * No one triggers to start the xHC which should be done
+ * before finishing xhci_run
+ */
+ if (xhci->num_usb3_ports == 0) {
+ if (xhci_start(xhci)) {
+ xhci_halt(xhci);
+ return -ENODEV;
+ }
+ xhci->cmd_ring_state = CMD_RING_STATE_RUNNING;
+ }
+
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
"Finished xhci_run for USB2 roothub");
next reply other threads:[~2018-01-29 10:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-29 10:24 Thang Q. Nguyen [this message]
2018-03-05 10:22 [v2,1/1] usb: xhci: do not create and register shared_hcd when USB3.0 is disabled Thang Q. Nguyen
2018-03-28 9:53 Thang Q. Nguyen
2018-11-02 6:57 Nicolas Boichat
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=1517221474-19627-1-git-send-email-tqnguyen@apm.com \
--to=tqnguyen@apm.com \
--cc=gregkh@linuxfoundation.org \
--cc=lho@apm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=patches@apm.com \
--cc=pvo@apm.com \
--cc=tunguyen@apm.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).