Skip to contentSkip to conversation

usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

PATCH Superseded Alberto Mattea 2 participants 5 messages Feb 17, 2020

Subsystems (2)
USB USB xHCI driver
lore
Share & tools
lore

Alberto Mattea

author
#0 lore raw

PATCH 1/1 usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

Fixes suspend/resume

Signed-off-by Alberto Mattea <[email protected]>
---
 drivers/usb/host/xhci-pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/usb/host/xhci-pci.c +2 -1
index 4917c5b033fa..1533310b3d6b 100644
@@ -135,7 +135,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 		xhci->quirks |= XHCI_AMD_PLL_FIX;
 
 	if (pdev->vendor == PCI_VENDOR_ID_AMD &&
-		(pdev->device == 0x15e0 ||
+		(pdev->device == 0x145c ||
+		 pdev->device == 0x15e0 ||
 		 pdev->device == 0x15e1 ||
 		 pdev->device == 0x43bb))
 		xhci->quirks |= XHCI_SUSPEND_DELAY;
Signature · 1 line
2.17.1
maintainer
#1 lore raw
Quoted 1 line · Alberto Mattea

Fixes suspend/resume

We are going to need a lot more information here, sorry. Please be explicit as to what you are doing and why.

thanks,

greg k-h

author
#2 lore raw

In data lunedì 17 febbraio 2020 16:45:38 CET, hai scritto:

Quoted 10 lines · Alberto Mattea
Quoted 1 line

Fixes suspend/resume

We are going to need a lot more information here, sorry. Please be explicit as to what you are doing and why.

thanks,

greg k-h

Sure, what about
"This controller timeouts during suspend (S3) with

[  240.521724] xhci_hcd 0000:30:00.3: WARN: xHC save state timeout
[  240.521729] xhci_hcd 0000:30:00.3: ERROR mismatched command completion event

thus preventing the system from entering S3. Moreover it remains in an undefined state where some connected devices stop working until a reboot.
Apply the XHCI_SUSPEND_DELAY quirk to make it suspend properly."

Thanks,

Alberto

maintainer
#3 lore raw
Quoted 12 lines · Alberto Mattea

In data lunedì 17 febbraio 2020 16:45:38 CET, hai scritto:

Quoted 10 lines · Alberto Mattea
Quoted 1 line

Fixes suspend/resume

We are going to need a lot more information here, sorry. Please be explicit as to what you are doing and why.

thanks,

greg k-h

Quoted 7 lines

Sure, what about
"This controller timeouts during suspend (S3) with

[  240.521724] xhci_hcd 0000:30:00.3: WARN: xHC save state timeout
[  240.521729] xhci_hcd 0000:30:00.3: ERROR mismatched command completion event

thus preventing the system from entering S3. Moreover it remains in an undefined state where some connected devices stop working until a reboot.
Apply the XHCI_SUSPEND_DELAY quirk to make it suspend properly."

I sure beats the original 3 words you wrote :)

author
#4 lore raw

In data lunedì 17 febbraio 2020 17:30:18 CET, Greg KH ha scritto:

Quoted 21 lines · Alberto Mattea
Quoted 12 lines

In data lunedì 17 febbraio 2020 16:45:38 CET, hai scritto:

Quoted 10 lines · Alberto Mattea
Quoted 1 line

Fixes suspend/resume

We are going to need a lot more information here, sorry. Please be explicit as to what you are doing and why.

thanks,

greg k-h

Quoted 7 lines

Sure, what about
"This controller timeouts during suspend (S3) with

[  240.521724] xhci_hcd 0000:30:00.3: WARN: xHC save state timeout
[  240.521729] xhci_hcd 0000:30:00.3: ERROR mismatched command completion event

thus preventing the system from entering S3. Moreover it remains in an undefined state where some connected devices stop working until a reboot.
Apply the XHCI_SUSPEND_DELAY quirk to make it suspend properly."

Quoted 3 lines

I sure beats the original 3 words you wrote :)

Great, I'll fix the commit and resend the patch :)