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

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

[Alberto Mattea]

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.

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 resend] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c

[Greg KH]

On Mon, Feb 17, 2020 at 05:54:19PM +0100, Alberto Mattea wrote:
> 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.
> 
> 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
> 
> 

$ ./scripts/get_maintainer.pl --file drivers/usb/host/xhci-pci.c
Mathias Nyman <mathias.nyman@intel.com> (supporter:USB XHCI DRIVER)
Greg Kroah-Hartman <gregkh@linuxfoundation.org> (supporter:USB SUBSYSTEM)
linux-usb@vger.kernel.org (open list:USB XHCI DRIVER)
linux-kernel@vger.kernel.org (open list)


{sigh}

Always include the maintainer of the driver in your cc: list.

I've added Mathias to this message now, hopefully he can pick this up
for his next round of patches.

thanks,

greg k-h

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

[Mathias Nyman]

On 4.3.2020 11.02, Greg KH wrote:
> On Mon, Feb 17, 2020 at 05:54:19PM +0100, Alberto Mattea wrote:
>> 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.
>>
>> 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
>>
>>
> 
> $ ./scripts/get_maintainer.pl --file drivers/usb/host/xhci-pci.c
> Mathias Nyman <mathias.nyman@intel.com> (supporter:USB XHCI DRIVER)
> Greg Kroah-Hartman <gregkh@linuxfoundation.org> (supporter:USB SUBSYSTEM)
> linux-usb@vger.kernel.org (open list:USB XHCI DRIVER)
> linux-kernel@vger.kernel.org (open list)
> 
> 
> {sigh}
> 
> Always include the maintainer of the driver in your cc: list.
> 
> I've added Mathias to this message now, hopefully he can pick this up
> for his next round of patches.
> 

Thanks, patch added to queue

-Mathias