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

Commit c893238e authored by Radu Bulie's avatar Radu Bulie Committed by David S. Miller
Browse files

dpaa_eth: Add allmulti option 



This patch adds allmulticast option for memac, dtsec
and 10GEC controllers.

Signed-off-by: default avatarRadu Bulie <radu-andrei.bulie@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 056a01ba

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+10 −0
Original line number Diff line number Diff line
@@ -454,6 +454,16 @@ static void dpaa_set_rx_mode(struct net_device *net_dev) 
				  err);

	}



	if (!!(net_dev->flags & IFF_ALLMULTI) != priv->mac_dev->allmulti) {

		priv->mac_dev->allmulti = !priv->mac_dev->allmulti;

		err = priv->mac_dev->set_allmulti(priv->mac_dev->fman_mac,

						  priv->mac_dev->allmulti);

		if (err < 0)

			netif_err(priv, drv, net_dev,

				  "mac_dev->set_allmulti() = %d\n",

				  err);

	}



	err = priv->mac_dev->set_multi(net_dev, priv->mac_dev);

	if (err < 0)

		netif_err(priv, drv, net_dev, "mac_dev->set_multi() = %d\n",

drivers/net/ethernet/freescale/fman/fman_dtsec.c

+19 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,25 @@ int dtsec_add_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr) 
	return 0;

}



int dtsec_set_allmulti(struct fman_mac *dtsec, bool enable)

{

	u32 tmp;

	struct dtsec_regs __iomem *regs = dtsec->regs;



	if (!is_init_done(dtsec->dtsec_drv_param))

		return -EINVAL;



	tmp = ioread32be(&regs->rctrl);

	if (enable)

		tmp |= RCTRL_MPROM;

	else

		tmp &= ~RCTRL_MPROM;



	iowrite32be(tmp, &regs->rctrl);



	return 0;

}



int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr)

{

	struct dtsec_regs __iomem *regs = dtsec->regs;

drivers/net/ethernet/freescale/fman/fman_dtsec.h

+1 −0
Original line number Diff line number Diff line
@@ -55,5 +55,6 @@ int dtsec_set_exception(struct fman_mac *dtsec, 
int dtsec_add_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr);

int dtsec_del_hash_mac_address(struct fman_mac *dtsec, enet_addr_t *eth_addr);

int dtsec_get_version(struct fman_mac *dtsec, u32 *mac_version);

int dtsec_set_allmulti(struct fman_mac *dtsec, bool enable);



#endif /* __DTSEC_H */

drivers/net/ethernet/freescale/fman/fman_memac.c

+30 −2
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ struct fman_mac { 
	struct fman_rev_info fm_rev_info;

	bool basex_if;

	struct phy_device *pcsphy;

	bool allmulti_enabled;

};



static void add_addr_in_paddr(struct memac_regs __iomem *regs, u8 *adr,
@@ -940,6 +941,29 @@ int memac_add_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) 
	return 0;

}



int memac_set_allmulti(struct fman_mac *memac, bool enable)

{

	u32 entry;

	struct memac_regs __iomem *regs = memac->regs;



	if (!is_init_done(memac->memac_drv_param))

		return -EINVAL;



	if (enable) {

		for (entry = 0; entry < HASH_TABLE_SIZE; entry++)

			iowrite32be(entry | HASH_CTRL_MCAST_EN,

				    &regs->hashtable_ctrl);

	} else {

		for (entry = 0; entry < HASH_TABLE_SIZE; entry++)

			iowrite32be(entry & ~HASH_CTRL_MCAST_EN,

				    &regs->hashtable_ctrl);

	}



	memac->allmulti_enabled = enable;



	return 0;

}



int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr)

{

	struct memac_regs __iomem *regs = memac->regs;
@@ -963,8 +987,12 @@ int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr) 
			break;

		}

	}



	if (!memac->allmulti_enabled) {

		if (list_empty(&memac->multicast_addr_hash->lsts[hash]))

		iowrite32be(hash & ~HASH_CTRL_MCAST_EN, &regs->hashtable_ctrl);

			iowrite32be(hash & ~HASH_CTRL_MCAST_EN,

				    &regs->hashtable_ctrl);

	}



	return 0;

}

drivers/net/ethernet/freescale/fman/fman_memac.h

+1 −0
Original line number Diff line number Diff line
@@ -57,5 +57,6 @@ int memac_set_exception(struct fman_mac *memac, 
			enum fman_mac_exceptions exception, bool enable);

int memac_add_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr);

int memac_del_hash_mac_address(struct fman_mac *memac, enet_addr_t *eth_addr);

int memac_set_allmulti(struct fman_mac *memac, bool enable);



#endif /* __MEMAC_H */