Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f0b9406 authored by Raju Rangoju's avatar Raju Rangoju Committed by David S. Miller
Browse files

cxgb4: Add MPS TCAM refcounting for cxgb4 change mac 



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

Signed-off-by: default avatarRaju Rangoju <rajur@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5fab5158

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

+7 −0
Original line number Diff line number Diff line
@@ -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__ */

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+7 −7
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ 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 cxgb4_change_mac(struct port_info *pi, unsigned int viid,

		     int *tcam_idx, const u8 *addr, bool persist,

		     u8 *smt_idx)

{
@@ -505,7 +505,7 @@ 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,

		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,
@@ -3020,7 +3020,7 @@ 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,

	ret = cxgb4_update_mac_filt(pi, pi->viid, &pi->xact_addr_filt,

				    addr->sa_data, true, &pi->smt_idx);

	if (ret < 0)

		return ret;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_mps.c

+15 −0
Original line number Diff line number Diff line
@@ -54,6 +54,21 @@ static int cxgb4_mps_ref_inc(struct adapter *adap, const u8 *mac_addr, 
	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,