GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-11 01:00:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

be2net: ignore get/set profile FW cmd failures

Browse source 
Old versions of BE3 FW may not support cmds to re-provision (and hence
optimize) resources/queues in SR-IOV config. Do not treat this FW cmd
failure as fatal and fail the function initialization. Instead, just
enable SR-IOV with the resources provided by the FW.

Prior to the "create optimal number of queues on SR-IOV config" patch
such failures were ignored.
Fixes: bec84e6b2 ("create optimal number of queues on SR-IOV config")

Reported-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sathya Perla 2014-08-01 17:47:30 +05:30 • committed by David S. Miller
parent 7e32aa4d8c
commit d3d183126d
1 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
drivers/net/ethernet/emulex/benet/be_main.c
View file

@ -3342,22 +3342,17 @@ static int be_get_sriov_config(struct be_adapter *adapter)
{ {
struct device *dev = &adapter->pdev->dev; struct device *dev = &adapter->pdev->dev;
struct be_resources res = {0}; struct be_resources res = {0};
int status, max_vfs, old_vfs; int max_vfs, old_vfs;
status = be_cmd_get_profile_config(adapter, &res, 0);
if (status)
return status;
adapter->pool_res = res;
/* Some old versions of BE3 FW don't report max_vfs value */ /* Some old versions of BE3 FW don't report max_vfs value */
be_cmd_get_profile_config(adapter, &res, 0);
if (BE3_chip(adapter) && !res.max_vfs) { if (BE3_chip(adapter) && !res.max_vfs) {
max_vfs = pci_sriov_get_totalvfs(adapter->pdev); max_vfs = pci_sriov_get_totalvfs(adapter->pdev);
res.max_vfs = max_vfs > 0 ? min(MAX_VFS, max_vfs) : 0; res.max_vfs = max_vfs > 0 ? min(MAX_VFS, max_vfs) : 0;
} }
adapter->pool_res.max_vfs = res.max_vfs; adapter->pool_res = res;
pci_sriov_set_totalvfs(adapter->pdev, be_max_vfs(adapter));
if (!be_max_vfs(adapter)) { if (!be_max_vfs(adapter)) {
if (num_vfs) if (num_vfs)
@ -3366,6 +3361,8 @@ static int be_get_sriov_config(struct be_adapter *adapter)
return 0; return 0;
} }
pci_sriov_set_totalvfs(adapter->pdev, be_max_vfs(adapter));
/* validate num_vfs module param */ /* validate num_vfs module param */
old_vfs = pci_num_vf(adapter->pdev); old_vfs = pci_num_vf(adapter->pdev);
if (old_vfs) { if (old_vfs) {
@ -3423,6 +3420,35 @@ static int be_get_resources(struct be_adapter *adapter)
return 0; return 0;
} }
static void be_sriov_config(struct be_adapter *adapter)
{
struct device *dev = &adapter->pdev->dev;
int status;
status = be_get_sriov_config(adapter);
if (status) {
dev_err(dev, "Failed to query SR-IOV configuration\n");
dev_err(dev, "SR-IOV cannot be enabled\n");
return;
}
/* When the HW is in SRIOV capable configuration, the PF-pool
* resources are equally distributed across the max-number of
* VFs. The user may request only a subset of the max-vfs to be
* enabled. Based on num_vfs, redistribute the resources across
* num_vfs so that each VF will have access to more number of
* resources. This facility is not available in BE3 FW.
* Also, this is done by FW in Lancer chip.
*/
if (be_max_vfs(adapter) && !pci_num_vf(adapter->pdev)) {
status = be_cmd_set_sriov_config(adapter,
adapter->pool_res,
adapter->num_vfs);
if (status)
dev_err(dev, "Failed to optimize SR-IOV resources\n");
}
}
static int be_get_config(struct be_adapter *adapter) static int be_get_config(struct be_adapter *adapter)
{ {
u16 profile_id; u16 profile_id;
@ -3439,27 +3465,8 @@ static int be_get_config(struct be_adapter *adapter)
"Using profile 0x%x\n", profile_id); "Using profile 0x%x\n", profile_id);
} }
if (!BE2_chip(adapter) && be_physfn(adapter)) { if (!BE2_chip(adapter) && be_physfn(adapter))
status = be_get_sriov_config(adapter); be_sriov_config(adapter);
if (status)
return status;
/* When the HW is in SRIOV capable configuration, the PF-pool
* resources are equally distributed across the max-number of
* VFs. The user may request only a subset of the max-vfs to be
* enabled. Based on num_vfs, redistribute the resources across
* num_vfs so that each VF will have access to more number of
* resources. This facility is not available in BE3 FW.
* Also, this is done by FW in Lancer chip.
*/
if (!pci_num_vf(adapter->pdev)) {
status = be_cmd_set_sriov_config(adapter,
adapter->pool_res,
adapter->num_vfs);
if (status)
return status;
}
}
status = be_get_resources(adapter); status = be_get_resources(adapter);
if (status) if (status)