Commit 02308d74 authored by Suresh Reddy's avatar Suresh Reddy Committed by David S. Miller
Browse files

be2net: fix incorrect setting of cmd_privileges for VFs

An earlier commit (f25b119c "Fix error messages while driver load for VFs")
incorrectly set the adapter->cmd_privileges value for VFs (in a
multi-channel config) to MAX_PRIVILEGES. This causes FW cmd failures
and avoidable error logs when certian cmds are issued by a VF.
Also, move the multi-channel hack to be_cmds.c inside
be_cmd_get_fn_privileges() routine.

Fixes: f25b119c

 "Fix error messages while driver load for VFs"
Signed-off-by: default avatarSuresh Reddy <suresh.reddy@emulex.com>
Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff32f8ab
...@@ -2691,6 +2691,13 @@ int be_cmd_get_fn_privileges(struct be_adapter *adapter, u32 *privilege, ...@@ -2691,6 +2691,13 @@ int be_cmd_get_fn_privileges(struct be_adapter *adapter, u32 *privilege,
struct be_cmd_resp_get_fn_privileges *resp = struct be_cmd_resp_get_fn_privileges *resp =
embedded_payload(wrb); embedded_payload(wrb);
*privilege = le32_to_cpu(resp->privilege_mask); *privilege = le32_to_cpu(resp->privilege_mask);
/* In UMC mode FW does not return right privileges.
* Override with correct privilege equivalent to PF.
*/
if (BEx_chip(adapter) && be_is_mc(adapter) &&
be_physfn(adapter))
*privilege = MAX_PRIVILEGES;
} }
err: err:
......
...@@ -1098,6 +1098,14 @@ struct be_cmd_resp_query_fw_cfg { ...@@ -1098,6 +1098,14 @@ struct be_cmd_resp_query_fw_cfg {
u32 function_caps; u32 function_caps;
}; };
/* Is BE in a multi-channel mode */
static inline bool be_is_mc(struct be_adapter *adapter)
{
return adapter->function_mode & FLEX10_MODE ||
adapter->function_mode & VNIC_MODE ||
adapter->function_mode & UMC_ENABLED;
}
/******************** RSS Config ****************************************/ /******************** RSS Config ****************************************/
/* RSS type Input parameters used to compute RX hash /* RSS type Input parameters used to compute RX hash
* RSS_ENABLE_IPV4 SRC IPv4, DST IPv4 * RSS_ENABLE_IPV4 SRC IPv4, DST IPv4
......
...@@ -121,12 +121,6 @@ static const char * const ue_status_hi_desc[] = { ...@@ -121,12 +121,6 @@ static const char * const ue_status_hi_desc[] = {
"Unknown" "Unknown"
}; };
/* Is BE in a multi-channel mode */
static inline bool be_is_mc(struct be_adapter *adapter) {
return (adapter->function_mode & FLEX10_MODE ||
adapter->function_mode & VNIC_MODE ||
adapter->function_mode & UMC_ENABLED);
}
static void be_queue_free(struct be_adapter *adapter, struct be_queue_info *q) static void be_queue_free(struct be_adapter *adapter, struct be_queue_info *q)
{ {
...@@ -3410,11 +3404,6 @@ static int be_setup(struct be_adapter *adapter) ...@@ -3410,11 +3404,6 @@ static int be_setup(struct be_adapter *adapter)
goto err; goto err;
be_cmd_get_fn_privileges(adapter, &adapter->cmd_privileges, 0); be_cmd_get_fn_privileges(adapter, &adapter->cmd_privileges, 0);
/* In UMC mode FW does not return right privileges.
* Override with correct privilege equivalent to PF.
*/
if (be_is_mc(adapter))
adapter->cmd_privileges = MAX_PRIVILEGES;
status = be_mac_setup(adapter); status = be_mac_setup(adapter);
if (status) if (status)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment