diff options
| author | Zbigniew Bodek <zbb@FreeBSD.org> | 2016-03-31 16:44:32 +0000 |
|---|---|---|
| committer | Zbigniew Bodek <zbb@FreeBSD.org> | 2016-03-31 16:44:32 +0000 |
| commit | 4764669155dc74424293fdb96c17c0c83c746bfa (patch) | |
| tree | 83954bdc57948cb2bf2308afb0ff6b05dba4f99b /sys/dev/vnic | |
| parent | 5a8d10d7639fb5c02bd82b6592cca09381997973 (diff) | |
| download | src-4764669155dc74424293fdb96c17c0c83c746bfa.tar.gz src-4764669155dc74424293fdb96c17c0c83c746bfa.zip | |
Fix number of the enabled VFs in VNIC
nic->num_vf_en is set based on the number of the enabled LMACs.
This number should not be overwritten later by any routine.
Instead it should fail PCI_IOV_ADD_VF() so that available VFs
with the corresponding LMACs will attach whereas other, disabled
VFs will fail with the proper error code.
Error signaling (due to improper number of VFs requested) is also moved
from PCI_IOV_INIT() to PCI_IOV_ADD_VF().
This will be reworked when multiple queue sets are enabled but for
now this is the correct behavior of the driver.
Obtained from: Semihalf
Sponsored by: Cavium
Notes
Notes:
svn path=/head/; revision=297457
Diffstat (limited to 'sys/dev/vnic')
| -rw-r--r-- | sys/dev/vnic/nic_main.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/dev/vnic/nic_main.c b/sys/dev/vnic/nic_main.c index ca1b4d60dae5..ae0432678eb3 100644 --- a/sys/dev/vnic/nic_main.c +++ b/sys/dev/vnic/nic_main.c @@ -269,18 +269,9 @@ nicpf_iov_init(device_t dev, uint16_t num_vfs, const nvlist_t *params) nic = device_get_softc(dev); - nic->num_vf_en = 0; if (num_vfs == 0) return (ENXIO); - if (num_vfs > MAX_NUM_VFS_SUPPORTED) - return (EINVAL); - /* - * Just set variables here. - * The number of VFs will be written to configuration - * space later in PCI_ADD_VF(). - */ - nic->num_vf_en = num_vfs; nic->flags |= NIC_SRIOV_ENABLED; return (0); @@ -306,6 +297,9 @@ nicpf_iov_add_vf(device_t dev, uint16_t vfnum, const nvlist_t *params) if ((nic->flags & NIC_SRIOV_ENABLED) == 0) return (ENXIO); + if (vfnum > (nic->num_vf_en - 1)) + return (EINVAL); + if (nvlist_exists_binary(params, "mac-addr") != 0) { mac = nvlist_get_binary(params, "mac-addr", &size); bgx = NIC_GET_BGX_FROM_VF_LMAC_MAP(nic->vf_lmac_map[vfnum]); @@ -1094,11 +1088,8 @@ static int nic_sriov_init(device_t dev, struct nicpf *nic) } /* Fix-up the number of enabled VFs */ total_vf_cnt = pci_read_config(dev, iov_pos + PCIR_SRIOV_TOTAL_VFS, 2); - if (total_vf_cnt < nic->num_vf_en) - nic->num_vf_en = total_vf_cnt; - if (total_vf_cnt == 0) - return (0); + return (ENXIO); /* Attach SR-IOV */ pf_schema = pci_iov_schema_alloc_node(); @@ -1116,7 +1107,6 @@ static int nic_sriov_init(device_t dev, struct nicpf *nic) device_printf(dev, "Failed to initialize SR-IOV (error=%d)\n", err); - nic->num_vf_en = 0; return (err); } #endif |