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

Commit 5b0ced17 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: don't fail probe on pci_sriov_set_totalvfs() errors 



On machines with buggy ACPI tables or when SR-IOV is already enabled
we may not be able to set the SR-IOV VF limit in sysfs, it's not fatal
because the limit is imposed by the driver anyway.  Only the sysfs
'sriov_totalvfs' attribute will be too high.  Print an error to inform
user about the failure but allow probe to continue.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarDirk van der Merwe <dirk.vandermerwe@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b24dbfe9

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

+12 −8
Original line number Diff line number Diff line
@@ -236,11 +236,9 @@ static int nfp_pcie_sriov_read_nfd_limit(struct nfp_pf *pf) 
	int err;



	pf->limit_vfs = nfp_rtsym_read_le(pf->rtbl, "nfd_vf_cfg_max_vfs", &err);

	if (!err)

		return pci_sriov_set_totalvfs(pf->pdev, pf->limit_vfs);



	if (err) {

		/* For backwards compatibility if symbol not found allow all */

		pf->limit_vfs = ~0;

	/* Allow any setting for backwards compatibility if symbol not found */

		if (err == -ENOENT)

			return 0;
@@ -248,6 +246,12 @@ static int nfp_pcie_sriov_read_nfd_limit(struct nfp_pf *pf) 
		return err;

	}



	err = pci_sriov_set_totalvfs(pf->pdev, pf->limit_vfs);

	if (err)

		nfp_warn(pf->cpp, "Failed to set VF count in sysfs: %d\n", err);

	return 0;

}



static int nfp_pcie_sriov_enable(struct pci_dev *pdev, int num_vfs)

{

#ifdef CONFIG_PCI_IOV