* [PATCH 0/2] xhci fixes for usb-linus
@ 2024-04-04 12:11 Mathias Nyman
2024-04-04 12:11 ` [PATCH 1/2] usb: xhci: correct return value in case of STS_HCE Mathias Nyman
2024-04-04 12:11 ` [PATCH 2/2] xhci: Fix root hub port null pointer dereference in xhci tracepoints Mathias Nyman
0 siblings, 2 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 1/2] usb: xhci: correct return value in case of STS_HCE
2024-04-04 12:11 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
@ 2024-04-04 12:11 ` Mathias Nyman
2024-04-04 12:11 ` [PATCH 2/2] xhci: Fix root hub port null pointer dereference in xhci tracepoints Mathias Nyman
1 sibling, 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, Oliver Neukum, stable,
Mathias Nyman
From: Oliver Neukum <oneukum@suse.com>
If we get STS_HCE we give up on the interrupt, but for the purpose
of IRQ handling that still counts as ours. We may return IRQ_NONE
only if we are positive that it wasn't ours. Hence correct the default.
Fixes: 2a25e66d676d ("xhci: print warning when HCE was set")
Cc: stable@vger.kernel.org # v6.2+
Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci-ring.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 52278afea94b..575f0fd9c9f1 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -3133,7 +3133,7 @@ static int xhci_handle_events(struct xhci_hcd *xhci, struct xhci_interrupter *ir
irqreturn_t xhci_irq(struct usb_hcd *hcd)
{
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
- irqreturn_t ret = IRQ_NONE;
+ irqreturn_t ret = IRQ_HANDLED;
u32 status;
spin_lock(&xhci->lock);
@@ -3141,12 +3141,13 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
status = readl(&xhci->op_regs->status);
if (status == ~(u32)0) {
xhci_hc_died(xhci);
- ret = IRQ_HANDLED;
goto out;
}
- if (!(status & STS_EINT))
+ if (!(status & STS_EINT)) {
+ ret = IRQ_NONE;
goto out;
+ }
if (status & STS_HCE) {
xhci_warn(xhci, "WARNING: Host Controller Error\n");
@@ -3156,7 +3157,6 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
if (status & STS_FATAL) {
xhci_warn(xhci, "WARNING: Host System Error\n");
xhci_halt(xhci);
- ret = IRQ_HANDLED;
goto out;
}
@@ -3167,7 +3167,6 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
*/
status |= STS_EINT;
writel(status, &xhci->op_regs->status);
- ret = IRQ_HANDLED;
/* This is the handler of the primary interrupter */
xhci_handle_events(xhci, xhci->interrupters[0]);
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] xhci: Fix root hub port null pointer dereference in xhci tracepoints
2024-04-04 12:11 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
2024-04-04 12:11 ` [PATCH 1/2] usb: xhci: correct return value in case of STS_HCE Mathias Nyman
@ 2024-04-04 12:11 ` Mathias Nyman
1 sibling, 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
The pointer from a xhci usb virt device to its root hub port
(vdev->rhub_port) is set later when device is addressed, not while
vdev is allocated.
Tracepoints dereferenced this rhub_port pointer when freeing the virt
device, which causes null pointer dereference if tracing is enabled
and device is freed before addressed.
This can happen if tracing is enabled and xhci driver is unloaded before
a device is fully enumerated, or initial enumeration fails and device
is reset and freed before retry.
Don't dereference the rhub_port or show port numbers when tracing
xhci_free_virt_device(). This info is not very useful anyway.
Print the more useful slot id instead
Fixes: 06790c19086f ("xhci: replace real & fake port with pointer to root hub port")
Reported-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Closes: https://lore.kernel.org/linux-usb/20240402005007.klv2ij727fkz7rpd@synopsys.com/
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci-trace.h | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h
index 1740000d54c2..5762564b9d73 100644
--- a/drivers/usb/host/xhci-trace.h
+++ b/drivers/usb/host/xhci-trace.h
@@ -172,8 +172,7 @@ DECLARE_EVENT_CLASS(xhci_log_free_virt_dev,
__field(void *, vdev)
__field(unsigned long long, out_ctx)
__field(unsigned long long, in_ctx)
- __field(int, hcd_portnum)
- __field(int, hw_portnum)
+ __field(int, slot_id)
__field(u16, current_mel)
),
@@ -181,13 +180,12 @@ DECLARE_EVENT_CLASS(xhci_log_free_virt_dev,
__entry->vdev = vdev;
__entry->in_ctx = (unsigned long long) vdev->in_ctx->dma;
__entry->out_ctx = (unsigned long long) vdev->out_ctx->dma;
- __entry->hcd_portnum = (int) vdev->rhub_port->hcd_portnum;
- __entry->hw_portnum = (int) vdev->rhub_port->hw_portnum;
+ __entry->slot_id = (int) vdev->slot_id;
__entry->current_mel = (u16) vdev->current_mel;
),
- TP_printk("vdev %p ctx %llx | %llx hcd_portnum %d hw_portnum %d current_mel %d",
- __entry->vdev, __entry->in_ctx, __entry->out_ctx,
- __entry->hcd_portnum, __entry->hw_portnum, __entry->current_mel
+ TP_printk("vdev %p slot %d ctx %llx | %llx current_mel %d",
+ __entry->vdev, __entry->slot_id, __entry->in_ctx,
+ __entry->out_ctx, __entry->current_mel
)
);
--
2.25.1
^ permalink raw reply related [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-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 --
2024-04-04 12:11 [PATCH 0/2] xhci fixes for usb-linus Mathias Nyman
2024-04-04 12:11 ` [PATCH 1/2] usb: xhci: correct return value in case of STS_HCE Mathias Nyman
2024-04-04 12:11 ` [PATCH 2/2] xhci: Fix root hub port null pointer dereference in xhci tracepoints Mathias Nyman
-- strict thread matches above, loose matches on Subject: below --
2023-05-15 13:40 [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 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.