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

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

[Alberto Mattea]

Fixes suspend/resume

Signed-off-by: Alberto Mattea <alberto@mattea.info>
---
 drivers/usb/host/xhci-pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 4917c5b033fa..1533310b3d6b 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -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;
-- 
2.17.1

Re: [PATCH] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

[Greg KH]

On Mon, Feb 17, 2020 at 04:21:50PM +0100, Alberto Mattea wrote:
> 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

Re: [PATCH] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

[Alberto Mattea]

In data lunedì 17 febbraio 2020 16:45:38 CET, hai scritto:
> On Mon, Feb 17, 2020 at 04:21:50PM +0100, Alberto Mattea wrote:
> > 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

Re: [PATCH] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

[Greg KH]

On Mon, Feb 17, 2020 at 05:07:17PM +0100, Alberto Mattea wrote:
> In data lunedì 17 febbraio 2020 16:45:38 CET, hai scritto:
> > On Mon, Feb 17, 2020 at 04:21:50PM +0100, Alberto Mattea wrote:
> > > 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."

I sure beats the original 3 words you wrote :)

Re: [PATCH] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

[Alberto Mattea]

In data lunedì 17 febbraio 2020 17:30:18 CET, Greg KH ha scritto:
> On Mon, Feb 17, 2020 at 05:07:17PM +0100, Alberto Mattea wrote:
> > In data lunedì 17 febbraio 2020 16:45:38 CET, hai scritto:
> > > On Mon, Feb 17, 2020 at 04:21:50PM +0100, Alberto Mattea wrote:
> > > > 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."
> 
> I sure beats the original 3 words you wrote :)
> 
> 

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