usb: xHCI: add XHCI_RESET_ON_RESUME quirk for Phytium xHCI host

Commit Message

WangYuli Aug. 29, 2024, 7:30 a.m. UTC

The resume operation of Phytium Px210 xHCI host would failed
to restore state. Use the XHCI_RESET_ON_RESUME quirk to skip
it and reset the controller after resume.

Co-developed-by: Chen Baozi <[e-mail]>
Signed-off-by: Chen Baozi <[e-mail]>
Co-developed-by: Wang Zhimin <[e-mail]>
Signed-off-by: Wang Zhimin <[e-mail]>
Co-developed-by: Chen Zhenhua <[e-mail]>
Signed-off-by: Chen Zhenhua <[e-mail]>
Co-developed-by: Wang Yinfeng <[e-mail]>
Signed-off-by: Wang Yinfeng <[e-mail]>
Co-developed-by: Jiakun Shuai <[e-mail]>
Signed-off-by: Jiakun Shuai <[e-mail]>
Signed-off-by: WangYuli <[e-mail]>
---
 drivers/usb/host/xhci-pci.c | 6 ++++++
 include/linux/pci_ids.h     | 2 ++
 2 files changed, 8 insertions(+)

Comments

Greg Kroah-Hartman Aug. 29, 2024, 8:46 a.m. UTC | #1

On Thu, Aug 29, 2024 at 03:30:05PM +0800, WangYuli wrote:
> The resume operation of Phytium Px210 xHCI host would failed
> to restore state. Use the XHCI_RESET_ON_RESUME quirk to skip
> it and reset the controller after resume.
> 
> Co-developed-by: Chen Baozi <[e-mail]>
> Signed-off-by: Chen Baozi <[e-mail]>
> Co-developed-by: Wang Zhimin <[e-mail]>
> Signed-off-by: Wang Zhimin <[e-mail]>
> Co-developed-by: Chen Zhenhua <[e-mail]>
> Signed-off-by: Chen Zhenhua <[e-mail]>
> Co-developed-by: Wang Yinfeng <[e-mail]>
> Signed-off-by: Wang Yinfeng <[e-mail]>
> Co-developed-by: Jiakun Shuai <[e-mail]>
> Signed-off-by: Jiakun Shuai <[e-mail]>
> Signed-off-by: WangYuli <[e-mail]>
> ---
>  drivers/usb/host/xhci-pci.c | 6 ++++++
>  include/linux/pci_ids.h     | 2 ++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index b5705ed01d83..af967644489c 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -55,6 +55,8 @@
>  #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI		0x51ed
>  #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI	0x54ed
>  
> +#define PCI_DEVICE_ID_PHYTIUM_XHCI			0xdc27
> +
>  /* Thunderbolt */
>  #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI		0x1138
>  #define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI	0x15b5
> @@ -407,6 +409,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
>  	if (pdev->vendor == PCI_VENDOR_ID_VIA)
>  		xhci->quirks |= XHCI_RESET_ON_RESUME;
>  
> +	if (pdev->vendor == PCI_VENDOR_ID_PHYTIUM ||
> +	    pdev->device == PCI_DEVICE_ID_PHYTIUM_XHCI)
> +		xhci->quirks |= XHCI_RESET_ON_RESUME;
> +
>  	/* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */
>  	if (pdev->vendor == PCI_VENDOR_ID_VIA &&
>  			pdev->device == 0x3432)
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index e388c8b1cbc2..25fff4130503 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2605,6 +2605,8 @@
>  
>  #define PCI_VENDOR_ID_FUNGIBLE		0x1dad
>  
> +#define PCI_VENDOR_ID_PHYTIUM		0x1db7

Please read the top of this file, there's no need to add this id to this
file as you are only using it in one .c file.

thanks,

greg k-h

WangYuli Aug. 29, 2024, 8:55 a.m. UTC | #2

On 2024/8/29 16:46, Greg KH wrote:
> Please read the top of this file, there's no need to add this id to this
> file as you are only using it in one .c file.

Thanks for review.

More files using PCI_VENDOR_ID_PHYTIUM will appear,though maybe not in 
the USB subsystem.

These patches are on their way and I won't keep you waiting too long.

However,if I temporarily delete this line and use a raw hexadecimal 
value in xhci-pci.c,I'll need to modify xhci-pci.c again soon.

If you think it is more reasonable and acceptable,I'll send a patch-v2 
immediately to avoid breaking the rules for pci_ids.

>
> thanks,
>
> greg k-h
>
Thanks,

Greg Kroah-Hartman Aug. 29, 2024, 9:09 a.m. UTC | #3

