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

vDPA/ifcvf: reuse pre-defined macros for device ids and vendor ids 



This commit would reuse pre-defined macros for ifcvf device ids
and vendor ids

Signed-off-by: default avatarZhu Lingshan <lingshan.zhu@intel.com>
Link: https://lore.kernel.org/r/20210510081015.4212-3-lingshan.zhu@intel.com


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

drivers/vdpa/ifcvf/ifcvf_base.h

+0 −12
Original line number Diff line number Diff line
@@ -19,21 +19,9 @@ 
#include <uapi/linux/virtio_config.h>

#include <uapi/linux/virtio_pci.h>



#define N3000_VENDOR_ID		0x1AF4

#define N3000_DEVICE_ID		0x1041

#define N3000_SUBSYS_VENDOR_ID	0x8086

#define N3000_SUBSYS_DEVICE_ID	0x001A



#define C5000X_PL_VENDOR_ID		0x1AF4

#define C5000X_PL_DEVICE_ID		0x1000

#define C5000X_PL_SUBSYS_VENDOR_ID	0x8086

#define C5000X_PL_SUBSYS_DEVICE_ID	0x0001



#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)			| \

drivers/vdpa/ifcvf/ifcvf_main.c

+13 −10
Original line number Diff line number Diff line
@@ -552,18 +552,21 @@ static void ifcvf_remove(struct pci_dev *pdev) 
}



static struct pci_device_id ifcvf_pci_ids[] = {

	{ PCI_DEVICE_SUB(N3000_VENDOR_ID,

	/* N3000 network device */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_REDHAT_QUMRANET,

			 N3000_DEVICE_ID,

			 N3000_SUBSYS_VENDOR_ID,

			 PCI_VENDOR_ID_INTEL,

			 N3000_SUBSYS_DEVICE_ID) },

	{ PCI_DEVICE_SUB(C5000X_PL_VENDOR_ID,

			 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) },

	/* C5000X-PL network device */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_REDHAT_QUMRANET,

			 VIRTIO_TRANS_ID_NET,

			 PCI_VENDOR_ID_INTEL,

			 VIRTIO_ID_NET) },

	/* C5000X-PL block device */

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_REDHAT_QUMRANET,

			 VIRTIO_TRANS_ID_BLOCK,

			 PCI_VENDOR_ID_INTEL,

			 VIRTIO_ID_BLOCK) },



	{ 0 },

};