hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vmxnet3: update to version 7 

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

Signed-off-by: Ronak Doshi <doshir@vmware.com>
Acked-by: Guolin Yang <gyang@vmware.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Ronak Doshi 2022-06-07 20:23:53 -07:00 committed by Paolo Abeni
parent 60cafa0395
commit acc38e041b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/vmxnet3/vmxnet3_drv.c
View File

@ -3659,7 +3659,12 @@ vmxnet3_probe_device(struct pci_dev *pdev,
goto err_alloc_pci; goto err_alloc_pci;
ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_VRRS); ver = VMXNET3_READ_BAR1_REG(adapter, VMXNET3_REG_VRRS);
if (ver & (1 << VMXNET3_REV_6)) { 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_WRITE_BAR1_REG(adapter,
VMXNET3_REG_VRRS, VMXNET3_REG_VRRS,
1 << VMXNET3_REV_6); 1 << VMXNET3_REV_6);

4
drivers/net/vmxnet3/vmxnet3_int.h
View File

@ -69,12 +69,12 @@
/* /*
* Version numbers * Version numbers
*/ */
#define VMXNET3_DRIVER_VERSION_STRING "1.6.0.0-k" #define VMXNET3_DRIVER_VERSION_STRING "1.7.0.0-k"
/* Each byte of this 32-bit integer encodes a version number in /* Each byte of this 32-bit integer encodes a version number in
* VMXNET3_DRIVER_VERSION_STRING. * VMXNET3_DRIVER_VERSION_STRING.
*/ */
#define VMXNET3_DRIVER_VERSION_NUM 0x01060000 #define VMXNET3_DRIVER_VERSION_NUM 0x01070000
#if defined(CONFIG_PCI_MSI) #if defined(CONFIG_PCI_MSI)
/* RSS only makes sense if MSI-X is supported. */ /* RSS only makes sense if MSI-X is supported. */