diff options
Diffstat (limited to 'sys-kernel_arch-sources-g14_files-0011-USB-pci-quirks-disable-D3cold-on-s2idle-Renoire.patch')
-rw-r--r-- | sys-kernel_arch-sources-g14_files-0011-USB-pci-quirks-disable-D3cold-on-s2idle-Renoire.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/sys-kernel_arch-sources-g14_files-0011-USB-pci-quirks-disable-D3cold-on-s2idle-Renoire.patch b/sys-kernel_arch-sources-g14_files-0011-USB-pci-quirks-disable-D3cold-on-s2idle-Renoire.patch deleted file mode 100644 index 5646b10014a8..000000000000 --- a/sys-kernel_arch-sources-g14_files-0011-USB-pci-quirks-disable-D3cold-on-s2idle-Renoire.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 0274e6962acf3a732390e9dc4bbccda8a467347c Mon Sep 17 00:00:00 2001 -From: Mario Limonciello <mario.limonciello@amd.com> -Date: Wed, 5 May 2021 01:16:06 -0500 -Subject: [PATCH] usb: pci-quirks: disable D3cold on xhci suspend for s2idle on - AMD Renoire - -The XHCI controller is required to enter D3hot rather than D3cold for AMD -s2idle on this hardware generation. - -Otherwise, the 'Controller Not Ready' (CNR) bit is not being cleared by host -in resume and eventually this results in xhci resume failures during the -s2idle wakeup. - -Suggested-by: Prike Liang <Prike.Liang@amd.com> -Link: https://lore.kernel.org/linux-usb/1612527609-7053-1-git-send-email-Prike.Liang@amd.com/ -Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> ---- - drivers/usb/host/xhci-pci.c | 7 ++++++- - drivers/usb/host/xhci.h | 1 + - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 7bc18cf8042c..5142d74085b5 100644 ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -59,6 +59,7 @@ - #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI 0x1138 - #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI 0x461e - -+#define PCI_DEVICE_ID_AMD_RENOIRE_XHCI 0x1639 - #define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9 - #define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba - #define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb -@@ -182,6 +183,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) - (pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_1))) - xhci->quirks |= XHCI_U2_DISABLE_WAKE; - -+ if (pdev->vendor == PCI_VENDOR_ID_AMD && -+ pdev->device == PCI_DEVICE_ID_AMD_RENOIRE_XHCI) -+ xhci->quirks |= XHCI_BROKEN_D3COLD; -+ - if (pdev->vendor == PCI_VENDOR_ID_INTEL) { - xhci->quirks |= XHCI_LPM_SUPPORT; - xhci->quirks |= XHCI_INTEL_HOST; -@@ -539,7 +544,7 @@ 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) -+ if (xhci->quirks & (XHCI_COMP_MODE_QUIRK | XHCI_BROKEN_D3COLD)) - pci_d3cold_disable(pdev); - - if (xhci->quirks & XHCI_PME_STUCK_QUIRK) -diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index ca822ad3b65b..4e171099d2cb 100644 ---- a/drivers/usb/host/xhci.h -+++ b/drivers/usb/host/xhci.h -@@ -1892,6 +1892,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) - - unsigned int num_active_eps; - unsigned int limit_active_eps; --- -GitLab - |