iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxgb4: Add MPS TCAM refcounting for cxgb4 change mac

Browse Source 
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>
This commit is contained in:
Raju Rangoju 2019-06-24 23:05:34 +05:30 committed by David S. Miller
parent 5fab51581f
commit 2f0b9406f3
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
View File

@ -1911,6 +1911,10 @@ int cxgb4_set_msix_aff(struct adapter *adap, unsigned short vec,
cpumask_var_t *aff_mask, int idx); cpumask_var_t *aff_mask, int idx);
void cxgb4_clear_msix_aff(unsigned short vec, cpumask_var_t aff_mask); 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); int cxgb4_init_mps_ref_entries(struct adapter *adap);
void cxgb4_free_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, 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 lookup_type,
u8 port_id, u8 port_id,
bool sleep_ok); 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__ */ #endif /* __CXGB4_H__ */

14
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -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. * 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 cxgb4_change_mac(struct port_info *pi, unsigned int viid,
int *tcam_idx, const u8 *addr, bool persist, int *tcam_idx, const u8 *addr, bool persist,
u8 *smt_idx) u8 *smt_idx)
{ {
struct adapter *adapter = pi->adapter; struct adapter *adapter = pi->adapter;
struct hash_mac_addr *entry, *new_entry; 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, ret = t4_set_rxmode(pi->adapter, mb, pi->viid, dev->mtu, -1, -1, -1,
!!(dev->features & NETIF_F_HW_VLAN_CTAG_RX), true); !!(dev->features & NETIF_F_HW_VLAN_CTAG_RX), true);
if (ret == 0) if (ret == 0)
ret = cxgb4_change_mac(pi, pi->viid, &pi->xact_addr_filt, ret = cxgb4_update_mac_filt(pi, pi->viid, &pi->xact_addr_filt,
dev->dev_addr, true, &pi->smt_idx); dev->dev_addr, true, &pi->smt_idx);
if (ret == 0) if (ret == 0)
ret = t4_link_l1cfg(pi->adapter, mb, pi->tx_chan, ret = t4_link_l1cfg(pi->adapter, mb, pi->tx_chan,
&pi->link_cfg); &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)) if (!is_valid_ether_addr(addr->sa_data))
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
ret = cxgb4_change_mac(pi, pi->viid, &pi->xact_addr_filt, ret = cxgb4_update_mac_filt(pi, pi->viid, &pi->xact_addr_filt,
addr->sa_data, true, &pi->smt_idx); addr->sa_data, true, &pi->smt_idx);
if (ret < 0) if (ret < 0)
return ret; return ret;

15
drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c
View File

@ -54,6 +54,21 @@ unlock:
return ret; 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, int cxgb4_free_raw_mac_filt(struct adapter *adap,
unsigned int viid, unsigned int viid,
const u8 *addr, const u8 *addr,