Commit 6ad31d16 authored by Zhu Lingshan's avatar Zhu Lingshan Committed by Michael S. Tsirkin
Browse files

vDPA/ifcvf: enable Intel C5000X-PL virtio-block for vDPA 



This commit enabled Intel FPGA SmartNIC C5000X-PL virtio-block
for vDPA.

Signed-off-by: default avatarZhu Lingshan <lingshan.zhu@intel.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210419063326.3748-3-lingshan.zhu@intel.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 26bfea13

drivers/vdpa/ifcvf/ifcvf_base.h

+7 −1
Original line number Diff line number Diff line
@@ -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)			| \

drivers/vdpa/ifcvf/ifcvf_main.c

+18 −1
Original line number Diff line number Diff line
@@ -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;

}
@@ -514,6 +527,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 },

};