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

Commit 87e067cd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'arc_emac-next' 



Beniamino Galvani says:

====================
arc_emac: promiscuous/multicast mode and netpoll support

These patches add support for promiscuous mode, multicast filtering
and netpoll to the ARC EMAC driver.

They were both tested on a Radxa Rock board which uses a ARC EMAC IP
core integrated in the Rockchip RK3188 SoC.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ae8b42c6 5a45e57a

drivers/net/ethernet/arc/emac_main.c

+49 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 *		Vineet Gupta

 */



#include <linux/crc32.h>

#include <linux/etherdevice.h>

#include <linux/interrupt.h>

#include <linux/io.h>
@@ -362,6 +363,15 @@ static irqreturn_t arc_emac_intr(int irq, void *dev_instance) 
	return IRQ_HANDLED;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

static void arc_emac_poll_controller(struct net_device *dev)

{

	disable_irq(dev->irq);

	arc_emac_intr(dev->irq, dev);

	enable_irq(dev->irq);

}

#endif



/**

 * arc_emac_open - Open the network device.

 * @ndev:	Pointer to the network device.
@@ -450,6 +460,41 @@ static int arc_emac_open(struct net_device *ndev) 
	return 0;

}



/**

 * arc_emac_set_rx_mode - Change the receive filtering mode.

 * @ndev:	Pointer to the network device.

 *

 * This function enables/disables promiscuous or all-multicast mode

 * and updates the multicast filtering list of the network device.

 */

static void arc_emac_set_rx_mode(struct net_device *ndev)

{

	struct arc_emac_priv *priv = netdev_priv(ndev);



	if (ndev->flags & IFF_PROMISC) {

		arc_reg_or(priv, R_CTRL, PROM_MASK);

	} else {

		arc_reg_clr(priv, R_CTRL, PROM_MASK);



		if (ndev->flags & IFF_ALLMULTI) {

			arc_reg_set(priv, R_LAFL, ~0);

			arc_reg_set(priv, R_LAFH, ~0);

		} else {

			struct netdev_hw_addr *ha;

			unsigned int filter[2] = { 0, 0 };

			int bit;



			netdev_for_each_mc_addr(ha, ndev) {

				bit = ether_crc_le(ETH_ALEN, ha->addr) >> 26;

				filter[bit >> 5] |= 1 << (bit & 31);

			}



			arc_reg_set(priv, R_LAFL, filter[0]);

			arc_reg_set(priv, R_LAFH, filter[1]);

		}

	}

}



/**

 * arc_emac_stop - Close the network device.

 * @ndev:	Pointer to the network device.
@@ -620,6 +665,10 @@ static const struct net_device_ops arc_emac_netdev_ops = { 
	.ndo_start_xmit		= arc_emac_tx,

	.ndo_set_mac_address	= arc_emac_set_address,

	.ndo_get_stats		= arc_emac_stats,

	.ndo_set_rx_mode	= arc_emac_set_rx_mode,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= arc_emac_poll_controller,

#endif

};



static int arc_emac_probe(struct platform_device *pdev)