[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210416084707.ruqzvg4airzkkc2t@steredhat>
Date: Fri, 16 Apr 2021 10:47:07 +0200
From: Stefano Garzarella <sgarzare@...hat.com>
To: Zhu Lingshan <lingshan.zhu@...el.com>
Cc: jasowang@...hat.com, mst@...hat.com, lulu@...hat.com,
virtualization@...ts.linux-foundation.org, netdev@...r.kernel.org,
kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH V3 2/3] vDPA/ifcvf: enable Intel C5000X-PL virtio-block
for vDPA
On Fri, Apr 16, 2021 at 03:16:27PM +0800, Zhu Lingshan wrote:
>This commit enabled Intel FPGA SmartNIC C5000X-PL virtio-block
>for vDPA.
>
>Signed-off-by: Zhu Lingshan <lingshan.zhu@...el.com>
>---
> drivers/vdpa/ifcvf/ifcvf_base.h | 8 +++++++-
> drivers/vdpa/ifcvf/ifcvf_main.c | 19 ++++++++++++++++++-
> 2 files changed, 25 insertions(+), 2 deletions(-)
Reviewed-by: Stefano Garzarella <sgarzare@...hat.com>
>
>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 },
> };
>--
>2.27.0
>
Powered by blists - more mailing lists