bnxt_en: Support QOS and TPID settings for the SRIOV VLAN

Add these missing settings in the .ndo_set_vf_vlan() method.
Older firmware does not support the TPID setting so check for
proper support.

Remove the unused BNXT_VF_QOS flag.

Signed-off-by: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 7104237272de42b45a0297136a4c484561058f9c..d0a255bd71daf1636f74caf21fb95a25f09718d9 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -7750,6 +7750,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)
                bp->fw_cap |= BNXT_FW_CAP_HOT_RESET_IF;
        if (BNXT_PF(bp) && (flags_ext & FUNC_QCAPS_RESP_FLAGS_EXT_FW_LIVEPATCH_SUPPORTED))
                bp->fw_cap |= BNXT_FW_CAP_LIVEPATCH;
+       if (BNXT_PF(bp) && (flags_ext & FUNC_QCAPS_RESP_FLAGS_EXT_DFLT_VLAN_TPID_PCP_SUPPORTED))
+               bp->fw_cap |= BNXT_FW_CAP_DFLT_VLAN_TPID_PCP;
 
        flags_ext2 = le32_to_cpu(resp->flags_ext2);
        if (flags_ext2 & FUNC_QCAPS_RESP_FLAGS_EXT2_RX_ALL_PKTS_TIMESTAMPS_SUPPORTED)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 43a07d84f815873bb1428ae3d041e89b7de37814..ae03c5ba83adac2fd81b6ba0c7518e2f1950a423 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1135,7 +1135,6 @@ struct bnxt_vf_info {
        u16     vlan;
        u16     func_qcfg_flags;
        u32     flags;
-#define BNXT_VF_QOS            0x1
 #define BNXT_VF_SPOOFCHK       0x2
 #define BNXT_VF_LINK_FORCED    0x4
 #define BNXT_VF_LINK_UP                0x8
@@ -2014,6 +2013,7 @@ struct bnxt {
        #define BNXT_FW_CAP_DBG_QCAPS                   BIT_ULL(31)
        #define BNXT_FW_CAP_PTP                         BIT_ULL(32)
        #define BNXT_FW_CAP_THRESHOLD_TEMP_SUPPORTED    BIT_ULL(33)
+       #define BNXT_FW_CAP_DFLT_VLAN_TPID_PCP          BIT_ULL(34)
 
        u32                     fw_dbg_cap;
 

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
index dde327f2c57ee76553d39247775a3e29991248fd..98c167ff0ffbf0c2a70a7a0ddfe92b3460feb98a 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -15,6 +15,7 @@
 #include <linux/if_vlan.h>
 #include <linux/interrupt.h>
 #include <linux/etherdevice.h>
+#include <net/dcbnl.h>
 #include "bnxt_hsi.h"
 #include "bnxt.h"
 #include "bnxt_hwrm.h"
@@ -196,11 +197,8 @@ int bnxt_get_vf_config(struct net_device *dev, int vf_id,
                memcpy(&ivi->mac, vf->vf_mac_addr, ETH_ALEN);
        ivi->max_tx_rate = vf->max_tx_rate;
        ivi->min_tx_rate = vf->min_tx_rate;
-       ivi->vlan = vf->vlan;
-       if (vf->flags & BNXT_VF_QOS)
-               ivi->qos = vf->vlan >> VLAN_PRIO_SHIFT;
-       else
-               ivi->qos = 0;
+       ivi->vlan = vf->vlan & VLAN_VID_MASK;
+       ivi->qos = vf->vlan >> VLAN_PRIO_SHIFT;
        ivi->spoofchk = !!(vf->flags & BNXT_VF_SPOOFCHK);
        ivi->trusted = bnxt_is_trusted_vf(bp, vf);
        if (!(vf->flags & BNXT_VF_LINK_FORCED))
@@ -256,21 +254,21 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos,
        if (bp->hwrm_spec_code < 0x10201)
                return -ENOTSUPP;
 
-       if (vlan_proto != htons(ETH_P_8021Q))
+       if (vlan_proto != htons(ETH_P_8021Q) &&
+           (vlan_proto != htons(ETH_P_8021AD) ||
+            !(bp->fw_cap & BNXT_FW_CAP_DFLT_VLAN_TPID_PCP)))
                return -EPROTONOSUPPORT;
 
        rc = bnxt_vf_ndo_prep(bp, vf_id);
        if (rc)
                return rc;
 
-       /* TODO: needed to implement proper handling of user priority,
-        * currently fail the command if there is valid priority
-        */
-       if (vlan_id > 4095 || qos)
+       if (vlan_id >= VLAN_N_VID || qos >= IEEE_8021Q_MAX_PRIORITIES ||
+           (!vlan_id && qos))
                return -EINVAL;
 
        vf = &bp->pf.vf[vf_id];
-       vlan_tag = vlan_id;
+       vlan_tag = vlan_id | (u16)qos << VLAN_PRIO_SHIFT;
        if (vlan_tag == vf->vlan)
                return 0;
 
@@ -279,6 +277,10 @@ int bnxt_set_vf_vlan(struct net_device *dev, int vf_id, u16 vlan_id, u8 qos,
                req->fid = cpu_to_le16(vf->fw_fid);
                req->dflt_vlan = cpu_to_le16(vlan_tag);
                req->enables = cpu_to_le32(FUNC_CFG_REQ_ENABLES_DFLT_VLAN);
+               if (bp->fw_cap & BNXT_FW_CAP_DFLT_VLAN_TPID_PCP) {
+                       req->enables |= cpu_to_le32(FUNC_CFG_REQ_ENABLES_TPID);
+                       req->tpid = vlan_proto;
+               }
                rc = hwrm_req_send(bp, req);
                if (!rc)
                        vf->vlan = vlan_tag;