* [PATCH net-next 1/2] nfp: update the old flash error message
2019-06-12 23:59 [PATCH net-next 0/2] nfp: add two user friendly errors Jakub Kicinski
@ 2019-06-12 23:59 ` Jakub Kicinski
2019-06-12 23:59 ` [PATCH net-next 2/2] nfp: print a warning when binding VFs to PF driver Jakub Kicinski
2019-06-15 2:18 ` [PATCH net-next 0/2] nfp: add two user friendly errors David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2019-06-12 23:59 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Jakub Kicinski, Dirk van der Merwe
Apparently there are still cards in the wild with a very old
management FW. Let's make the error message in that case
indicate more clearly that management firmware has to be
updated.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
---
drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c
index 42cf4fd875ea..9a08623c325d 100644
--- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c
@@ -241,11 +241,16 @@ static int nfp_nsp_check(struct nfp_nsp *state)
state->ver.major = FIELD_GET(NSP_STATUS_MAJOR, reg);
state->ver.minor = FIELD_GET(NSP_STATUS_MINOR, reg);
- if (state->ver.major != NSP_MAJOR || state->ver.minor < NSP_MINOR) {
+ if (state->ver.major != NSP_MAJOR) {
nfp_err(cpp, "Unsupported ABI %hu.%hu\n",
state->ver.major, state->ver.minor);
return -EINVAL;
}
+ if (state->ver.minor < NSP_MINOR) {
+ nfp_err(cpp, "ABI too old to support NIC operation (%u.%hu < %u.%u), please update the management FW on the flash\n",
+ NSP_MAJOR, state->ver.minor, NSP_MAJOR, NSP_MINOR);
+ return -EINVAL;
+ }
if (reg & NSP_STATUS_BUSY) {
nfp_err(cpp, "Service processor busy!\n");
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] nfp: print a warning when binding VFs to PF driver
2019-06-12 23:59 [PATCH net-next 0/2] nfp: add two user friendly errors Jakub Kicinski
2019-06-12 23:59 ` [PATCH net-next 1/2] nfp: update the old flash error message Jakub Kicinski
@ 2019-06-12 23:59 ` Jakub Kicinski
2019-06-15 2:18 ` [PATCH net-next 0/2] nfp: add two user friendly errors David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Jakub Kicinski @ 2019-06-12 23:59 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Jakub Kicinski, Dirk van der Merwe
Users sometimes mistakenly try to manually bind the PF driver
to the VFs, print a warning message in that case.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
---
drivers/net/ethernet/netronome/nfp/nfp_main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index 948d1a4b4643..60e57f08de80 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -596,6 +596,10 @@ static int nfp_pci_probe(struct pci_dev *pdev,
struct nfp_pf *pf;
int err;
+ if (pdev->vendor == PCI_VENDOR_ID_NETRONOME &&
+ pdev->device == PCI_DEVICE_ID_NETRONOME_NFP6000_VF)
+ dev_warn(&pdev->dev, "Binding NFP VF device to the NFP PF driver, the VF driver is called 'nfp_netvf'\n");
+
err = pci_enable_device(pdev);
if (err < 0)
return err;
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread