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

Commit 0b0e30c6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cpsw-host_port' 



Grygorii Strashko says:

====================
drivers: net: cpsw: fix ale calls and drop host_port field from cpsw_priv

This clean up series intended to:
 - fix port_mask parameters in ale calls and drop unnecessary shifts
 - drop host_port field from struct cpsw_priv
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61618eea 71a2cbb7

drivers/net/ethernet/ti/cpsw.c

+21 −31
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ struct cpsw_priv { 
	u32				coal_intvl;

	u32				bus_freq_mhz;

	int				rx_packet_max;

	int				host_port;

	struct clk			*clk;

	u8				mac_addr[ETH_ALEN];

	struct cpsw_slave		*slaves;
@@ -531,21 +530,18 @@ static const struct cpsw_stats cpsw_gstrings_stats[] = { 
			int slave_port = cpsw_get_slave_port(priv,	\

						slave->slave_num);	\

			cpsw_ale_add_mcast(priv->ale, addr,		\

				1 << slave_port | 1 << priv->host_port,	\

				1 << slave_port | ALE_PORT_HOST,	\

				ALE_VLAN, slave->port_vlan, 0);		\

		} else {						\

			cpsw_ale_add_mcast(priv->ale, addr,		\

				ALE_ALL_PORTS << priv->host_port,	\

				ALE_ALL_PORTS,				\

				0, 0, 0);				\

		}							\

	} while (0)



static inline int cpsw_get_slave_port(struct cpsw_priv *priv, u32 slave_num)

{

	if (priv->host_port == 0)

	return slave_num + 1;

	else

		return slave_num;

}



static void cpsw_set_promiscious(struct net_device *ndev, bool enable)
@@ -602,8 +598,7 @@ static void cpsw_set_promiscious(struct net_device *ndev, bool enable) 
			cpsw_ale_control_set(ale, 0, ALE_AGEOUT, 1);



			/* Clear all mcast from ALE */

			cpsw_ale_flush_multicast(ale, ALE_ALL_PORTS <<

						 priv->host_port, -1);

			cpsw_ale_flush_multicast(ale, ALE_ALL_PORTS, -1);



			/* Flood All Unicast Packets to Host port */

			cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1);