On Thu, Aug 29, 2024 at 04:55:19PM +0800, WangYuli wrote:
> 
> On 2024/8/29 16:46, Greg KH wrote:
> > Please read the top of this file, there's no need to add this id to this
> > file as you are only using it in one .c file.
> 
> Thanks for review.
> 
> More files using PCI_VENDOR_ID_PHYTIUM will appear,though maybe not in the
> USB subsystem.
> 
> These patches are on their way and I won't keep you waiting too long.

When that change happens, then you can add it to the .h file.

> However,if I temporarily delete this line and use a raw hexadecimal value in
> xhci-pci.c,I'll need to modify xhci-pci.c again soon.

Just put the define in xhci-pci.c and all will be fine.

thanks,

greg k-h

Sergei Shtylyov Aug. 29, 2024, 9:38 a.m. UTC | #4

On 8/29/24 10:30 AM, WangYuli wrote:

> The resume operation of Phytium Px210 xHCI host would failed

   Fail?

> to restore state. Use the XHCI_RESET_ON_RESUME quirk to skip
> it and reset the controller after resume.
> 
> Co-developed-by: Chen Baozi <[e-mail]>
> Signed-off-by: Chen Baozi <[e-mail]>
> Co-developed-by: Wang Zhimin <[e-mail]>
> Signed-off-by: Wang Zhimin <[e-mail]>
> Co-developed-by: Chen Zhenhua <[e-mail]>
> Signed-off-by: Chen Zhenhua <[e-mail]>
> Co-developed-by: Wang Yinfeng <[e-mail]>
> Signed-off-by: Wang Yinfeng <[e-mail]>
> Co-developed-by: Jiakun Shuai <[e-mail]>
> Signed-off-by: Jiakun Shuai <[e-mail]>
> Signed-off-by: WangYuli <[e-mail]>
[...]

> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index b5705ed01d83..af967644489c 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -55,6 +55,8 @@
>  #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI		0x51ed
>  #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI	0x54ed
>  
> +#define PCI_DEVICE_ID_PHYTIUM_XHCI			0xdc27
> +
>  /* Thunderbolt */
>  #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI		0x1138
>  #define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI	0x15b5
> @@ -407,6 +409,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
>  	if (pdev->vendor == PCI_VENDOR_ID_VIA)
>  		xhci->quirks |= XHCI_RESET_ON_RESUME;
>  
> +	if (pdev->vendor == PCI_VENDOR_ID_PHYTIUM ||

   Hm, ||, not &&?

> +	    pdev->device == PCI_DEVICE_ID_PHYTIUM_XHCI)
> +		xhci->quirks |= XHCI_RESET_ON_RESUME;
> +
>  	/* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */
>  	if (pdev->vendor == PCI_VENDOR_ID_VIA &&
>  			pdev->device == 0x3432)
[...]

MBR, Sergey

Bjorn Helgaas Aug. 29, 2024, 4:51 p.m. UTC | #5

On Thu, Aug 29, 2024 at 12:38:58PM +0300, Sergei Shtylyov wrote:
> On 8/29/24 10:30 AM, WangYuli wrote:
> > +	if (pdev->vendor == PCI_VENDOR_ID_PHYTIUM ||
> 
>    Hm, ||, not &&?
> 
> > +	    pdev->device == PCI_DEVICE_ID_PHYTIUM_XHCI)
> > +		xhci->quirks |= XHCI_RESET_ON_RESUME;

Definitely a bug, thanks for spotting it!  Must check both Vendor
*and* Device ID.  There are likely unrelated devices from other
vendors using the PCI_DEVICE_ID_PHYTIUM_XHCI Device ID value.

Patch

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index b5705ed01d83..af967644489c 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -55,6 +55,8 @@ 
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI		0x51ed
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI	0x54ed
 
+#define PCI_DEVICE_ID_PHYTIUM_XHCI			0xdc27
+
 /* Thunderbolt */
 #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI		0x1138
 #define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI	0x15b5
@@ -407,6 +409,10 @@  static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 	if (pdev->vendor == PCI_VENDOR_ID_VIA)
 		xhci->quirks |= XHCI_RESET_ON_RESUME;
 
+	if (pdev->vendor == PCI_VENDOR_ID_PHYTIUM ||
+	    pdev->device == PCI_DEVICE_ID_PHYTIUM_XHCI)
+		xhci->quirks |= XHCI_RESET_ON_RESUME;
+
 	/* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */
 	if (pdev->vendor == PCI_VENDOR_ID_VIA &&
 			pdev->device == 0x3432)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e388c8b1cbc2..25fff4130503 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2605,6 +2605,8 @@ 
 
 #define PCI_VENDOR_ID_FUNGIBLE		0x1dad
 
+#define PCI_VENDOR_ID_PHYTIUM		0x1db7
+
 #define PCI_VENDOR_ID_HXT		0x1dbf
 
 #define PCI_VENDOR_ID_TEKRAM		0x1de1