Commit 66064dbc authored by Suresh Reddy's avatar Suresh Reddy Committed by David S. Miller
Browse files

be2net: fix qnq mode detection on VFs

The driver (on PF or VF) needs to detect if the function is in qnq mode for
a HW hack in be_rx_compl_get() to work.

The driver queries this information using the GET_PROFILE_CONFIG cmd
(since the commit below can caused this regression.) But this cmd is not
available on VFs and so the VFs fail to detect qnq mode. This causes
vlan traffic to not work.

The fix is to use the the adapter->function_mode value queried via
QUERY_FIRMWARE_CONFIG cmd on both PFs and VFs to detect the qnq mode.

Also QNQ_MODE was incorrectly named FLEX10_MODE; correcting that too as the
fix reads much better with the name change.

Fixes: f93f160b

 ("refactor multi-channel config code for Skyhawk-R chip")
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 a72e1541
...@@ -557,9 +557,7 @@ static inline u16 be_max_qs(struct be_adapter *adapter) ...@@ -557,9 +557,7 @@ static inline u16 be_max_qs(struct be_adapter *adapter)
#define be_pvid_tagging_enabled(adapter) (adapter->pvid) #define be_pvid_tagging_enabled(adapter) (adapter->pvid)
/* Is BE in QNQ multi-channel mode */ /* Is BE in QNQ multi-channel mode */
#define be_is_qnq_mode(adapter) (adapter->mc_type == FLEX10 || \ #define be_is_qnq_mode(adapter) (adapter->function_mode & QNQ_MODE)
adapter->mc_type == vNIC1 || \
adapter->mc_type == UFP)
#define lancer_chip(adapter) (adapter->pdev->device == OC_DEVICE_ID3 || \ #define lancer_chip(adapter) (adapter->pdev->device == OC_DEVICE_ID3 || \
adapter->pdev->device == OC_DEVICE_ID4) adapter->pdev->device == OC_DEVICE_ID4)
......
...@@ -1091,7 +1091,7 @@ struct be_cmd_resp_modify_eq_delay { ...@@ -1091,7 +1091,7 @@ struct be_cmd_resp_modify_eq_delay {
* based on the skew/IPL. * based on the skew/IPL.
*/ */
#define RDMA_ENABLED 0x4 #define RDMA_ENABLED 0x4
#define FLEX10_MODE 0x400 #define QNQ_MODE 0x400
#define VNIC_MODE 0x20000 #define VNIC_MODE 0x20000
#define UMC_ENABLED 0x1000000 #define UMC_ENABLED 0x1000000
struct be_cmd_req_query_fw_cfg { struct be_cmd_req_query_fw_cfg {
......
...@@ -3254,9 +3254,9 @@ err: ...@@ -3254,9 +3254,9 @@ err:
static u8 be_convert_mc_type(u32 function_mode) static u8 be_convert_mc_type(u32 function_mode)
{ {
if (function_mode & VNIC_MODE && function_mode & FLEX10_MODE) if (function_mode & VNIC_MODE && function_mode & QNQ_MODE)
return vNIC1; return vNIC1;
else if (function_mode & FLEX10_MODE) else if (function_mode & QNQ_MODE)
return FLEX10; return FLEX10;
else if (function_mode & VNIC_MODE) else if (function_mode & VNIC_MODE)
return vNIC2; return vNIC2;
......
Markdown is supported
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