* [PATCH 0/2] xhci fixes for usb-linus
@ 2023-05-15 13:40 Mathias Nyman
2023-05-15 13:40 ` [PATCH 1/2] xhci-pci: Only run d3cold avoidance quirk for s2idle Mathias Nyman
2023-05-15 13:40 ` [PATCH 2/2] xhci: Fix incorrect tracking of free space on transfer rings Mathias Nyman
0 siblings, 2 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 1/2] xhci-pci: Only run d3cold avoidance quirk for s2idle
2023-05-15 13:40 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
@ 2023-05-15 13:40 ` Mathias Nyman
2023-05-15 13:40 ` [PATCH 2/2] xhci: Fix incorrect tracking of free space on transfer rings Mathias Nyman
1 sibling, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2023-05-15 13:40 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mario Limonciello, Donghun Yoon, stable, Mathias Nyman
From: Mario Limonciello <mario.limonciello@amd.com>
Donghun reports that a notebook that has an AMD Ryzen 5700U but supports
S3 has problems with USB after resuming from suspend. The issue was
bisected down to commit d1658268e439 ("usb: pci-quirks: disable D3cold on
xhci suspend for s2idle on AMD Renoir").
As this issue only happens on S3, narrow the broken D3cold quirk to only
run in s2idle.
Fixes: d1658268e439 ("usb: pci-quirks: disable D3cold on xhci suspend for s2idle on AMD Renoir")
Reported-and-tested-by: Donghun Yoon <donghun.yoon@lge.com>
Cc: stable@vger.kernel.org
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci-pci.c | 12 ++++++++++--
drivers/usb/host/xhci.h | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index ddb79f23fb3b..79b3691f373f 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/acpi.h>
#include <linux/reset.h>
+#include <linux/suspend.h>
#include "xhci.h"
#include "xhci-trace.h"
@@ -387,7 +388,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
if (pdev->vendor == PCI_VENDOR_ID_AMD &&
pdev->device == PCI_DEVICE_ID_AMD_RENOIR_XHCI)
- xhci->quirks |= XHCI_BROKEN_D3COLD;
+ xhci->quirks |= XHCI_BROKEN_D3COLD_S2I;
if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
xhci->quirks |= XHCI_LPM_SUPPORT;
@@ -801,9 +802,16 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
* Systems with the TI redriver that loses port status change events
* need to have the registers polled during D3, so avoid D3cold.
*/
- if (xhci->quirks & (XHCI_COMP_MODE_QUIRK | XHCI_BROKEN_D3COLD))
+ if (xhci->quirks & XHCI_COMP_MODE_QUIRK)
pci_d3cold_disable(pdev);
+#ifdef CONFIG_SUSPEND
+ /* d3cold is broken, but only when s2idle is used */
+ if (pm_suspend_target_state == PM_SUSPEND_TO_IDLE &&
+ xhci->quirks & (XHCI_BROKEN_D3COLD_S2I))
+ pci_d3cold_disable(pdev);
+#endif
+
if (xhci->quirks & XHCI_PME_STUCK_QUIRK)
xhci_pme_quirk(hcd);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 08d721921b7b..6b690ec91ff3 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1901,7 +1901,7 @@ struct xhci_hcd {
#define XHCI_DISABLE_SPARSE BIT_ULL(38)
#define XHCI_SG_TRB_CACHE_SIZE_QUIRK BIT_ULL(39)
#define XHCI_NO_SOFT_RETRY BIT_ULL(40)
-#define XHCI_BROKEN_D3COLD BIT_ULL(41)
+#define XHCI_BROKEN_D3COLD_S2I BIT_ULL(41)
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] xhci: Fix incorrect tracking of free space on transfer rings
2023-05-15 13:40 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
2023-05-15 13:40 ` [PATCH 1/2] xhci-pci: Only run d3cold avoidance quirk for s2idle Mathias Nyman
@ 2023-05-15 13:40 ` Mathias Nyman
1 sibling, 0 replies; 11+ messages in thread
From: Mathias Nyman @ 2023-05-15 13:40 UTC (permalink / raw)
To: gregkh; +Cc: linux-usb, Mathias Nyman, stable, Miller Hunter
This incorrect tracking caused unnecessary ring expansion in some
usecases which over days of use consume a lot of memory.
xhci driver tries to keep track of free transfer blocks (TRBs) on the
ring buffer, but failed to add back some cancelled transfers that were
turned into no-op operations instead of just moving past them.
This can happen if there are several queued pending transfers which
then are cancelled in reverse order.
Solve this by counting the numer of steps we move the dequeue pointer
once we complete a transfer, and add it to the number of free trbs
instead of just adding the trb number of the current transfer.
This way we ensure we count the no-op trbs on the way as well.
Fixes: 55f6153d8cc8 ("xhci: remove extra loop in interrupt context")
Cc: stable@vger.kernel.org
Reported-by: Miller Hunter <MillerH@hearthnhome.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217242
Tested-by: Miller Hunter <MillerH@hearthnhome.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci-ring.c | 29 ++++++++++++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 1ad12d5a4857..2bc82b3a2f98 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -276,6 +276,26 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring,
trace_xhci_inc_enq(ring);
}
+static int xhci_num_trbs_to(struct xhci_segment *start_seg, union xhci_trb *start,
+ struct xhci_segment *end_seg, union xhci_trb *end,
+ unsigned int num_segs)
+{
+ union xhci_trb *last_on_seg;
+ int num = 0;
+ int i = 0;
+
+ do {
+ if (start_seg == end_seg && end >= start)
+ return num + (end - start);
+ last_on_seg = &start_seg->trbs[TRBS_PER_SEGMENT - 1];
+ num += last_on_seg - start;
+ start_seg = start_seg->next;
+ start = start_seg->trbs;
+ } while (i++ <= num_segs);
+
+ return -EINVAL;
+}
+
/*
* Check to see if there's room to enqueue num_trbs on the ring and make sure
* enqueue pointer will not advance into dequeue segment. See rules above.
@@ -2140,6 +2160,7 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
u32 trb_comp_code)
{
struct xhci_ep_ctx *ep_ctx;
+ int trbs_freed;
ep_ctx = xhci_get_ep_ctx(xhci, ep->vdev->out_ctx, ep->ep_index);
@@ -2209,9 +2230,15 @@ static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
}
/* Update ring dequeue pointer */
+ trbs_freed = xhci_num_trbs_to(ep_ring->deq_seg, ep_ring->dequeue,
+ td->last_trb_seg, td->last_trb,
+ ep_ring->num_segs);
+ if (trbs_freed < 0)
+ xhci_dbg(xhci, "Failed to count freed trbs at TD finish\n");
+ else
+ ep_ring->num_trbs_free += trbs_freed;
ep_ring->dequeue = td->last_trb;
ep_ring->deq_seg = td->last_trb_seg;
- ep_ring->num_trbs_free += td->num_trbs - 1;
inc_deq(xhci, ep_ring);
return xhci_td_cleanup(xhci, td, ep_ring, td->status);
--
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
@ 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-12-10 14:17 Mathias Nyman
0 siblings, 0 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 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 --
2023-05-15 13:40 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
2023-05-15 13:40 ` [PATCH 1/2] xhci-pci: Only run d3cold avoidance quirk for s2idle Mathias Nyman
2023-05-15 13:40 ` [PATCH 2/2] xhci: Fix incorrect tracking of free space on transfer rings 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
2022-02-15 12:33 Mathias Nyman
2021-12-10 14:17 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).