qed: Define new MF bit for no_vlan config

The patch introduces a new Multi-Function bit for cases where firmware
shouldn't perform the insertion of vlan-0 tag. The new bit is defined to
abstract the implementation from the actual MF mode.

Signed-off-by: Sudarsana Reddy Kalluru <skalluru@marvell.com>
Signed-off-by: Ariel Elior <aelior@marvell.com>
Signed-off-by: Michal Kalderon <mkalderon@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 43a57ec296fd9c6e55ec667f34b6ddd98880e41f..512186adab003bfa555fb4ecacf6f8d058c17ce6 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -492,6 +492,9 @@ enum qed_mf_mode_bit {
 
        /* Allow DSCP to TC mapping */
        QED_MF_DSCP_TO_TC_MAP,
+
+       /* Do not insert a vlan tag with id 0 */
+       QED_MF_DONT_ADD_VLAN0_TAG,
 };
 
 enum qed_ufp_mode {

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index 69966dfc6e3d12f6b754dd94f0ca7fcc4018713f..5c6a276f69ac467cfcdb5e5c59b911ca1564d925 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -204,9 +204,7 @@ qed_dcbx_set_params(struct qed_dcbx_results *p_data,
        else
                p_data->arr[type].update = DONT_UPDATE_DCB_DSCP;
 
-       /* Do not add vlan tag 0 when DCB is enabled and port in UFP/OV mode */
-       if ((test_bit(QED_MF_8021Q_TAGGING, &p_hwfn->cdev->mf_bits) ||
-            test_bit(QED_MF_8021AD_TAGGING, &p_hwfn->cdev->mf_bits)))
+       if (test_bit(QED_MF_DONT_ADD_VLAN0_TAG, &p_hwfn->cdev->mf_bits))
                p_data->arr[type].dont_add_vlan0 = true;
 
        /* QM reconf data */

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index 9df8c4b3b54e3dc71fdca5a759a9d98b303d8ac7..1955737933522f5fd2932fdf24052e4ff48186ab 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -3157,12 +3157,14 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)
                        cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) |
                                        BIT(QED_MF_LLH_PROTO_CLSS) |
                                        BIT(QED_MF_UFP_SPECIFIC) |
-                                       BIT(QED_MF_8021Q_TAGGING);
+                                       BIT(QED_MF_8021Q_TAGGING) |
+                                       BIT(QED_MF_DONT_ADD_VLAN0_TAG);
                        break;
                case NVM_CFG1_GLOB_MF_MODE_BD:
                        cdev->mf_bits = BIT(QED_MF_OVLAN_CLSS) |
                                        BIT(QED_MF_LLH_PROTO_CLSS) |
-                                       BIT(QED_MF_8021AD_TAGGING);
+                                       BIT(QED_MF_8021AD_TAGGING) |
+                                       BIT(QED_MF_DONT_ADD_VLAN0_TAG);
                        break;
                case NVM_CFG1_GLOB_MF_MODE_NPAR1_0:
                        cdev->mf_bits = BIT(QED_MF_LLH_MAC_CLSS) |