virtio: update virtio id table
Subsystems (5)
v2 cover virtio: update virtio id table
This series adds transitional device ids in virtio pci header. Then reuses the ids in ifcvf driver
Zhu Lingshan (2):
virtio-pci: add transitional device ids in virtio pci header vDPA/ifcvf: reuse pre-defined macros for device ids and vendor ids
drivers/vdpa/ifcvf/ifcvf_base.h | 12 ------------ drivers/vdpa/ifcvf/ifcvf_main.c | 23 +++++++++++++---------- include/uapi/linux/virtio_pci.h | 12 ++++++++++++ 3 files changed, 25 insertions(+), 22 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/2 virtio-pci: add transitional device ids in virtio pci header
This commit adds transitional device ids in the virtio pci header file
Signed-off-by Zhu Lingshan <[email protected]>
--- include/uapi/linux/virtio_pci.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/uapi/linux/virtio_pci.h +12 -0
@@ -205,4 +205,16 @@ struct virtio_pci_cfg_cap {#endif /* VIRTIO_PCI_NO_MODERN */ +/* +* Virtio Transitional IDs +*/ + +#define VIRTIO_TRANS_ID_NET 1000/* transitional virtio net */ +#define VIRTIO_TRANS_ID_BLOCK 1001/* transitional virtio block */ +#define VIRTIO_TRANS_ID_BALLOON 1002/* transitional virtio balloon */ +#define VIRTIO_TRANS_ID_CONSOLE 1003/* transitional virtio console */ +#define VIRTIO_TRANS_ID_SCSI 1004/* transitional virtio SCSI */ +#define VIRTIO_TRANS_ID_RNG 1005/* transitional virtio rng */ +#define VIRTIO_TRANS_ID_9P 1009/* transitional virtio 9p console */ +#endif
Signature · 1 line
2.27.0
PATCH v2 2/2 vDPA/ifcvf: reuse pre-defined macros for device ids and vendor ids
In reply to Zhu LingshanThis commit would reuse pre-defined macros for ifcvf device ids and vendor ids
Signed-off-by Zhu Lingshan <[email protected]>
--- drivers/vdpa/ifcvf/ifcvf_base.h | 12 ------------ drivers/vdpa/ifcvf/ifcvf_main.c | 23 +++++++++++++---------- 2 files changed, 13 insertions(+), 22 deletions(-)
drivers/vdpa/ifcvf/ifcvf_base.h +0 -12
@@ -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
@@ -536,18 +536,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 }, };
Signature · 1 line
2.27.0