Commit 313b345c authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

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: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDinan Gunawardena <dinan.gunawardena@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 312fada1
...@@ -133,7 +133,7 @@ static int nfp_netvf_pci_probe(struct pci_dev *pdev, ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment