[dpdk-dev,V2,1/2] net/virtio: support modern device id

Message ID 1475051112-5108-1-git-send-email-jasowang@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: Yuanhan Liu
Headers

Commit Message

Jason Wang Sept. 28, 2016, 8:25 a.m. UTC
  Add modern device id and rename VIRTIO_PCI_DEVICEID_MIN to
VIRTIO_PCI_LEGACY_DEVICEID_NET. While at it, remove unused macros too.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c | 3 ++-
 drivers/net/virtio/virtio_pci.h    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
  

Comments

Maxime Coquelin Sept. 29, 2016, 12:38 p.m. UTC | #1
On 09/28/2016 10:25 AM, Jason Wang wrote:
> Add modern device id and rename VIRTIO_PCI_DEVICEID_MIN to
> VIRTIO_PCI_LEGACY_DEVICEID_NET. While at it, remove unused macros too.
>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
>  drivers/net/virtio/virtio_ethdev.c | 3 ++-
>  drivers/net/virtio/virtio_pci.h    | 4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)

Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>

Thanks,
Maxime
  
Yuanhan Liu Oct. 11, 2016, 4:14 a.m. UTC | #2
On Wed, Sep 28, 2016 at 04:25:11PM +0800, Jason Wang wrote:
> Add modern device id and rename VIRTIO_PCI_DEVICEID_MIN to
> VIRTIO_PCI_LEGACY_DEVICEID_NET. While at it, remove unused macros too.
> 
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Series applied to dpdk-next-virtio.

Thanks.

	--yliu
  

Patch

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index ef0d6ee..bb6181d 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -103,7 +103,8 @@  static int virtio_dev_queue_stats_mapping_set(
  * The set of PCI devices this driver supports
  */
 static const struct rte_pci_id pci_id_virtio_map[] = {
-	{ RTE_PCI_DEVICE(VIRTIO_PCI_VENDORID, VIRTIO_PCI_DEVICEID_MIN) },
+	{ RTE_PCI_DEVICE(VIRTIO_PCI_VENDORID, VIRTIO_PCI_LEGACY_DEVICEID_NET) },
+	{ RTE_PCI_DEVICE(VIRTIO_PCI_VENDORID, VIRTIO_PCI_MODERN_DEVICEID_NET) },
 	{ .vendor_id = 0, /* sentinel */ },
 };
 
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index dd7693f..3430a39 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -44,8 +44,8 @@  struct virtnet_ctl;
 
 /* VirtIO PCI vendor/device ID. */
 #define VIRTIO_PCI_VENDORID     0x1AF4
-#define VIRTIO_PCI_DEVICEID_MIN 0x1000
-#define VIRTIO_PCI_DEVICEID_MAX 0x103F
+#define VIRTIO_PCI_LEGACY_DEVICEID_NET 0x1000
+#define VIRTIO_PCI_MODERN_DEVICEID_NET 0x1041
 
 /* VirtIO ABI version, this must match exactly. */
 #define VIRTIO_PCI_ABI_VERSION 0