bnxt_en: clean up VLAN feature bit handling

The hardware VLAN offload feature on our NIC does not have separate
knobs for handling customer and service tags on RX. Either offloading
of both must be enabled or both must be disabled. Introduce definitions
for the combined feature set in order to clean up the code and make
this constraint more clear. Technically these features can be separately
enabled on TX, however, since the default is to turn both on, the
combined TX feature set is also introduced for code consistency.

Signed-off-by: Edwin Peer <edwin.peer@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 f3e45f3de88e92df06ab1ebff300d46beec7ff81..749dc7cf8d64dd9907969b65763c35245342c774 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -1614,7 +1614,7 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp,
                skb_set_hash(skb, tpa_info->rss_hash, tpa_info->hash_type);
 
        if ((tpa_info->flags2 & RX_CMP_FLAGS2_META_FORMAT_VLAN) &&
-           (skb->dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
+           (skb->dev->features & BNXT_HW_FEATURE_VLAN_ALL_RX)) {
                u16 vlan_proto = tpa_info->metadata >>
                        RX_CMP_FLAGS2_METADATA_TPID_SFT;
                u16 vtag = tpa_info->metadata & RX_CMP_FLAGS2_METADATA_TCI_MASK;
@@ -1832,7 +1832,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,
 
        if ((rxcmp1->rx_cmp_flags2 &
             cpu_to_le32(RX_CMP_FLAGS2_META_FORMAT_VLAN)) &&
-           (skb->dev->features & NETIF_F_HW_VLAN_CTAG_RX)) {
+           (skb->dev->features & BNXT_HW_FEATURE_VLAN_ALL_RX)) {
                u32 meta_data = le32_to_cpu(rxcmp1->rx_cmp_meta_data);
                u16 vtag = meta_data & RX_CMP_FLAGS2_METADATA_TCI_MASK;
                u16 vlan_proto = meta_data >> RX_CMP_FLAGS2_METADATA_TPID_SFT;
@@ -9932,24 +9932,16 @@ static netdev_features_t bnxt_fix_features(struct net_device *dev,
        /* Both CTAG and STAG VLAN accelaration on the RX side have to be
         * turned on or off together.
         */
-       vlan_features = features & (NETIF_F_HW_VLAN_CTAG_RX |
-                                   NETIF_F_HW_VLAN_STAG_RX);
-       if (vlan_features != (NETIF_F_HW_VLAN_CTAG_RX |
-                             NETIF_F_HW_VLAN_STAG_RX)) {
-               if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
-                       features &= ~(NETIF_F_HW_VLAN_CTAG_RX |
-                                     NETIF_F_HW_VLAN_STAG_RX);
+       vlan_features = features & BNXT_HW_FEATURE_VLAN_ALL_RX;
+       if (vlan_features != BNXT_HW_FEATURE_VLAN_ALL_RX) {
+               if (dev->features & BNXT_HW_FEATURE_VLAN_ALL_RX)
+                       features &= ~BNXT_HW_FEATURE_VLAN_ALL_RX;
                else if (vlan_features)
-                       features |= NETIF_F_HW_VLAN_CTAG_RX |
-                                   NETIF_F_HW_VLAN_STAG_RX;
+                       features |= BNXT_HW_FEATURE_VLAN_ALL_RX;
        }
 #ifdef CONFIG_BNXT_SRIOV
-       if (BNXT_VF(bp)) {
-               if (bp->vf.vlan) {
-                       features &= ~(NETIF_F_HW_VLAN_CTAG_RX |
-                                     NETIF_F_HW_VLAN_STAG_RX);
-               }
-       }
+       if (BNXT_VF(bp) && bp->vf.vlan)
+               features &= ~BNXT_HW_FEATURE_VLAN_ALL_RX;
 #endif
        return features;
 }
@@ -9972,7 +9964,7 @@ static int bnxt_set_features(struct net_device *dev, netdev_features_t features)
        if (bp->flags & BNXT_FLAG_NO_AGG_RINGS)
                flags &= ~BNXT_FLAG_TPA;
 
-       if (features & NETIF_F_HW_VLAN_CTAG_RX)
+       if (features & BNXT_HW_FEATURE_VLAN_ALL_RX)
                flags |= BNXT_FLAG_STRIP_VLAN;
 
        if (features & NETIF_F_NTUPLE)
@@ -12060,8 +12052,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM |
                                    NETIF_F_GSO_GRE_CSUM;
        dev->vlan_features = dev->hw_features | NETIF_F_HIGHDMA;
-       dev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_CTAG_TX |
-                           NETIF_F_HW_VLAN_STAG_RX | NETIF_F_HW_VLAN_STAG_TX;
+       dev->hw_features |= BNXT_HW_FEATURE_VLAN_ALL_RX |
+                           BNXT_HW_FEATURE_VLAN_ALL_TX;
        if (BNXT_SUPPORTS_TPA(bp))
                dev->hw_features |= NETIF_F_GRO_HW;
        dev->features |= dev->hw_features | NETIF_F_HIGHDMA;
@@ -12117,7 +12109,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        bnxt_fw_init_one_p3(bp);
 
-       if (dev->hw_features & NETIF_F_HW_VLAN_CTAG_RX)
+       if (dev->hw_features & BNXT_HW_FEATURE_VLAN_ALL_RX)
                bp->flags |= BNXT_FLAG_STRIP_VLAN;
 
        rc = bnxt_init_int_mode(bp);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 58909130ca4db95479b07f25a5e9b687c2abcfcd..13c40645f884bdd2f1f8a9dbef8c171a98bc8713 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1906,6 +1906,11 @@ struct bnxt {
 #define BNXT_PCIE_STATS_OFFSET(counter)                        \
        (offsetof(struct pcie_ctx_hw_stats, counter) / 8)
 
+#define BNXT_HW_FEATURE_VLAN_ALL_RX                            \
+       (NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX)
+#define BNXT_HW_FEATURE_VLAN_ALL_TX                            \
+       (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX)
+
 #define I2C_DEV_ADDR_A0                                0xa0
 #define I2C_DEV_ADDR_A2                                0xa2
 #define SFF_DIAG_SUPPORT_OFFSET                        0x5c