bus/pci: fix hardware ids parsing on Windows
Checks
Commit Message
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
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>
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
@@ -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;
}