Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3733263 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'nfp-add-two-user-friendly-errors' 



Jakub Kicinski says:

====================
nfp: add two user friendly errors

This small series adds two error messages based on recent
bug reports which turned out not to be bugs..
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d42176c6 f767fc66

drivers/net/ethernet/netronome/nfp/nfp_main.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c

+6 −1
Original line number Diff line number Diff line
@@ -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");