提交 d3d18312 编写于 作者: S Sathya Perla 提交者: David S. Miller

be2net: ignore get/set profile FW cmd failures

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: bec84e6b ("create optimal number of queues on SR-IOV config")
Reported-by: NEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: NSathya Perla <sathya.perla@emulex.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 7e32aa4d
......@@ -3342,22 +3342,17 @@ static int be_get_sriov_config(struct be_adapter *adapter)
{
struct device *dev = &adapter->pdev->dev;
struct be_resources res = {0};
int status, max_vfs, old_vfs;
status = be_cmd_get_profile_config(adapter, &res, 0);
if (status)
return status;
adapter->pool_res = res;
int max_vfs, old_vfs;
/* 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) {
max_vfs = pci_sriov_get_totalvfs(adapter->pdev);
res.max_vfs = max_vfs > 0 ? min(MAX_VFS, max_vfs) : 0;
}
adapter->pool_res.max_vfs = res.max_vfs;
pci_sriov_set_totalvfs(adapter->pdev, be_max_vfs(adapter));
adapter->pool_res = res;
if (!be_max_vfs(adapter)) {
if (num_vfs)
......@@ -3366,6 +3361,8 @@ static int be_get_sriov_config(struct be_adapter *adapter)
return 0;
}
pci_sriov_set_totalvfs(adapter->pdev, be_max_vfs(adapter));
/* validate num_vfs module param */
old_vfs = pci_num_vf(adapter->pdev);
if (old_vfs) {
......@@ -3423,26 +3420,17 @@ static int be_get_resources(struct be_adapter *adapter)
return 0;
}
static int be_get_config(struct be_adapter *adapter)
static void be_sriov_config(struct be_adapter *adapter)
{
u16 profile_id;
struct device *dev = &adapter->pdev->dev;
int status;
status = be_cmd_query_fw_cfg(adapter);
if (status)
return status;
if (be_physfn(adapter)) {
status = be_cmd_get_active_profile(adapter, &profile_id);
if (!status)
dev_info(&adapter->pdev->dev,
"Using profile 0x%x\n", profile_id);
}
if (!BE2_chip(adapter) && be_physfn(adapter)) {
status = be_get_sriov_config(adapter);
if (status)
return status;
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
......@@ -3452,15 +3440,34 @@ static int be_get_config(struct be_adapter *adapter)
* resources. This facility is not available in BE3 FW.
* Also, this is done by FW in Lancer chip.
*/
if (!pci_num_vf(adapter->pdev)) {
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)
return status;
dev_err(dev, "Failed to optimize SR-IOV resources\n");
}
}
static int be_get_config(struct be_adapter *adapter)
{
u16 profile_id;
int status;
status = be_cmd_query_fw_cfg(adapter);
if (status)
return status;
if (be_physfn(adapter)) {
status = be_cmd_get_active_profile(adapter, &profile_id);
if (!status)
dev_info(&adapter->pdev->dev,
"Using profile 0x%x\n", profile_id);
}
if (!BE2_chip(adapter) && be_physfn(adapter))
be_sriov_config(adapter);
status = be_get_resources(adapter);
if (status)
return status;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册