Commit 6a70cbe2 authored Nov 30, 2022 by Reka Norman Committed by sanglipeng Jul 31, 2023

xhci: Apply XHCI_RESET_TO_DEFAULT quirk to ADL-N

stable inclusion
from stable-v5.10.161
commit 9ff7aff40ef5d5d6b271bf94fb0903c5a550f557
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7P7OH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=9ff7aff40ef5d5d6b271bf94fb0903c5a550f557



--------------------------------

commit fed70b61 upstream.

ADL-N systems have the same issue as ADL-P, where a large boot firmware
delay is seen if USB ports are left in U3 at shutdown. So apply the
XHCI_RESET_TO_DEFAULT quirk to ADL-N as well.

This patch depends on commit 34cd2db4 ("xhci: Add quirk to reset
host back to default state at shutdown").

The issue it fixes is a ~20s boot time delay when booting from S5. It
affects ADL-N devices, and ADL-N support was added starting from v5.16.

Cc: stable@vger.kernel.org
Signed-off-by: Reka Norman <rekanorman@chromium.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20221130091944.2171610-3-mathias.nyman@linux.intel.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent 6d943580

drivers/usb/host/xhci-pci.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@
		#define PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI 0x9a13
		#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI 0x1138
		#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed
		#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI 0x54ed

		#define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9
		#define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba
		@@ -243,7 +244,8 @@ static void xhci_pci_quirks(struct device dev, struct xhci_hcd xhci)
		xhci->quirks \|= XHCI_MISSING_CAS;

		if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
		pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI)
		(pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI \|\|
		pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI))
		xhci->quirks \|= XHCI_RESET_TO_DEFAULT;

		if (pdev->vendor == PCI_VENDOR_ID_INTEL &&