Skip to contentSkip to conversation

update virtio id table

PATCH RESEND Superseded Zhu Lingshan 3 participants 6 messages May 31, 2021

Subsystems (5)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover update virtio id table

This series updates virtio id table by adding
transitional device ids. Then reuses the ids
in ifcvf driver

Zhu Lingshan (2):
virtio: update virtio id table, add transitional ids 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_ids.h | 12 ++++++++++++
 3 files changed, 25 insertions(+), 22 deletions(-)
Signature · 1 line
2.27.0
#1 lore raw

PATCH RESEND 1/2 virtio: update virtio id table, add transitional ids

This commit updates virtio id table by adding transitional device ids

---
 include/uapi/linux/virtio_ids.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
include/uapi/linux/virtio_ids.h +12 -0
index f0c35ce8628c..fcc9ec6a73c1 100644
@@ -57,4 +57,16 @@
 #define VIRTIO_ID_BT			28 /* virtio bluetooth */
 #define VIRTIO_ID_MAC80211_HWSIM	29 /* virtio mac80211-hwsim */
 
+/*
+ * 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 /* _LINUX_VIRTIO_IDS_H */
Signature · 1 line
2.27.0
#2 lore raw

Re: [PATCH RESEND 1/2] virtio: update virtio id table, add transitional ids

Quoted 19 lines · On Mon, 31 May 2021 15:27:42 +0800 Zhu Lingshan <[email protected]> wrote:

This commit updates virtio id table by adding transitional device ids

---
 include/uapi/linux/virtio_ids.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
include/uapi/linux/virtio_ids.h +3 -0
index f0c35ce8628c..fcc9ec6a73c1 100644
@@ -57,4 +57,16 @@
 #define VIRTIO_ID_BT			28 /* virtio bluetooth */
 #define VIRTIO_ID_MAC80211_HWSIM	29 /* virtio mac80211-hwsim */
 
+/*
+ * Virtio Transitional IDs
+ */

include/uapi/linux/virtio_ids.h line 72

Quoted 10 lines
include/uapi/linux/virtio_ids.h +9 -0
+
+#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 /* _LINUX_VIRTIO_IDS_H */

Isn't this a purely virtio-pci concept? (The spec lists the virtio ids in the common section, and those transitional ids in the pci section.) IOW, is there a better, virtio-pci specific, header for this?

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

#3 lore raw

Re: [PATCH RESEND 1/2] virtio: update virtio id table, add transitional ids

Quoted 19 lines · Cornelia Huck
Quoted 16 lines · On Mon, 31 May 2021 15:27:42 +0800 Zhu Lingshan <[email protected]> wrote:

This commit updates virtio id table by adding transitional device ids
virtio_pci_common.h

---
  include/uapi/linux/virtio_ids.h | 12 ++++++++++++
  1 file changed, 12 insertions(+)
include/uapi/linux/virtio_ids.h +0 -0
index f0c35ce8628c..fcc9ec6a73c1 100644
@@ -57,4 +57,16 @@
  #define VIRTIO_ID_BT			28 /* virtio bluetooth */
  #define VIRTIO_ID_MAC80211_HWSIM	29 /* virtio mac80211-hwsim */
 
Quoted 16 lines

include/uapi/linux/virtio_ids.h line 72

Quoted 13 lines
include/uapi/linux/virtio_ids.h +12 -0
+/*
+ * 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 /* _LINUX_VIRTIO_IDS_H */

Isn't this a purely virtio-pci concept? (The spec lists the virtio ids in the common section, and those transitional ids in the pci section.) IOW, is there a better, virtio-pci specific, header for this?

Hi Cornelia,

yes they are pure virtio-pci transitional concept. There is a virtio_pci.h, but not looks like a good place for these stuffs, Michael ever suggested to add these ids to virtio_ids.h, so I have chosen this file.

https://www.spinics.net/lists/netdev/msg739269.html

Thanks
Zhu Lingshan

Quoted 1 line
#4 lore raw

Re: [PATCH RESEND 1/2] virtio: update virtio id table, add transitional ids

Quoted 39 lines · Lingshan
Quoted 26 lines · Cornelia Huck
Quoted 23 lines · On Mon, 31 May 2021 15:27:42 +0800 Zhu Lingshan <[email protected]> wrote:

This commit updates virtio id table by adding transitional device ids
virtio_pci_common.h

---
  include/uapi/linux/virtio_ids.h | 12 ++++++++++++
  1 file changed, 12 insertions(+)
include/uapi/linux/virtio_ids.h +8 -0
index f0c35ce8628c..fcc9ec6a73c1 100644
@@ -57,4 +57,16 @@
  #define VIRTIO_ID_BT			28 /* virtio bluetooth */
  #define VIRTIO_ID_MAC80211_HWSIM	29 /* virtio mac80211-hwsim */
+/*
+ * 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 */
Quoted 8 lines

include/uapi/linux/virtio_ids.h line 72

Quoted 5 lines
include/uapi/linux/virtio_ids.h +4 -0
+#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 /* _LINUX_VIRTIO_IDS_H */

Isn't this a purely virtio-pci concept? (The spec lists the virtio ids in the common section, and those transitional ids in the pci section.) IOW, is there a better, virtio-pci specific, header for this?

Hi Cornelia,

Quoted 7 lines

yes they are pure virtio-pci transitional concept. There is a virtio_pci.h, but not looks like
a good place for these stuffs, Michael ever suggested to add these ids to virtio_ids.h, so I have
chosen this file.

https://www.spinics.net/lists/netdev/msg739269.html

Didn't think straight, virtio_pci.h is better.

Quoted 3 lines

Thanks
Zhu Lingshan

Quoted 1 line
#5 lore raw

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

In reply to Zhu Lingshan

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

---
 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
index 0111bfdeb342..ded1b1b5fb13 100644
@@ -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
index ab0ab5cf0f6e..bc1d59f316d1 100644
@@ -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