vmxnet3: update to version 9

With all vmxnet3 version 9 changes incorporated in the vmxnet3 driver,
the driver can configure emulation to run at vmxnet3 version 9, provided
the emulation advertises support for version 9.

Signed-off-by: Ronak Doshi <ronak.doshi@broadcom.com>
Acked-by: Guolin Yang <guolin.yang@broadcom.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240531193050.4132-5-ronak.doshi@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index e26d223a659fd9c559a78f245e839852448cef38..b16449671b8bed99e7f9f848178a3f3bd4115892 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -3951,7 +3951,7 @@ vmxnet3_probe_device(struct pci_dev *pdev,
        struct net_device *netdev;
        struct vmxnet3_adapter *adapter;
        u8 mac[ETH_ALEN];
-       int size;
+       int size, i;
        int num_tx_queues;
        int num_rx_queues;
        int queues;
@@ -4018,42 +4018,14 @@ vmxnet3_probe_device(struct pci_dev *pdev,
                goto err_alloc_pci;
 
        ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_VRRS);
-       if (ver & (1 << VMXNET3_REV_7)) {
-               VMXNET3_WRITE_BAR1_REG(adapter,
-                                      VMXNET3_REG_VRRS,
-                                      1 << VMXNET3_REV_7);
-               adapter->version = VMXNET3_REV_7 + 1;
-       } else if (ver & (1 << VMXNET3_REV_6)) {
-               VMXNET3_WRITE_BAR1_REG(adapter,
-                                      VMXNET3_REG_VRRS,
-                                      1 << VMXNET3_REV_6);
-               adapter->version = VMXNET3_REV_6 + 1;
-       } else if (ver & (1 << VMXNET3_REV_5)) {
-               VMXNET3_WRITE_BAR1_REG(adapter,
-                                      VMXNET3_REG_VRRS,
-                                      1 << VMXNET3_REV_5);
-               adapter->version = VMXNET3_REV_5 + 1;
-       } else if (ver & (1 << VMXNET3_REV_4)) {
-               VMXNET3_WRITE_BAR1_REG(adapter,
-                                      VMXNET3_REG_VRRS,
-                                      1 << VMXNET3_REV_4);
-               adapter->version = VMXNET3_REV_4 + 1;
-       } else if (ver & (1 << VMXNET3_REV_3)) {
-               VMXNET3_WRITE_BAR1_REG(adapter,
-                                      VMXNET3_REG_VRRS,
-                                      1 << VMXNET3_REV_3);
-               adapter->version = VMXNET3_REV_3 + 1;
-       } else if (ver & (1 << VMXNET3_REV_2)) {
-               VMXNET3_WRITE_BAR1_REG(adapter,
-                                      VMXNET3_REG_VRRS,
-                                      1 << VMXNET3_REV_2);
-               adapter->version = VMXNET3_REV_2 + 1;
-       } else if (ver & (1 << VMXNET3_REV_1)) {
-               VMXNET3_WRITE_BAR1_REG(adapter,
-                                      VMXNET3_REG_VRRS,
-                                      1 << VMXNET3_REV_1);
-               adapter->version = VMXNET3_REV_1 + 1;
-       } else {
+       for (i = VMXNET3_REV_9; i >= VMXNET3_REV_1; i--) {
+               if (ver & (1 << i)) {
+                       VMXNET3_WRITE_BAR1_REG(adapter, VMXNET3_REG_VRRS, 1 << i);
+                       adapter->version = i + 1;
+                       break;
+               }
+       }
+       if (i < VMXNET3_REV_1) {
                dev_err(&pdev->dev,
                        "Incompatible h/w version (0x%x) for adapter\n", ver);
                err = -EBUSY;

diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h
index 31e8db568db2bc5db2015916d76219303e05183b..9f24d66dbb27971b66bc7ac15083c61f67a0288a 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_int.h
+++ b/drivers/net/vmxnet3/vmxnet3_int.h
@@ -72,12 +72,12 @@
 /*
  * Version numbers
  */
-#define VMXNET3_DRIVER_VERSION_STRING   "1.7.0.0-k"
+#define VMXNET3_DRIVER_VERSION_STRING   "1.9.0.0-k"
 
 /* Each byte of this 32-bit integer encodes a version number in
  * VMXNET3_DRIVER_VERSION_STRING.
  */
-#define VMXNET3_DRIVER_VERSION_NUM      0x01070000
+#define VMXNET3_DRIVER_VERSION_NUM      0x01090000
 
 #if defined(CONFIG_PCI_MSI)
        /* RSS only makes sense if MSI-X is supported. */