diff mbox series

[net-next,4/4] vmxnet3: update to version 9

Message ID 20240514182050.20931-5-ronak.doshi@broadcom.com (mailing list archive)
State Deferred
Delegated to: Netdev Maintainers
Headers show
Series vmxnet3: upgrade to version 9 | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 940 this patch: 940
netdev/build_tools success No tools touched, skip
netdev/cc_maintainers success CCed 6 of 6 maintainers
netdev/build_clang success Errors and warnings before: 936 this patch: 936
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 951 this patch: 951
netdev/checkpatch warning WARNING: line length of 82 exceeds 80 columns
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2024-05-15--09-00 (tests: 1020)

Commit Message

Ronak Doshi May 14, 2024, 6:20 p.m. UTC 
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>
---
 drivers/net/vmxnet3/vmxnet3_drv.c | 46 ++++++++-------------------------------
 drivers/net/vmxnet3/vmxnet3_int.h |  4 ++--
 2 files changed, 11 insertions(+), 39 deletions(-)

Comments

Simon Horman May 15, 2024, 10:49 a.m. UTC | #1 
On Tue, May 14, 2024 at 11:20:49AM -0700, Ronak Doshi wrote:
> 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>

...

> @@ -4019,42 +4019,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);

nit: Please consider using the BIT() macro.

> +			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 mbox series

Patch

diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 2eaa9204c38e..aeb7a4a4be1c 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -3952,7 +3952,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;
@@ -4019,42 +4019,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 31e8db568db2..9f24d66dbb27 100644
--- 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. */