From d8d9f1710a8d2b9a8af98298e660bb07cdd0e4ba Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 3 Dec 2024 09:20:58 +0100 Subject: [PATCH] drop xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch from a bunch of queues --- ...rform-soft-retry-for-etron-xhci-host.patch | 46 ------------------- ...rform-soft-retry-for-etron-xhci-host.patch | 46 ------------------- ...rform-soft-retry-for-etron-xhci-host.patch | 46 ------------------- ...rform-soft-retry-for-etron-xhci-host.patch | 46 ------------------- ...rform-soft-retry-for-etron-xhci-host.patch | 46 ------------------- ...rform-soft-retry-for-etron-xhci-host.patch | 46 ------------------- 6 files changed, 276 deletions(-) delete mode 100644 queue-4.19/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch delete mode 100644 queue-5.10/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch delete mode 100644 queue-5.15/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch delete mode 100644 queue-5.4/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch delete mode 100644 queue-6.1/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch delete mode 100644 queue-6.6/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch diff --git a/queue-4.19/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch b/queue-4.19/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch deleted file mode 100644 index 82a0c2c3f95..00000000000 --- a/queue-4.19/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e735e957f2b9cfe4be486e0304732ec36928591f Mon Sep 17 00:00:00 2001 -From: Kuangyi Chiang -Date: Wed, 6 Nov 2024 12:14:46 +0200 -Subject: xhci: Don't perform Soft Retry for Etron xHCI host - -From: Kuangyi Chiang - -commit e735e957f2b9cfe4be486e0304732ec36928591f upstream. - -Since commit f8f80be501aa ("xhci: Use soft retry to recover faster from -transaction errors"), unplugging USB device while enumeration results in -errors like this: - -[ 364.855321] xhci_hcd 0000:0b:00.0: ERROR Transfer event for disabled endpoint slot 5 ep 2 -[ 364.864622] xhci_hcd 0000:0b:00.0: @0000002167656d70 67f03000 00000021 0c000000 05038001 -[ 374.934793] xhci_hcd 0000:0b:00.0: Abort failed to stop command ring: -110 -[ 374.958793] xhci_hcd 0000:0b:00.0: xHCI host controller not responding, assume dead -[ 374.967590] xhci_hcd 0000:0b:00.0: HC died; cleaning up -[ 374.973984] xhci_hcd 0000:0b:00.0: Timeout while waiting for configure endpoint command - -Seems that Etorn xHCI host can not perform Soft Retry correctly, apply -XHCI_NO_SOFT_RETRY quirk to disable Soft Retry and then issue is gone. - -This patch depends on commit a4a251f8c235 ("usb: xhci: do not perform -Soft Retry for some xHCI hosts"). - -Fixes: f8f80be501aa ("xhci: Use soft retry to recover faster from transaction errors") -Cc: stable@vger.kernel.org -Signed-off-by: Kuangyi Chiang -Signed-off-by: Mathias Nyman -Link: https://lore.kernel.org/r/20241106101459.775897-21-mathias.nyman@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -229,6 +229,7 @@ static void xhci_pci_quirks(struct devic - pdev->device == PCI_DEVICE_ID_EJ188) { - xhci->quirks |= XHCI_RESET_ON_RESUME; - xhci->quirks |= XHCI_BROKEN_STREAMS; -+ xhci->quirks |= XHCI_NO_SOFT_RETRY; - } - - if (pdev->vendor == PCI_VENDOR_ID_RENESAS && diff --git a/queue-5.10/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch b/queue-5.10/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch deleted file mode 100644 index 7ae359d933e..00000000000 --- a/queue-5.10/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e735e957f2b9cfe4be486e0304732ec36928591f Mon Sep 17 00:00:00 2001 -From: Kuangyi Chiang -Date: Wed, 6 Nov 2024 12:14:46 +0200 -Subject: xhci: Don't perform Soft Retry for Etron xHCI host - -From: Kuangyi Chiang - -commit e735e957f2b9cfe4be486e0304732ec36928591f upstream. - -Since commit f8f80be501aa ("xhci: Use soft retry to recover faster from -transaction errors"), unplugging USB device while enumeration results in -errors like this: - -[ 364.855321] xhci_hcd 0000:0b:00.0: ERROR Transfer event for disabled endpoint slot 5 ep 2 -[ 364.864622] xhci_hcd 0000:0b:00.0: @0000002167656d70 67f03000 00000021 0c000000 05038001 -[ 374.934793] xhci_hcd 0000:0b:00.0: Abort failed to stop command ring: -110 -[ 374.958793] xhci_hcd 0000:0b:00.0: xHCI host controller not responding, assume dead -[ 374.967590] xhci_hcd 0000:0b:00.0: HC died; cleaning up -[ 374.973984] xhci_hcd 0000:0b:00.0: Timeout while waiting for configure endpoint command - -Seems that Etorn xHCI host can not perform Soft Retry correctly, apply -XHCI_NO_SOFT_RETRY quirk to disable Soft Retry and then issue is gone. - -This patch depends on commit a4a251f8c235 ("usb: xhci: do not perform -Soft Retry for some xHCI hosts"). - -Fixes: f8f80be501aa ("xhci: Use soft retry to recover faster from transaction errors") -Cc: stable@vger.kernel.org -Signed-off-by: Kuangyi Chiang -Signed-off-by: Mathias Nyman -Link: https://lore.kernel.org/r/20241106101459.775897-21-mathias.nyman@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -276,6 +276,7 @@ static void xhci_pci_quirks(struct devic - pdev->device == PCI_DEVICE_ID_EJ188) { - xhci->quirks |= XHCI_RESET_ON_RESUME; - xhci->quirks |= XHCI_BROKEN_STREAMS; -+ xhci->quirks |= XHCI_NO_SOFT_RETRY; - } - - if (pdev->vendor == PCI_VENDOR_ID_RENESAS && diff --git a/queue-5.15/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch b/queue-5.15/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch deleted file mode 100644 index ac1580df7fa..00000000000 --- a/queue-5.15/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e735e957f2b9cfe4be486e0304732ec36928591f Mon Sep 17 00:00:00 2001 -From: Kuangyi Chiang -Date: Wed, 6 Nov 2024 12:14:46 +0200 -Subject: xhci: Don't perform Soft Retry for Etron xHCI host - -From: Kuangyi Chiang - -commit e735e957f2b9cfe4be486e0304732ec36928591f upstream. - -Since commit f8f80be501aa ("xhci: Use soft retry to recover faster from -transaction errors"), unplugging USB device while enumeration results in -errors like this: - -[ 364.855321] xhci_hcd 0000:0b:00.0: ERROR Transfer event for disabled endpoint slot 5 ep 2 -[ 364.864622] xhci_hcd 0000:0b:00.0: @0000002167656d70 67f03000 00000021 0c000000 05038001 -[ 374.934793] xhci_hcd 0000:0b:00.0: Abort failed to stop command ring: -110 -[ 374.958793] xhci_hcd 0000:0b:00.0: xHCI host controller not responding, assume dead -[ 374.967590] xhci_hcd 0000:0b:00.0: HC died; cleaning up -[ 374.973984] xhci_hcd 0000:0b:00.0: Timeout while waiting for configure endpoint command - -Seems that Etorn xHCI host can not perform Soft Retry correctly, apply -XHCI_NO_SOFT_RETRY quirk to disable Soft Retry and then issue is gone. - -This patch depends on commit a4a251f8c235 ("usb: xhci: do not perform -Soft Retry for some xHCI hosts"). - -Fixes: f8f80be501aa ("xhci: Use soft retry to recover faster from transaction errors") -Cc: stable@vger.kernel.org -Signed-off-by: Kuangyi Chiang -Signed-off-by: Mathias Nyman -Link: https://lore.kernel.org/r/20241106101459.775897-21-mathias.nyman@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -285,6 +285,7 @@ static void xhci_pci_quirks(struct devic - pdev->device == PCI_DEVICE_ID_EJ188) { - xhci->quirks |= XHCI_RESET_ON_RESUME; - xhci->quirks |= XHCI_BROKEN_STREAMS; -+ xhci->quirks |= XHCI_NO_SOFT_RETRY; - } - - if (pdev->vendor == PCI_VENDOR_ID_RENESAS && diff --git a/queue-5.4/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch b/queue-5.4/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch deleted file mode 100644 index d52055e524d..00000000000 --- a/queue-5.4/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e735e957f2b9cfe4be486e0304732ec36928591f Mon Sep 17 00:00:00 2001 -From: Kuangyi Chiang -Date: Wed, 6 Nov 2024 12:14:46 +0200 -Subject: xhci: Don't perform Soft Retry for Etron xHCI host - -From: Kuangyi Chiang - -commit e735e957f2b9cfe4be486e0304732ec36928591f upstream. - -Since commit f8f80be501aa ("xhci: Use soft retry to recover faster from -transaction errors"), unplugging USB device while enumeration results in -errors like this: - -[ 364.855321] xhci_hcd 0000:0b:00.0: ERROR Transfer event for disabled endpoint slot 5 ep 2 -[ 364.864622] xhci_hcd 0000:0b:00.0: @0000002167656d70 67f03000 00000021 0c000000 05038001 -[ 374.934793] xhci_hcd 0000:0b:00.0: Abort failed to stop command ring: -110 -[ 374.958793] xhci_hcd 0000:0b:00.0: xHCI host controller not responding, assume dead -[ 374.967590] xhci_hcd 0000:0b:00.0: HC died; cleaning up -[ 374.973984] xhci_hcd 0000:0b:00.0: Timeout while waiting for configure endpoint command - -Seems that Etorn xHCI host can not perform Soft Retry correctly, apply -XHCI_NO_SOFT_RETRY quirk to disable Soft Retry and then issue is gone. - -This patch depends on commit a4a251f8c235 ("usb: xhci: do not perform -Soft Retry for some xHCI hosts"). - -Fixes: f8f80be501aa ("xhci: Use soft retry to recover faster from transaction errors") -Cc: stable@vger.kernel.org -Signed-off-by: Kuangyi Chiang -Signed-off-by: Mathias Nyman -Link: https://lore.kernel.org/r/20241106101459.775897-21-mathias.nyman@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -262,6 +262,7 @@ static void xhci_pci_quirks(struct devic - pdev->device == PCI_DEVICE_ID_EJ188) { - xhci->quirks |= XHCI_RESET_ON_RESUME; - xhci->quirks |= XHCI_BROKEN_STREAMS; -+ xhci->quirks |= XHCI_NO_SOFT_RETRY; - } - - if (pdev->vendor == PCI_VENDOR_ID_RENESAS && diff --git a/queue-6.1/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch b/queue-6.1/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch deleted file mode 100644 index 9c37d35d9eb..00000000000 --- a/queue-6.1/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e735e957f2b9cfe4be486e0304732ec36928591f Mon Sep 17 00:00:00 2001 -From: Kuangyi Chiang -Date: Wed, 6 Nov 2024 12:14:46 +0200 -Subject: xhci: Don't perform Soft Retry for Etron xHCI host - -From: Kuangyi Chiang - -commit e735e957f2b9cfe4be486e0304732ec36928591f upstream. - -Since commit f8f80be501aa ("xhci: Use soft retry to recover faster from -transaction errors"), unplugging USB device while enumeration results in -errors like this: - -[ 364.855321] xhci_hcd 0000:0b:00.0: ERROR Transfer event for disabled endpoint slot 5 ep 2 -[ 364.864622] xhci_hcd 0000:0b:00.0: @0000002167656d70 67f03000 00000021 0c000000 05038001 -[ 374.934793] xhci_hcd 0000:0b:00.0: Abort failed to stop command ring: -110 -[ 374.958793] xhci_hcd 0000:0b:00.0: xHCI host controller not responding, assume dead -[ 374.967590] xhci_hcd 0000:0b:00.0: HC died; cleaning up -[ 374.973984] xhci_hcd 0000:0b:00.0: Timeout while waiting for configure endpoint command - -Seems that Etorn xHCI host can not perform Soft Retry correctly, apply -XHCI_NO_SOFT_RETRY quirk to disable Soft Retry and then issue is gone. - -This patch depends on commit a4a251f8c235 ("usb: xhci: do not perform -Soft Retry for some xHCI hosts"). - -Fixes: f8f80be501aa ("xhci: Use soft retry to recover faster from transaction errors") -Cc: stable@vger.kernel.org -Signed-off-by: Kuangyi Chiang -Signed-off-by: Mathias Nyman -Link: https://lore.kernel.org/r/20241106101459.775897-21-mathias.nyman@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -284,6 +284,7 @@ static void xhci_pci_quirks(struct devic - pdev->device == PCI_DEVICE_ID_EJ188) { - xhci->quirks |= XHCI_RESET_ON_RESUME; - xhci->quirks |= XHCI_BROKEN_STREAMS; -+ xhci->quirks |= XHCI_NO_SOFT_RETRY; - } - - if (pdev->vendor == PCI_VENDOR_ID_RENESAS && diff --git a/queue-6.6/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch b/queue-6.6/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch deleted file mode 100644 index bf8d44defde..00000000000 --- a/queue-6.6/xhci-don-t-perform-soft-retry-for-etron-xhci-host.patch +++ /dev/null @@ -1,46 +0,0 @@ -From e735e957f2b9cfe4be486e0304732ec36928591f Mon Sep 17 00:00:00 2001 -From: Kuangyi Chiang -Date: Wed, 6 Nov 2024 12:14:46 +0200 -Subject: xhci: Don't perform Soft Retry for Etron xHCI host - -From: Kuangyi Chiang - -commit e735e957f2b9cfe4be486e0304732ec36928591f upstream. - -Since commit f8f80be501aa ("xhci: Use soft retry to recover faster from -transaction errors"), unplugging USB device while enumeration results in -errors like this: - -[ 364.855321] xhci_hcd 0000:0b:00.0: ERROR Transfer event for disabled endpoint slot 5 ep 2 -[ 364.864622] xhci_hcd 0000:0b:00.0: @0000002167656d70 67f03000 00000021 0c000000 05038001 -[ 374.934793] xhci_hcd 0000:0b:00.0: Abort failed to stop command ring: -110 -[ 374.958793] xhci_hcd 0000:0b:00.0: xHCI host controller not responding, assume dead -[ 374.967590] xhci_hcd 0000:0b:00.0: HC died; cleaning up -[ 374.973984] xhci_hcd 0000:0b:00.0: Timeout while waiting for configure endpoint command - -Seems that Etorn xHCI host can not perform Soft Retry correctly, apply -XHCI_NO_SOFT_RETRY quirk to disable Soft Retry and then issue is gone. - -This patch depends on commit a4a251f8c235 ("usb: xhci: do not perform -Soft Retry for some xHCI hosts"). - -Fixes: f8f80be501aa ("xhci: Use soft retry to recover faster from transaction errors") -Cc: stable@vger.kernel.org -Signed-off-by: Kuangyi Chiang -Signed-off-by: Mathias Nyman -Link: https://lore.kernel.org/r/20241106101459.775897-21-mathias.nyman@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -470,6 +470,7 @@ static void xhci_pci_quirks(struct devic - pdev->device == PCI_DEVICE_ID_EJ188) { - xhci->quirks |= XHCI_RESET_ON_RESUME; - xhci->quirks |= XHCI_BROKEN_STREAMS; -+ xhci->quirks |= XHCI_NO_SOFT_RETRY; - } - - if (pdev->vendor == PCI_VENDOR_ID_RENESAS && -- 2.47.3