diff mbox series

bus/pci: fix hardware ids parsing on Windows

Message ID 20200823130604.9992-1-talshn@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series bus/pci: fix hardware ids parsing on Windows |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/Intel-compilation success Compilation OK

Commit Message

Tal Shnaiderman Aug. 23, 2020, 1:06 p.m. UTC 
  From: Tal Shnaiderman <talshn@mellanox.com>

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")
Cc: stable@dpdk.org

Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
---
 drivers/bus/pci/windows/pci.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

Narcisa Ana Maria Vasile Sept. 9, 2020, 11:15 p.m. UTC | #1 
On Sun, Aug 23, 2020 at 04:06:04PM +0300, Tal Shnaiderman wrote:
> From: Tal Shnaiderman <talshn@mellanox.com>
> 
> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
> ---
>  drivers/bus/pci/windows/pci.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c

Acked-by: Narcisa Vasile <navasile@linux.microsoft.com>
Thomas Monjalon Sept. 11, 2020, 12:06 a.m. UTC | #2 
10/09/2020 01:15, Narcisa Ana Maria Vasile:
> On Sun, Aug 23, 2020 at 04:06:04PM +0300, Tal Shnaiderman wrote:
> > From: Tal Shnaiderman <talshn@mellanox.com>
> > 
> > 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")
> > Cc: stable@dpdk.org
> > 
> > Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
> 
> Acked-by: Narcisa Vasile <navasile@linux.microsoft.com>

Applied, thanks
diff mbox series

Patch

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index 489aa7902a..c80bd55716 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -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;
 }