From: Tal Shnaiderman <talshn@nvidia.com>
To: Nick Connolly <nick.connolly@mayadata.io>,
"dmitry.kozliuk@gmail.com" <dmitry.kozliuk@gmail.com>,
"pallavi.kadam@intel.com" <pallavi.kadam@intel.com>,
NBU-Contact-Thomas Monjalon <thomas@monjalon.net>
Cc: "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v3] bus/pci: nvme on Windows requires class id and bus
Date: Sun, 31 Jan 2021 15:56:38 +0000 [thread overview]
Message-ID: <DM6PR12MB3945922EF577D2FCE45948FCA4B79@DM6PR12MB3945.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20210128170435.4304-1-nick.connolly@mayadata.io>
> Subject: [PATCH v3] bus/pci: nvme on Windows requires class id and bus
>
> External email: Use caution opening links or attachments
>
>
> Attaching to an NVMe disk on Windows using SPDK requires the PCI class ID
> and device.bus fields. Decode the class ID from the PCI device info strings if it
> is present and set device.bus.
>
> Signed-off-by: Nick Connolly <nick.connolly@mayadata.io>
> ---
> v3:
> * Put version history at top - v2 mistakenly had it after the diffs
>
> v2:
> * If only a 4-digit class ID is available, convert it to 6-digit format
>
> drivers/bus/pci/windows/pci.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
> index f66258452..d380fc1ae 100644
> --- a/drivers/bus/pci/windows/pci.c
> +++ b/drivers/bus/pci/windows/pci.c
> @@ -280,17 +280,29 @@ parse_pci_hardware_id(const char *buf, struct
> rte_pci_id *pci_id) {
> int ids = 0;
> uint16_t vendor_id, device_id;
> - uint32_t subvendor_id = 0;
> + uint32_t subvendor_id = 0, class_id = 0;
> + const char *cp;
>
> ids = sscanf_s(buf, "PCI\\VEN_%" PRIx16 "&DEV_%" PRIx16
> "&SUBSYS_%"
> PRIx32, &vendor_id, &device_id, &subvendor_id);
> if (ids != 3)
> return -1;
>
> + /* Try and find PCI class ID */
> + for (cp = buf; !(cp[0] == 0 && cp[1] == 0); cp++)
> + if (*cp == '&' && sscanf_s(cp,
> + "&CC_%" PRIx32, &class_id) == 1) {
> + /* Convert 4-digit class IDs to 6-digit format */
> + if (strspn(cp + 4, "0123456789abcdefABCDEF") == 4)
Maybe we can move this format string to a define in the header, something like RTE_PCI_DRV_CLASSID_FMT?
> + class_id <<= 8;
> + break;
> + }
> +
> pci_id->vendor_id = vendor_id;
> pci_id->device_id = device_id;
> pci_id->subsystem_device_id = subvendor_id >> 16;
> pci_id->subsystem_vendor_id = subvendor_id & 0xffff;
> + pci_id->class_id = class_id;
> return 0;
> }
>
> @@ -339,6 +351,7 @@ pci_scan_one(HDEVINFO dev_info,
> PSP_DEVINFO_DATA device_info_data)
> if (ret != 0)
> goto end;
>
> + dev->device.bus = &rte_pci_bus.bus;
> dev->addr = addr;
> dev->id = pci_id;
> dev->max_vfs = 0; /* TODO: get max_vfs */
> --
> 2.25.1
next prev parent reply other threads:[~2021-01-31 15:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 17:08 [dpdk-dev] [PATCH] " Nick Connolly
2021-01-26 17:45 ` Tal Shnaiderman
2021-01-26 18:18 ` Nick Connolly
2021-01-26 22:41 ` Thomas Monjalon
2021-01-27 14:22 ` Nick Connolly
2021-01-27 15:13 ` Tal Shnaiderman
2021-01-28 17:00 ` [dpdk-dev] [PATCH v2] " Nick Connolly
2021-01-28 17:04 ` [dpdk-dev] [PATCH v3] " Nick Connolly
2021-01-31 15:56 ` Tal Shnaiderman [this message]
2021-02-02 13:07 ` Nick Connolly
2021-02-02 13:44 ` [dpdk-dev] [PATCH v4] " Nick Connolly
2021-02-02 13:54 ` [dpdk-dev] [PATCH v5] " Nick Connolly
2021-02-02 14:04 ` Tal Shnaiderman
2021-02-23 18:18 ` [dpdk-dev] [PATCH v6] " Nick Connolly
2021-02-28 14:38 ` Dmitry Kozlyuk
2021-03-01 9:24 ` Nick Connolly
2021-03-01 9:56 ` [dpdk-dev] [PATCH v7] " Nick Connolly
2021-03-16 13:45 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM6PR12MB3945922EF577D2FCE45948FCA4B79@DM6PR12MB3945.namprd12.prod.outlook.com \
--to=talshn@nvidia.com \
--cc=dev@dpdk.org \
--cc=dmitry.kozliuk@gmail.com \
--cc=nick.connolly@mayadata.io \
--cc=pallavi.kadam@intel.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).