cxgb4: Add MPS TCAM refcounting for cxgb4 change mac

This patch adds TCAM reference counting
support for cxgb4 change mac path

Signed-off-by: Raju Rangoju <rajur@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index c7ab57fd03be111d33403aa528fa1d7fa8b7cce8..6260240743d5611d076c840974f00fdf20ac7e27 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1911,6 +1911,10 @@ int cxgb4_set_msix_aff(struct adapter *adap, unsigned short vec,
                       cpumask_var_t *aff_mask, int idx);
 void cxgb4_clear_msix_aff(unsigned short vec, cpumask_var_t aff_mask);
 
+int cxgb4_change_mac(struct port_info *pi, unsigned int viid,
+                    int *tcam_idx, const u8 *addr,
+                    bool persistent, u8 *smt_idx);
+
 int cxgb4_init_mps_ref_entries(struct adapter *adap);
 void cxgb4_free_mps_ref_entries(struct adapter *adap);
 int cxgb4_alloc_encap_mac_filt(struct adapter *adap, unsigned int viid,
@@ -1935,5 +1939,8 @@ int cxgb4_alloc_raw_mac_filt(struct adapter *adap,
                             u8 lookup_type,
                             u8 port_id,
                             bool sleep_ok);
+int cxgb4_update_mac_filt(struct port_info *pi, unsigned int viid,
+                         int *tcam_idx, const u8 *addr,
+                         bool persistent, u8 *smt_idx);
 
 #endif /* __CXGB4_H__ */

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 4632827f05ba16502afd98a1ca2c6e3a9f4bd8b9..1520e52942896f90eb19cd8dfdc8094face469a5 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -449,9 +449,9 @@ static int set_rxmode(struct net_device *dev, int mtu, bool sleep_ok)
  *     Addresses are programmed to hash region, if tcam runs out of entries.
  *
  */
-static int cxgb4_change_mac(struct port_info *pi, unsigned int viid,
-                           int *tcam_idx, const u8 *addr, bool persist,
-                           u8 *smt_idx)
+int cxgb4_change_mac(struct port_info *pi, unsigned int viid,
+                    int *tcam_idx, const u8 *addr, bool persist,
+                    u8 *smt_idx)
 {
        struct adapter *adapter = pi->adapter;
        struct hash_mac_addr *entry, *new_entry;
@@ -505,8 +505,8 @@ static int link_start(struct net_device *dev)
        ret = t4_set_rxmode(pi->adapter, mb, pi->viid, dev->mtu, -1, -1, -1,
                            !!(dev->features & NETIF_F_HW_VLAN_CTAG_RX), true);
        if (ret == 0)
-               ret = cxgb4_change_mac(pi, pi->viid, &pi->xact_addr_filt,
-                                      dev->dev_addr, true, &pi->smt_idx);
+               ret = cxgb4_update_mac_filt(pi, pi->viid, &pi->xact_addr_filt,
+                                           dev->dev_addr, true, &pi->smt_idx);
        if (ret == 0)
                ret = t4_link_l1cfg(pi->adapter, mb, pi->tx_chan,
                                    &pi->link_cfg);
@@ -3020,8 +3020,8 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p)
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
 
-       ret = cxgb4_change_mac(pi, pi->viid, &pi->xact_addr_filt,
-                              addr->sa_data, true, &pi->smt_idx);
+       ret = cxgb4_update_mac_filt(pi, pi->viid, &pi->xact_addr_filt,
+                                   addr->sa_data, true, &pi->smt_idx);
        if (ret < 0)
                return ret;
 

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c
index b942748c7dfaf5264c5feae22f3af476116282c4..067217c6ca05431866527541748cebd45d0a3c8b 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c
@@ -54,6 +54,21 @@ unlock:
        return ret;
 }
 
+int cxgb4_update_mac_filt(struct port_info *pi, unsigned int viid,
+                         int *tcam_idx, const u8 *addr,
+                         bool persistent, u8 *smt_idx)
+{
+       int ret;
+
+       ret = cxgb4_change_mac(pi, viid, tcam_idx,
+                              addr, persistent, smt_idx);
+       if (ret < 0)
+               return ret;
+
+       cxgb4_mps_ref_inc(pi->adapter, addr, *tcam_idx, NULL);
+       return ret;
+}
+
 int cxgb4_free_raw_mac_filt(struct adapter *adap,
                            unsigned int viid,
                            const u8 *addr,