UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfp: drop support for old firmware ABIs 

Be more strict about FW versions.  Drop support for old
transitional revisions which were never used in production.
Dropping support for FW ABI version 0.0.0.0 is particularly
useful because 0 could just be uninitialized memory.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2016-09-07 19:45:36 +01:00 committed by David S. Miller
parent 312fada1f9
commit 313b345cbf
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c
View File

@ -133,7 +133,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
} }
nfp_net_get_fw_version(&fw_ver, ctrl_bar); nfp_net_get_fw_version(&fw_ver, ctrl_bar);
if (fw_ver.class != NFP_NET_CFG_VERSION_CLASS_GENERIC) { if (fw_ver.resv || fw_ver.class != NFP_NET_CFG_VERSION_CLASS_GENERIC) {
dev_err(&pdev->dev, "Unknown Firmware ABI %d.%d.%d.%d\n", dev_err(&pdev->dev, "Unknown Firmware ABI %d.%d.%d.%d\n",
fw_ver.resv, fw_ver.class, fw_ver.major, fw_ver.minor); fw_ver.resv, fw_ver.class, fw_ver.major, fw_ver.minor);
err = -EINVAL; err = -EINVAL;
@ -141,9 +141,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev,
} }
/* Determine stride */ /* Determine stride */
if (nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 0) || if (nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 1)) {
nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0, 1) ||
nfp_net_fw_ver_eq(&fw_ver, 0, 0, 0x12, 0x48)) {
stride = 2; stride = 2;
tx_bar_no = NFP_NET_Q0_BAR; tx_bar_no = NFP_NET_Q0_BAR;
rx_bar_no = NFP_NET_Q1_BAR; rx_bar_no = NFP_NET_Q1_BAR;