@@ -648,8 +643,7 @@ static void cpsw_ndo_set_rx_mode(struct net_device *ndev) 
	cpsw_ale_set_allmulti(priv->ale, priv->ndev->flags & IFF_ALLMULTI);



	/* Clear all mcast from ALE */

	cpsw_ale_flush_multicast(priv->ale, ALE_ALL_PORTS << priv->host_port,

				 vid);

	cpsw_ale_flush_multicast(priv->ale, ALE_ALL_PORTS, vid);



	if (!netdev_mc_empty(ndev)) {

		struct netdev_hw_addr *ha;
@@ -1092,7 +1086,7 @@ static inline void cpsw_add_dual_emac_def_ale_entries( 
		struct cpsw_priv *priv, struct cpsw_slave *slave,

		u32 slave_port)

{

	u32 port_mask = 1 << slave_port | 1 << priv->host_port;

	u32 port_mask = 1 << slave_port | ALE_PORT_HOST;



	if (priv->version == CPSW_VERSION_1)

		slave_write(slave, slave->port_vlan, CPSW1_PORT_VLAN);
@@ -1103,7 +1097,7 @@ static inline void cpsw_add_dual_emac_def_ale_entries( 
	cpsw_ale_add_mcast(priv->ale, priv->ndev->broadcast,

			   port_mask, ALE_VLAN, slave->port_vlan, 0);

	cpsw_ale_add_ucast(priv->ale, priv->mac_addr,

		priv->host_port, ALE_VLAN | ALE_SECURE, slave->port_vlan);

		HOST_PORT_NUM, ALE_VLAN | ALE_SECURE, slave->port_vlan);

}



static void soft_reset_slave(struct cpsw_slave *slave)
@@ -1172,7 +1166,6 @@ static void cpsw_slave_open(struct cpsw_slave *slave, struct cpsw_priv *priv) 
static inline void cpsw_add_default_vlan(struct cpsw_priv *priv)

{

	const int vlan = priv->data.default_vlan;

	const int port = priv->host_port;

	u32 reg;

	int i;

	int unreg_mcast_mask;
@@ -1190,9 +1183,9 @@ static inline void cpsw_add_default_vlan(struct cpsw_priv *priv) 
	else

		unreg_mcast_mask = ALE_PORT_1 | ALE_PORT_2;



	cpsw_ale_add_vlan(priv->ale, vlan, ALE_ALL_PORTS << port,

			  ALE_ALL_PORTS << port, ALE_ALL_PORTS << port,

			  unreg_mcast_mask << port);

	cpsw_ale_add_vlan(priv->ale, vlan, ALE_ALL_PORTS,

			  ALE_ALL_PORTS, ALE_ALL_PORTS,

			  unreg_mcast_mask);

}



static void cpsw_init_host_port(struct cpsw_priv *priv)
@@ -1205,7 +1198,7 @@ static void cpsw_init_host_port(struct cpsw_priv *priv) 
	cpsw_ale_start(priv->ale);



	/* switch to vlan unaware mode */

	cpsw_ale_control_set(priv->ale, priv->host_port, ALE_VLAN_AWARE,

	cpsw_ale_control_set(priv->ale, HOST_PORT_NUM, ALE_VLAN_AWARE,

			     CPSW_ALE_VLAN_AWARE);

	control_reg = readl(&priv->regs->control);

	control_reg |= CPSW_VLAN_AWARE;
@@ -1219,14 +1212,14 @@ static void cpsw_init_host_port(struct cpsw_priv *priv) 
		     &priv->host_port_regs->cpdma_tx_pri_map);

	__raw_writel(0, &priv->host_port_regs->cpdma_rx_chan_map);



	cpsw_ale_control_set(priv->ale, priv->host_port,

	cpsw_ale_control_set(priv->ale, HOST_PORT_NUM,

			     ALE_PORT_STATE, ALE_PORT_STATE_FORWARD);



	if (!priv->data.dual_emac) {

		cpsw_ale_add_ucast(priv->ale, priv->mac_addr, priv->host_port,

		cpsw_ale_add_ucast(priv->ale, priv->mac_addr, HOST_PORT_NUM,

				   0, 0);

		cpsw_ale_add_mcast(priv->ale, priv->ndev->broadcast,

				   1 << priv->host_port, 0, 0, ALE_MCAST_FWD_2);

				   ALE_PORT_HOST, 0, 0, ALE_MCAST_FWD_2);

	}

}
@@ -1273,8 +1266,7 @@ static int cpsw_ndo_open(struct net_device *ndev) 
		cpsw_add_default_vlan(priv);

	else

		cpsw_ale_add_vlan(priv->ale, priv->data.default_vlan,

				  ALE_ALL_PORTS << priv->host_port,

				  ALE_ALL_PORTS << priv->host_port, 0, 0);

				  ALE_ALL_PORTS, ALE_ALL_PORTS, 0, 0);



	if (!cpsw_common_res_usage_state(priv)) {

		struct cpsw_priv *priv_sl0 = cpsw_get_slave_priv(priv, 0);
@@ -1620,9 +1612,9 @@ static int cpsw_ndo_set_mac_address(struct net_device *ndev, void *p) 
		flags = ALE_VLAN;

	}



	cpsw_ale_del_ucast(priv->ale, priv->mac_addr, priv->host_port,

	cpsw_ale_del_ucast(priv->ale, priv->mac_addr, HOST_PORT_NUM,

			   flags, vid);

	cpsw_ale_add_ucast(priv->ale, addr->sa_data, priv->host_port,

	cpsw_ale_add_ucast(priv->ale, addr->sa_data, HOST_PORT_NUM,

			   flags, vid);



	memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
@@ -1666,12 +1658,12 @@ static inline int cpsw_add_vlan_ale_entry(struct cpsw_priv *priv, 
	}



	ret = cpsw_ale_add_vlan(priv->ale, vid, port_mask, 0, port_mask,

				unreg_mcast_mask << priv->host_port);

				unreg_mcast_mask);

	if (ret != 0)

		return ret;



	ret = cpsw_ale_add_ucast(priv->ale, priv->mac_addr,

				 priv->host_port, ALE_VLAN, vid);

				 HOST_PORT_NUM, ALE_VLAN, vid);

	if (ret != 0)

		goto clean_vid;
@@ -1683,7 +1675,7 @@ static inline int cpsw_add_vlan_ale_entry(struct cpsw_priv *priv, 


clean_vlan_ucast:

	cpsw_ale_del_ucast(priv->ale, priv->mac_addr,

			    priv->host_port, ALE_VLAN, vid);

			   HOST_PORT_NUM, ALE_VLAN, vid);

clean_vid:

	cpsw_ale_del_vlan(priv->ale, vid, 0);

	return ret;
@@ -1738,7 +1730,7 @@ static int cpsw_ndo_vlan_rx_kill_vid(struct net_device *ndev, 
		return ret;



	ret = cpsw_ale_del_ucast(priv->ale, priv->mac_addr,

				 priv->host_port, ALE_VLAN, vid);

				 HOST_PORT_NUM, ALE_VLAN, vid);

	if (ret != 0)

		return ret;
@@ -2152,7 +2144,6 @@ static int cpsw_probe_dual_emac(struct platform_device *pdev, 
	priv_sl2->bus_freq_mhz = priv->bus_freq_mhz;



	priv_sl2->regs = priv->regs;

	priv_sl2->host_port = priv->host_port;

	priv_sl2->host_port_regs = priv->host_port_regs;

	priv_sl2->wr_regs = priv->wr_regs;

	priv_sl2->hw_stats = priv->hw_stats;
@@ -2321,7 +2312,6 @@ static int cpsw_probe(struct platform_device *pdev) 
		goto clean_runtime_disable_ret;

	}

	priv->regs = ss_regs;

	priv->host_port = HOST_PORT_NUM;



	/* Need to enable clocks with runtime PM api to access module

	 * registers