Skip to contentSkip to conversation

xhci: pci: Amend definitions of PCI device IDs

PATCH Superseded Andy Shevchenko 2 participants 5 messages Sep 13, 2024

Subsystems (2)
USB USB xHCI driver

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

cover xhci: pci: Amend definitions of PCI device IDs

Amend the definitions of PCI device IDs.

Andy Shevchenko (2):
xhci: pci: Use standard pattern for device IDs
xhci: pci: Fix indentation in the PCI device ID definitions

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

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

The definitions of vendor IDs are 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 de50f5ba60df..6d9eb2b031e2 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

@@ -388,12 +388,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
#2 lore raw

Re: [PATCH v1 1/2] xhci: pci: Use standard pattern for device IDs

Quoted 1 line · Andy Shevchenko

The definitions of vendor IDs are follow the pattern

s/are//?

Quoted 5 lines

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]>

[...]

Quoted 4 lines
drivers/usb/host/xhci-pci.c +0 -0
index de50f5ba60df..6d9eb2b031e2 100644

[...]

Quoted 5 lines
drivers/usb/host/xhci-pci.c +0 -1
@@ -388,12 +388,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) {

drivers/usb/host/xhci-pci.c static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) · line 399

Quoted 10 lines
drivers/usb/host/xhci-pci.c +2 -1
+	    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;

Hm, these 2 *if*s seem mergeable?

MBR, Sergey

author
#3 lore raw

Re: [PATCH v1 1/2] xhci: pci: Use standard pattern for device IDs

Quoted 5 lines · Sergei Shtylyov
Quoted 1 line · Andy Shevchenko

The definitions of vendor IDs are follow the pattern

   s/are//?

Yeah, thank you for catching this.

Quoted 3 lines
Quoted 3 lines

PCI_VENDOR_ID_#vendor, while device IDs — PCI_DEVICE_ID_#vendor_#device.

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

[...]

Quoted 5 lines
Quoted 5 lines
drivers/usb/host/xhci-pci.c +1 -1
 	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;
Quoted 8 lines

drivers/usb/host/xhci-pci.c static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) · line 398

Quoted 6 lines
drivers/usb/host/xhci-pci.c +1 -1
 	}
 	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;

Hm, these 2 *if*s seem mergeable?

It's out of the scope of this mini-series, but seems a good catch!

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

PATCH 2/2 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 6d9eb2b031e2..cbbee5175547 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