PCI: add generic quirk function for increasing D3hot delay
PATCH v2 1/2 PCI: add generic quirk function for increasing D3hot delay
Separate the D3 delay increase functionality out of quirk_radeon_pm() into its own function so that it can be shared with other quirks, including the AMD Ryzen XHCI quirk that will be introduced in a followup commit.
Tweak the function name and message to indicate more clearly that the delay relates to a D3hot-to-D0 transition.
--- drivers/pci/quirks.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
v2: tweaked function name and message to emphasize D3hot state
drivers/pci/quirks.c +12 -7
@@ -1871,16 +1871,21 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x2609, quirk_intel_pcie_pm);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x260a , quirk_intel_pcie_pm);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x260b , quirk_intel_pcie_pm); +static void quirk_d3hot_delay (struct pci_dev *dev,unsigned int delay) +{ +if (dev->d3_delay >= delay) +return ; + + dev->d3_delay = delay; +pci_info (dev,"extending delay after power-on from D3hot to %d msec\n" , + dev->d3_delay); +} +static void quirk_radeon_pm (struct pci_dev *dev) {if (dev->subsystem_vendor ==PCI_VENDOR_ID_APPLE && - dev->subsystem_device ==0x00e2 ) { -if (dev->d3_delay <20 ) { - dev->d3_delay =20 ; -pci_info (dev,"extending delay after power-on from D3 to %d msec\n" , - dev->d3_delay); - } - } + dev->subsystem_device ==0x00e2 ) +quirk_d3hot_delay (dev,20 ); }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x6741 , quirk_radeon_pm);
Signature · 1 line
2.20.1
PATCH v2 2/2 PCI: increase D3 delay for AMD Ryzen5/7 XHCI controllers
On Asus UX434DA (AMD Ryzen7 3700U) and Asus X512DK (AMD Ryzen5 3500U), the XHCI controller fails to resume from runtime suspend or s2idle, and USB becomes unusable from that point.
xhci_hcd 0000:03:00.4: Refused to change power state, currently in D3 xhci_hcd 0000:03:00.4: enabling device (0000 -> 0002) xhci_hcd 0000:03:00.4: WARN: xHC restore state timeout xhci_hcd 0000:03:00.4: PCI post-resume error -110! xhci_hcd 0000:03:00.4: HC died; cleaning up
During suspend, a transition to D3cold is attempted, however the affected platforms do not seem to cut the power to the PCI device when in this state, so the device stays in D3hot.
Upon resume, the D3hot-to-D0 transition is successful only if the D3 delay is increased to 20ms. The transition failure does not appear to be detectable as a CRS condition. Add a PCI quirk to increase the delay on the affected hardware.
--- drivers/pci/quirks.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
v2: split out the creation of quirk_d3hot_delay() into its own patch
drivers/pci/quirks.c +16 -0
@@ -1889,6 +1889,22 @@ static void quirk_radeon_pm(struct pci_dev *dev) }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x6741 , quirk_radeon_pm); +/* +* Ryzen5/7 XHCI controllers fail upon resume from runtime suspend or s2idle. +* https://bugzilla.kernel.org/show_bug.cgi?id=205587 +* +* The kernel attempts to transition these devices to D3cold, but that seems +* to be ineffective on the platforms in question; the PCI device appears to +* remain on in D3hot state. The D3hot-to-D0 transition then requires an +* extended delay in order to succeed. +*/ +static void quirk_ryzen_xhci_d3hot (struct pci_dev *dev) +{ +quirk_d3hot_delay (dev,20 ); +} +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x15e0 , quirk_ryzen_xhci_d3hot); +DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AMD ,0x15e1 , quirk_ryzen_xhci_d3hot); +#ifdef CONFIG_X86_IO_APIC static int dmi_disable_ioapicreroute (const struct dmi_system_id *d) {
Signature · 1 line
2.20.1
Re: [PATCH v2 2/2] PCI: increase D3 delay for AMD Ryzen5/7 XHCI controllers
Quoted 14 lines · Daniel Drake
On Asus UX434DA (AMD Ryzen7 3700U) and Asus X512DK (AMD Ryzen5 3500U), the XHCI controller fails to resume from runtime suspend or s2idle, and USB becomes unusable from that point.
xhci_hcd0000:03:00.4: Refused to change power state, currently in D3xhci_hcd0000:03:00.4: enabling device (0000 -> 0002)xhci_hcd0000:03:00.4: WARN: xHC restore state timeoutxhci_hcd0000:03:00.4: PCI post-resume error -110!xhci_hcd0000:03:00.4: HC died; cleaning upDuring suspend, a transition to D3cold is attempted, however the affected platforms do not seem to cut the power to the PCI device when in this state, so the device stays in D3hot.
Quoted 8 lines
Upon resume, the D3hot-to-D0 transition is successful only if the D3 delay is increased to 20ms. The transition failure does not appear to be detectable as a CRS condition. Add a PCI quirk to increase the delay on the affected hardware.
Quoted 8 lines · Daniel Drake
Separate the D3 delay increase functionality out of
quirk_radeon_pm()into its own function so that it can be shared with other quirks, including the AMD Ryzen XHCI quirk that will be introduced in a followup commit.Tweak the function name and message to indicate more clearly that the delay relates to a D3hot-to-D0 transition.
Signed-off-by Daniel Drake <[email protected]>
Hi Bjorn,
Quoted 6 lines · Daniel Drake
Separate the D3 delay increase functionality out of
quirk_radeon_pm()into its own function so that it can be shared with other quirks, including the AMD Ryzen XHCI quirk that will be introduced in a followup commit.Tweak the function name and message to indicate more clearly that the delay relates to a D3hot-to-D0 transition.
Any update on these pending patches?
Thanks
Daniel
Bjorn Helgaas
AppliedQuoted 8 lines · Daniel Drake
Separate the D3 delay increase functionality out of
quirk_radeon_pm()into its own function so that it can be shared with other quirks, including the AMD Ryzen XHCI quirk that will be introduced in a followup commit.Tweak the function name and message to indicate more clearly that the delay relates to a D3hot-to-D0 transition.
Signed-off-by Daniel Drake <[email protected]>
I applied both of these to pci/misc for v5.6, thanks!
Quoted 42 lines
--- drivers/pci/quirks.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)v2: tweaked function name and message to emphasize D3hot state
drivers/pci/quirks.c +12
-7@@ -1871,16 +1871,21 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x2609, quirk_intel_pcie_pm);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x260a , quirk_intel_pcie_pm);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,0x260b , quirk_intel_pcie_pm); +static void quirk_d3hot_delay (struct pci_dev *dev,unsigned int delay) +{ +if (dev->d3_delay >= delay) +return ; + + dev->d3_delay = delay; +pci_info (dev,"extending delay after power-on from D3hot to %d msec\n" , + dev->d3_delay); +} +static void quirk_radeon_pm (struct pci_dev *dev) {if (dev->subsystem_vendor ==PCI_VENDOR_ID_APPLE && - dev->subsystem_device ==0x00e2 ) { -if (dev->d3_delay <20 ) { - dev->d3_delay =20 ; -pci_info (dev,"extending delay after power-on from D3 to %d msec\n" , - dev->d3_delay); - } - } + dev->subsystem_device ==0x00e2 ) +quirk_d3hot_delay (dev,20 ); }DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_ATI ,0x6741 , quirk_radeon_pm);Signature · 1 line
2.20.1