From: Jason Wang <jasowang@redhat.com>
To: Zhu Lingshan <lingshan.zhu@intel.com>,
mst@redhat.com, lulu@redhat.com, sgarzare@redhat.com
Cc: virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH V3 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA
Date: Mon, 19 Apr 2021 11:16:39 +0800 [thread overview]
Message-ID: <4cce68b5-9cca-1ccd-f219-fb66c50a4f75@redhat.com> (raw)
In-Reply-To: <20210416071628.4984-3-lingshan.zhu@intel.com>
在 2021/4/16 下午3:16, Zhu Lingshan 写道:
> This commit enabled Intel FPGA SmartNIC C5000X-PL virtio-block
> for vDPA.
>
> Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> drivers/vdpa/ifcvf/ifcvf_base.h | 8 +++++++-
> drivers/vdpa/ifcvf/ifcvf_main.c | 19 ++++++++++++++++++-
> 2 files changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h
> index 1c04cd256fa7..0111bfdeb342 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_base.h
> +++ b/drivers/vdpa/ifcvf/ifcvf_base.h
> @@ -15,6 +15,7 @@
> #include <linux/pci_regs.h>
> #include <linux/vdpa.h>
> #include <uapi/linux/virtio_net.h>
> +#include <uapi/linux/virtio_blk.h>
> #include <uapi/linux/virtio_config.h>
> #include <uapi/linux/virtio_pci.h>
>
> @@ -28,7 +29,12 @@
> #define C5000X_PL_SUBSYS_VENDOR_ID 0x8086
> #define C5000X_PL_SUBSYS_DEVICE_ID 0x0001
>
> -#define IFCVF_SUPPORTED_FEATURES \
> +#define C5000X_PL_BLK_VENDOR_ID 0x1AF4
> +#define C5000X_PL_BLK_DEVICE_ID 0x1001
> +#define C5000X_PL_BLK_SUBSYS_VENDOR_ID 0x8086
> +#define C5000X_PL_BLK_SUBSYS_DEVICE_ID 0x0002
> +
> +#define IFCVF_NET_SUPPORTED_FEATURES \
> ((1ULL << VIRTIO_NET_F_MAC) | \
> (1ULL << VIRTIO_F_ANY_LAYOUT) | \
> (1ULL << VIRTIO_F_VERSION_1) | \
> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c
> index 469a9b5737b7..376b2014916a 100644
> --- a/drivers/vdpa/ifcvf/ifcvf_main.c
> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c
> @@ -168,10 +168,23 @@ static struct ifcvf_hw *vdpa_to_vf(struct vdpa_device *vdpa_dev)
>
> static u64 ifcvf_vdpa_get_features(struct vdpa_device *vdpa_dev)
> {
> + struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev);
> struct ifcvf_hw *vf = vdpa_to_vf(vdpa_dev);
> + struct pci_dev *pdev = adapter->pdev;
> +
> u64 features;
>
> - features = ifcvf_get_features(vf) & IFCVF_SUPPORTED_FEATURES;
> + switch (vf->dev_type) {
> + case VIRTIO_ID_NET:
> + features = ifcvf_get_features(vf) & IFCVF_NET_SUPPORTED_FEATURES;
> + break;
> + case VIRTIO_ID_BLOCK:
> + features = ifcvf_get_features(vf);
> + break;
> + default:
> + features = 0;
> + IFCVF_ERR(pdev, "VIRTIO ID %u not supported\n", vf->dev_type);
> + }
>
> return features;
> }
> @@ -517,6 +530,10 @@ static struct pci_device_id ifcvf_pci_ids[] = {
> C5000X_PL_DEVICE_ID,
> C5000X_PL_SUBSYS_VENDOR_ID,
> C5000X_PL_SUBSYS_DEVICE_ID) },
> + { PCI_DEVICE_SUB(C5000X_PL_BLK_VENDOR_ID,
> + C5000X_PL_BLK_DEVICE_ID,
> + C5000X_PL_BLK_SUBSYS_VENDOR_ID,
> + C5000X_PL_BLK_SUBSYS_DEVICE_ID) },
>
> { 0 },
> };
next prev parent reply other threads:[~2021-04-19 3:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 7:16 [PATCH V3 0/3] vDPA/ifcvf: enables Intel C5000X-PL virtio-blk Zhu Lingshan
2021-04-16 7:16 ` [PATCH V3 1/3] vDPA/ifcvf: deduce VIRTIO device ID when probe Zhu Lingshan
2021-04-19 3:15 ` Jason Wang
2021-04-16 7:16 ` [PATCH V3 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA Zhu Lingshan
2021-04-16 8:47 ` Stefano Garzarella
2021-04-19 3:16 ` Jason Wang [this message]
2021-04-16 7:16 ` [PATCH V3 3/3] vDPA/ifcvf: get_config_size should return dev specific config size Zhu Lingshan
2021-04-16 8:47 ` Stefano Garzarella
2021-04-19 3:17 ` Jason Wang
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=4cce68b5-9cca-1ccd-f219-fb66c50a4f75@redhat.com \
--to=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lingshan.zhu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lulu@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sgarzare@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/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).