Skip to content

Commit b69dfca

Browse files
matnymangregkh
authored andcommitted
xhci: fix stale flag preventig URBs after link state error is cleared
A usb device caught behind a link in ss.Inactive error state needs to be reset to recover. A VDEV_PORT_ERROR flag is used to track this state, preventing new transfers from being queued until error is cleared. This flag may be left uncleared if link goes to error state between two resets, and print the following message: "xhci_hcd 0000:00:14.0: Can't queue urb, port error, link inactive" Fix setting and clearing the flag. The flag is cleared after hub driver has successfully reset the device when hcd->reset_device is called. xhci-hcd issues an internal "reset device" command in this callback, and clear all flags once the command completes successfully. This command may complete with a context state error if slot was recently reset and is already in the defauilt state. This is treated as a success but flag was left uncleared. The link state field is also unreliable if port is currently in reset, so don't set the flag in active reset cases. Also clear the flag immediately when link is no longer in ss.Inactive state and port event handler detects a completed reset. This issue was discovered while debugging kernel bugzilla issue 220491. It is likely one small part of the problem, causing some of the failures, but root cause remains unknown Link: https://bugzilla.kernel.org/show_bug.cgi?id=220491 Fixes: b8c3b71 ("usb: xhci: Don't try to recover an endpoint if port is in error state.") Cc: stable@vger.kernel.org Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://patch.msgid.link/20251107162819.1362579-2-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ad8415a commit b69dfca

2 files changed

Lines changed: 11 additions & 5 deletions

File tree

drivers/usb/host/xhci-ring.c

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,6 +1985,7 @@ static void xhci_cavium_reset_phy_quirk(struct xhci_hcd *xhci)
19851985

19861986
static void handle_port_status(struct xhci_hcd *xhci, union xhci_trb *event)
19871987
{
1988+
struct xhci_virt_device *vdev = NULL;
19881989
struct usb_hcd *hcd;
19891990
u32 port_id;
19901991
u32 portsc, cmd_reg;
@@ -2016,6 +2017,9 @@ static void handle_port_status(struct xhci_hcd *xhci, union xhci_trb *event)
20162017
goto cleanup;
20172018
}
20182019

2020+
if (port->slot_id)
2021+
vdev = xhci->devs[port->slot_id];
2022+
20192023
/* We might get interrupts after shared_hcd is removed */
20202024
if (port->rhub == &xhci->usb3_rhub && xhci->shared_hcd == NULL) {
20212025
xhci_dbg(xhci, "ignore port event for removed USB3 hcd\n");
@@ -2038,10 +2042,11 @@ static void handle_port_status(struct xhci_hcd *xhci, union xhci_trb *event)
20382042
usb_hcd_resume_root_hub(hcd);
20392043
}
20402044

2041-
if (hcd->speed >= HCD_USB3 &&
2042-
(portsc & PORT_PLS_MASK) == XDEV_INACTIVE) {
2043-
if (port->slot_id && xhci->devs[port->slot_id])
2044-
xhci->devs[port->slot_id]->flags |= VDEV_PORT_ERROR;
2045+
if (vdev && (portsc & PORT_PLS_MASK) == XDEV_INACTIVE) {
2046+
if (!(portsc & PORT_RESET))
2047+
vdev->flags |= VDEV_PORT_ERROR;
2048+
} else if (vdev && portsc & PORT_RC) {
2049+
vdev->flags &= ~VDEV_PORT_ERROR;
20452050
}
20462051

20472052
if ((portsc & PORT_PLC) && (portsc & PORT_PLS_MASK) == XDEV_RESUME) {
@@ -2099,7 +2104,7 @@ static void handle_port_status(struct xhci_hcd *xhci, union xhci_trb *event)
20992104
* so the roothub behavior is consistent with external
21002105
* USB 3.0 hub behavior.
21012106
*/
2102-
if (port->slot_id && xhci->devs[port->slot_id])
2107+
if (vdev)
21032108
xhci_ring_device(xhci, port->slot_id);
21042109
if (bus_state->port_remote_wakeup & (1 << hcd_portnum)) {
21052110
xhci_test_and_clear_bit(xhci, port, PORT_PLC);

drivers/usb/host/xhci.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4007,6 +4007,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
40074007
xhci_get_slot_state(xhci, virt_dev->out_ctx));
40084008
xhci_dbg(xhci, "Not freeing device rings.\n");
40094009
/* Don't treat this as an error. May change my mind later. */
4010+
virt_dev->flags = 0;
40104011
ret = 0;
40114012
goto command_cleanup;
40124013
case COMP_SUCCESS:

0 commit comments

Comments
 (0)