Skip to contentSkip to conversation

xhci: pci: Amend definitions of PCI device IDs

PATCH In review Andy Shevchenko 2 participants 6 messages Oct 3, 2024 – Oct 8, 2024

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

Andy Shevchenko

author
#0 lore raw

v2 cover xhci: pci: Amend definitions of PCI device IDs

Amend the definitions of PCI device IDs.

There is a new patch 1 that may be folded in the original commit by Mathias. After this series the whole Cadence case can be amended at once as Roger suggested.

In v2:
- dropped 'are' in the commit message (Sergei)
- added a new patch to align Cadence ID name

Andy Shevchenko (3):
xhci: pci: Aling the naming for Cadence PCI ID 0x0200
xhci: pci: Use standard pattern for device IDs
xhci: pci: Fix indentation in the PCI device ID definitions

 drivers/usb/host/xhci-pci.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
author
#1 lore raw

PATCH v2 1/3 xhci: pci: Aling the naming for Cadence PCI ID 0x0200

Rename the PCI device ID to match what's used in another driver.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/usb/host/xhci-pci.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-pci.c +3 -2
index 295d3297ca3d..2c148b143c54 100644
@@ -81,7 +81,7 @@
 #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI			0x2142
 #define PCI_DEVICE_ID_ASMEDIA_3242_XHCI			0x3242
 
-#define PCI_DEVICE_ID_CDNS_SSP				0x0200
+#define PCI_DEVICE_ID_CDNS_UDC				0x0200
 
 static const char hcd_name[] = "xhci_hcd";
 

@@ -475,8 +475,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 		if (pdev->device == 0x9203)
 			xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH;
 	}
+
 	if (pdev->vendor == PCI_VENDOR_ID_CDNS &&
-	    pdev->device == PCI_DEVICE_ID_CDNS_SSP)
+	    pdev->device == PCI_DEVICE_ID_CDNS_UDC)
 		xhci->quirks |= XHCI_CDNS_SCTX_QUIRK;
 
 	/* xHC spec requires PCI devices to support D3hot and D3cold */
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
maintainer
#2 lore raw

Re: [PATCH v2 1/3] xhci: pci: Aling the naming for Cadence PCI ID 0x0200

Quoted 1 line · Andy Shevchenko

Rename the PCI device ID to match what's used in another driver.

If the same device id is in multiple drivers, why not add it to pci_ids.h like is normal to do?

thanks,

greg k-h

author
#3 lore raw

Re: [PATCH v2 1/3] xhci: pci: Aling the naming for Cadence PCI ID 0x0200

Quoted 5 lines · Greg Kroah-Hartman
Quoted 1 line · Andy Shevchenko

Rename the PCI device ID to match what's used in another driver.

If the same device id is in multiple drivers, why not add it to pci_ids.h like is normal to do?

Also an option. So, Mathias, please, skip the first patch, seems we can do better.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author
#4 lore raw

PATCH v2 2/3 xhci: pci: Use standard pattern for device IDs

In reply to Andy Shevchenko

The definitions of vendor IDs follow the pattern PCI_VENDOR_ID_#vendor, while device IDs — PCI_DEVICE_ID_#vendor_#device.

Update the ETRON device IDs to follow the above mentioned pattern.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/usb/host/xhci-pci.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/usb/host/xhci-pci.c +5 -5
index 2c148b143c54..1f7333a5e9a9 100644
@@ -34,9 +34,9 @@
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1100	0x1100
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400	0x1400
 
-#define PCI_VENDOR_ID_ETRON		0x1b6f
-#define PCI_DEVICE_ID_EJ168		0x7023
-#define PCI_DEVICE_ID_EJ188		0x7052
+#define PCI_VENDOR_ID_ETRON			0x1b6f
+#define PCI_DEVICE_ID_ETRON_EJ168		0x7023
+#define PCI_DEVICE_ID_ETRON_EJ188		0x7052
 
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI	0x8c31
 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI	0x9c31

@@ -393,12 +393,12 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 		xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
 
 	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
-			pdev->device == PCI_DEVICE_ID_EJ168) {
+	    pdev->device == PCI_DEVICE_ID_ETRON_EJ168) {
 		xhci->quirks |= XHCI_RESET_ON_RESUME;
 		xhci->quirks |= XHCI_BROKEN_STREAMS;
 	}
 	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
-			pdev->device == PCI_DEVICE_ID_EJ188) {
+	    pdev->device == PCI_DEVICE_ID_ETRON_EJ188) {
 		xhci->quirks |= XHCI_RESET_ON_RESUME;
 		xhci->quirks |= XHCI_BROKEN_STREAMS;
 	}
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
author
#5 lore raw

PATCH v2 3/3 xhci: pci: Fix indentation in the PCI device ID definitions

In reply to Andy Shevchenko

Some of the definitions are missing the one TAB, add it to them.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/usb/host/xhci-pci.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/usb/host/xhci-pci.c +4 -4
index 1f7333a5e9a9..4b0378a9b584 100644
@@ -28,8 +28,8 @@
 #define SPARSE_CNTL_ENABLE	0xC12C
 
 /* Device for a quirk */
-#define PCI_VENDOR_ID_FRESCO_LOGIC	0x1b73
-#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK	0x1000
+#define PCI_VENDOR_ID_FRESCO_LOGIC		0x1b73
+#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK		0x1000
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1009	0x1009
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1100	0x1100
 #define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400	0x1400

@@ -38,8 +38,8 @@
 #define PCI_DEVICE_ID_ETRON_EJ168		0x7023
 #define PCI_DEVICE_ID_ETRON_EJ188		0x7052
 
-#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI	0x8c31
-#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI	0x9c31
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI		0x8c31
+#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI		0x9c31
 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_XHCI	0x9cb1
 #define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI		0x22b5
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI		0xa12f
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac