* [PATCH 0/2] xhci fixes for usb-linus
@ 2021-12-10 14:17 Mathias Nyman
2021-12-10 14:17 ` [PATCH 1/2] xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending Mathias Nyman
2021-12-10 14:17 ` [PATCH 2/2] xhci: avoid race between disable slot command and host runtime suspend Mathias Nyman
0 siblings, 2 replies; 11+ messages in thread
From: Mathias Nyman @ 2021-12-10 14:17 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
A couple xhci patches for usb-linus that solves two suspend/resume related issues.
Thanks
-Mathias
Kai-Heng Feng (1):
xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime
suspending
Mathias Nyman (1):
xhci: avoid race between disable slot command and host runtime suspend
drivers/usb/host/xhci-hub.c | 1 +
drivers/usb/host/xhci-ring.c | 1 -
drivers/usb/host/xhci.c | 26 +++++++++++++++-----------
3 files changed, 16 insertions(+), 12 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending
2021-12-10 14:17 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
@ 2021-12-10 14:17 ` Mathias Nyman
2021-12-10 14:17 ` [PATCH 2/2] xhci: avoid race between disable slot command and host runtime suspend Mathias Nyman
1 sibling, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2021-12-10 14:17 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Kai-Heng Feng, stable, Mathias Nyman
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
When the xHCI is quirked with XHCI_RESET_ON_RESUME, runtime resume
routine also resets the controller.
This is bad for USB drivers without reset_resume callback, because
there's no subsequent call of usb_dev_complete() ->
usb_resume_complete() to force rebinding the driver to the device. For
instance, btusb device stops working after xHCI controller is runtime
resumed, if the controlled is quirked with XHCI_RESET_ON_RESUME.
So always take XHCI_RESET_ON_RESUME into account to solve the issue.
Cc: <stable@vger.kernel.org>
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 902f410874e8..af92a9f8ed67 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3934,7 +3934,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
struct xhci_slot_ctx *slot_ctx;
int i, ret;
-#ifndef CONFIG_USB_DEFAULT_PERSIST
/*
* We called pm_runtime_get_noresume when the device was attached.
* Decrement the counter here to allow controller to runtime suspend
@@ -3942,7 +3941,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
*/
if (xhci->quirks & XHCI_RESET_ON_RESUME)
pm_runtime_put_noidle(hcd->self.controller);
-#endif
ret = xhci_check_args(hcd, udev, NULL, 0, true, __func__);
/* If the host is halted due to driver unload, we still need to free the
@@ -4094,14 +4092,12 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
xhci_debugfs_create_slot(xhci, slot_id);
-#ifndef CONFIG_USB_DEFAULT_PERSIST
/*
* If resetting upon resume, we can't put the controller into runtime
* suspend if there is a device attached.
*/
if (xhci->quirks & XHCI_RESET_ON_RESUME)
pm_runtime_get_noresume(hcd->self.controller);
-#endif
/* Is this a LS or FS device under a HS hub? */
/* Hub or peripherial? */
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] xhci: avoid race between disable slot command and host runtime suspend
2021-12-10 14:17 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
2021-12-10 14:17 ` [PATCH 1/2] xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending Mathias Nyman
@ 2021-12-10 14:17 ` Mathias Nyman
1 sibling, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2021-12-10 14:17 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman, stable
Make xhci_disable_slot() synchronous, thus ensuring it, and
xhci_free_dev() calling it return after xHC controller completes
the disable slot command.
Otherwise the roothub and xHC host may runtime suspend, and clear the
command ring while the disable slot command is being processed.
This causes a command completion mismatch as the completion event can't
be mapped to the correct command.
Command ring gets out of sync and commands time out.
Driver finally assumes host is unresponsive and bails out.
usb 2-4: USB disconnect, device number 10
xhci_hcd 0000:00:0d.0: ERROR mismatched command completion event
...
xhci_hcd 0000:00:0d.0: xHCI host controller not responding, assume dead
xhci_hcd 0000:00:0d.0: HC died; cleaning up
Cc: <stable@vger.kernel.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci-hub.c | 1 +
drivers/usb/host/xhci-ring.c | 1 -
drivers/usb/host/xhci.c | 22 +++++++++++++++-------
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index af946c42b6f0..df3522dab31b 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -717,6 +717,7 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci,
continue;
retval = xhci_disable_slot(xhci, i);
+ xhci_free_virt_device(xhci, i);
if (retval)
xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n",
i, retval);
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index eaa49aef2935..d0b6806275e0 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1525,7 +1525,6 @@ static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id)
if (xhci->quirks & XHCI_EP_LIMIT_QUIRK)
/* Delete default control endpoint resources */
xhci_free_device_endpoint_resources(xhci, virt_dev, true);
- xhci_free_virt_device(xhci, slot_id);
}
static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id,
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index af92a9f8ed67..f5b1bcc875de 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3959,9 +3959,8 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
del_timer_sync(&virt_dev->eps[i].stop_cmd_timer);
}
virt_dev->udev = NULL;
- ret = xhci_disable_slot(xhci, udev->slot_id);
- if (ret)
- xhci_free_virt_device(xhci, udev->slot_id);
+ xhci_disable_slot(xhci, udev->slot_id);
+ xhci_free_virt_device(xhci, udev->slot_id);
}
int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)
@@ -3971,7 +3970,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)
u32 state;
int ret = 0;
- command = xhci_alloc_command(xhci, false, GFP_KERNEL);
+ command = xhci_alloc_command(xhci, true, GFP_KERNEL);
if (!command)
return -ENOMEM;
@@ -3996,6 +3995,15 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id)
}
xhci_ring_cmd_db(xhci);
spin_unlock_irqrestore(&xhci->lock, flags);
+
+ wait_for_completion(command->completion);
+
+ if (command->status != COMP_SUCCESS)
+ xhci_warn(xhci, "Unsuccessful disable slot %u command, status %d\n",
+ slot_id, command->status);
+
+ xhci_free_command(xhci, command);
+
return ret;
}
@@ -4104,9 +4112,8 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
return 1;
disable_slot:
- ret = xhci_disable_slot(xhci, udev->slot_id);
- if (ret)
- xhci_free_virt_device(xhci, udev->slot_id);
+ xhci_disable_slot(xhci, udev->slot_id);
+ xhci_free_virt_device(xhci, udev->slot_id);
return 0;
}
@@ -4236,6 +4243,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
mutex_unlock(&xhci->mutex);
ret = xhci_disable_slot(xhci, udev->slot_id);
+ xhci_free_virt_device(xhci, udev->slot_id);
if (!ret)
xhci_alloc_dev(hcd, udev);
kfree(command->completion);
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2024-04-04 12:11 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2024-04-04 12:11 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, niklas.neronin, Thinh.Nguyen, Mathias Nyman
Hi Greg
A couple xhci fixes for 6.9 rc
The null pointer dereferece fix solves a regression in 6.9-rc1,
so no need to add it to stable
Thanks
-Mathias
Mathias Nyman (1):
xhci: Fix root hub port null pointer dereference in xhci tracepoints
Oliver Neukum (1):
usb: xhci: correct return value in case of STS_HCE
drivers/usb/host/xhci-ring.c | 9 ++++-----
drivers/usb/host/xhci-trace.h | 12 +++++-------
2 files changed, 9 insertions(+), 12 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2023-05-15 13:40 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2023-05-15 13:40 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
A couple xhci fixes for 6.4
Fixing a S3 resume issue on AMD hosts, and a flaw in calculating free TRBs
in ring buffer which may cause xhci to hog extra memory.
Thanks
Mathias
Mario Limonciello (1):
xhci-pci: Only run d3cold avoidance quirk for s2idle
Mathias Nyman (1):
xhci: Fix incorrect tracking of free space on transfer rings
drivers/usb/host/xhci-pci.c | 12 ++++++++++--
drivers/usb/host/xhci-ring.c | 29 ++++++++++++++++++++++++++++-
drivers/usb/host/xhci.h | 2 +-
3 files changed, 39 insertions(+), 4 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2022-02-15 12:33 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2022-02-15 12:33 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
A couple small xhci fixes for usb-linus
Add Host controller error (HCE) to the list of reasons to reset the host
during resume.
Also make sure we don't change the error value returned if URB submission
fails.
Thanks
-Mathias
Hongyu Xie (1):
xhci: Prevent futile URB re-submissions due to incorrect return value.
Puma Hsu (1):
xhci: re-initialize the HC during resume if HCE was set
drivers/usb/host/xhci.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2021-05-25 7:40 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2021-05-25 7:40 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
two patches for usb-linus and 5.12 stable
xhci changes in 5.12 caused a regression in stall handling.
Due to this some usb card readers failed to work with 5.12
These two patches fix that regression.
Thanks
-Mathias
Mathias Nyman (2):
xhci: fix giving back URB with incorrect status regression in 5.12
xhci: Fix 5.12 regression of missing xHC cache clearing command after
a Stall
drivers/usb/host/xhci-ring.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2021-01-15 16:19 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2021-01-15 16:19 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
A couple fixes for usb-linus.
Fixes one "xHCI died" case found when stress testing URB cancel on
several devices at once, and one timing issue on Tegra xhci
JC Kuo (1):
xhci: tegra: Delay for disabling LFPS detector
Mathias Nyman (1):
xhci: make sure TRB is fully written before giving it to the
controller
drivers/usb/host/xhci-ring.c | 2 ++
drivers/usb/host/xhci-tegra.c | 7 +++++++
2 files changed, 9 insertions(+)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2020-05-14 11:04 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2020-05-14 11:04 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
Two small xhci fixes for usb-linus, both fix NULL pointer dereference issues.
Would be nice if they could still make 5.7
Thanks
Mathias
Li Jun (1):
usb: host: xhci-plat: keep runtime active when removing host
Sriharsha Allenki (1):
usb: xhci: Fix NULL pointer dereference when enqueuing trbs from urb
sg list
drivers/usb/host/xhci-plat.c | 4 +++-
drivers/usb/host/xhci-ring.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2020-03-06 15:08 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2020-03-06 15:08 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
A couple minor xhci fixes for usb-linus, fixing xhci trace events and
adding a quirk flag for a AMD xhci host.
-Mathias
Alberto Mattea (1):
usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c
Steven Rostedt (VMware) (1):
xhci: Do not open code __print_symbolic() in xhci trace events
drivers/usb/host/xhci-pci.c | 3 ++-
drivers/usb/host/xhci-trace.h | 23 ++++++-----------------
2 files changed, 8 insertions(+), 18 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] xhci fixes for usb-linus
@ 2019-06-18 14:27 Mathias Nyman
0 siblings, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2019-06-18 14:27 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman
Hi Greg
A couple of fixes for usb-linus, one to detect usb 3.2 xhci hosts,
another to resolve a rare host hang at resume issue.
-Mathias
Mathias Nyman (2):
usb: xhci: Don't try to recover an endpoint if port is in error state.
xhci: detect USB 3.2 capable host controllers correctly
drivers/usb/host/xhci-ring.c | 15 ++++++++++++++-
drivers/usb/host/xhci.c | 25 ++++++++++++++++++++-----
drivers/usb/host/xhci.h | 9 +++++++++
3 files changed, 43 insertions(+), 6 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-04-04 12:09 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-10 14:17 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
2021-12-10 14:17 ` [PATCH 1/2] xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending Mathias Nyman
2021-12-10 14:17 ` [PATCH 2/2] xhci: avoid race between disable slot command and host runtime suspend Mathias Nyman
-- strict thread matches above, loose matches on Subject: below --
2024-04-04 12:11 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
2023-05-15 13:40 Mathias Nyman
2022-02-15 12:33 Mathias Nyman
2021-05-25 7:40 Mathias Nyman
2021-01-15 16:19 Mathias Nyman
2020-05-14 11:04 Mathias Nyman
2020-03-06 15:08 Mathias Nyman
2019-06-18 14:27 Mathias Nyman
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).