Skip to contentSkip to conversation

bus/pci: fix hardware ids parsing on Windows

PATCH Applied Tal Shnaiderman 3 participants 3 messages Aug 23, 2020 – Sep 11, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bus/pci: fix hardware ids parsing on Windows

From: Tal Shnaiderman <[email protected]>

Swap subsystem vendor id and subsystem device id. Parse the SPDRP_HARDWAREID string with correct type values.

Fixes b762221ac24 ("bus/pci: support Windows with bifurcated drivers")
---
 drivers/bus/pci/windows/pci.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/bus/pci/windows/pci.c +6 -5
index 489aa7902a..c80bd55716 100644
@@ -270,17 +270,18 @@ static int
 parse_pci_hardware_id(const char *buf, struct rte_pci_id *pci_id)
 {
 	int ids = 0;
-	uint16_t vendor_id, device_id, subvendor_id = 0;
+	uint16_t vendor_id, device_id;
+	uint32_t subvendor_id = 0;
 
-	ids = sscanf_s(buf, "PCI\\VEN_%x&DEV_%x&SUBSYS_%x", &vendor_id,
-		&device_id, &subvendor_id);
+	ids = sscanf_s(buf, "PCI\\VEN_%" PRIx16 "&DEV_%" PRIx16 "&SUBSYS_%"
+		PRIx32, &vendor_id, &device_id, &subvendor_id);
 	if (ids != 3)
 		return -1;
 
 	pci_id->vendor_id = vendor_id;
 	pci_id->device_id = device_id;
-	pci_id->subsystem_vendor_id = subvendor_id >> 16;
-	pci_id->subsystem_device_id = subvendor_id & 0xffff;
+	pci_id->subsystem_device_id = subvendor_id >> 16;
+	pci_id->subsystem_vendor_id = subvendor_id & 0xffff;
 	return 0;
 }
 
Signature · 1 line
2.16.1.windows.4
Acked-by on v1 1/1
#1 lore raw

drivers/bus/pci/windows/pci.c

Quoted 14 lines · Tal Shnaiderman

From: Tal Shnaiderman <[email protected]>

Swap subsystem vendor id and subsystem device id. Parse the SPDRP_HARDWAREID string with correct type values.

Fixes b762221ac24 ("bus/pci: support Windows with bifurcated drivers")
---
 drivers/bus/pci/windows/pci.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/bus/pci/windows/pci.c +0 -0
#2 lore raw

10/09/2020 01:15, Narcisa Ana Maria Vasile:

Quoted 6 lines · Tal Shnaiderman
Quoted 5 lines

From: Tal Shnaiderman <[email protected]>

Swap subsystem vendor id and subsystem device id. Parse the SPDRP_HARDWAREID string with correct type values.

Quoted 6 lines
Quoted 4 lines
Fixes b762221ac24 ("bus/pci: support Windows with bifurcated drivers")

Applied, thanks