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

Commit 147ef3e2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'systemport-irq-coalesce' 



Florian Fainelli says:

====================
net: systemport: interrupt coalescing support

This patch series adds support for RX & TX interrupt coalescing in the
systemport driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a2029240 d0634868

drivers/net/ethernet/broadcom/bcmsysport.c

+63 −0
Original line number Diff line number Diff line
@@ -456,6 +456,67 @@ static int bcm_sysport_set_wol(struct net_device *dev, 
	return 0;

}



static int bcm_sysport_get_coalesce(struct net_device *dev,

				    struct ethtool_coalesce *ec)

{

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	u32 reg;



	reg = tdma_readl(priv, TDMA_DESC_RING_INTR_CONTROL(0));



	ec->tx_coalesce_usecs = (reg >> RING_TIMEOUT_SHIFT) * 8192 / 1000;

	ec->tx_max_coalesced_frames = reg & RING_INTR_THRESH_MASK;



	reg = rdma_readl(priv, RDMA_MBDONE_INTR);



	ec->rx_coalesce_usecs = (reg >> RDMA_TIMEOUT_SHIFT) * 8192 / 1000;

	ec->rx_max_coalesced_frames = reg & RDMA_INTR_THRESH_MASK;



	return 0;

}



static int bcm_sysport_set_coalesce(struct net_device *dev,

				    struct ethtool_coalesce *ec)

{

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	unsigned int i;

	u32 reg;



	/* Base system clock is 125Mhz, DMA timeout is this reference clock

	 * divided by 1024, which yield roughly 8.192 us, our maximum value has

	 * to fit in the RING_TIMEOUT_MASK (16 bits).

	 */

	if (ec->tx_max_coalesced_frames > RING_INTR_THRESH_MASK ||

	    ec->tx_coalesce_usecs > (RING_TIMEOUT_MASK * 8) + 1 ||

	    ec->rx_max_coalesced_frames > RDMA_INTR_THRESH_MASK ||

	    ec->rx_coalesce_usecs > (RDMA_TIMEOUT_MASK * 8) + 1)

		return -EINVAL;



	if ((ec->tx_coalesce_usecs == 0 && ec->tx_max_coalesced_frames == 0) ||

	    (ec->rx_coalesce_usecs == 0 && ec->rx_max_coalesced_frames == 0))

		return -EINVAL;



	for (i = 0; i < dev->num_tx_queues; i++) {

		reg = tdma_readl(priv, TDMA_DESC_RING_INTR_CONTROL(i));

		reg &= ~(RING_INTR_THRESH_MASK |

			 RING_TIMEOUT_MASK << RING_TIMEOUT_SHIFT);

		reg |= ec->tx_max_coalesced_frames;

		reg |= DIV_ROUND_UP(ec->tx_coalesce_usecs * 1000, 8192) <<

			 RING_TIMEOUT_SHIFT;

		tdma_writel(priv, reg, TDMA_DESC_RING_INTR_CONTROL(i));

	}



	reg = rdma_readl(priv, RDMA_MBDONE_INTR);

	reg &= ~(RDMA_INTR_THRESH_MASK |

		 RDMA_TIMEOUT_MASK << RDMA_TIMEOUT_SHIFT);

	reg |= ec->rx_max_coalesced_frames;

	reg |= DIV_ROUND_UP(ec->rx_coalesce_usecs * 1000, 8192) <<

			    RDMA_TIMEOUT_SHIFT;

	rdma_writel(priv, reg, RDMA_MBDONE_INTR);



	return 0;

}



static void bcm_sysport_free_cb(struct bcm_sysport_cb *cb)

{

	dev_kfree_skb_any(cb->skb);
@@ -1641,6 +1702,8 @@ static struct ethtool_ops bcm_sysport_ethtool_ops = { 
	.get_sset_count		= bcm_sysport_get_sset_count,

	.get_wol		= bcm_sysport_get_wol,

	.set_wol		= bcm_sysport_set_wol,

	.get_coalesce		= bcm_sysport_get_coalesce,

	.set_coalesce		= bcm_sysport_set_coalesce,

};



static const struct net_device_ops bcm_sysport_netdev_ops = {

drivers/net/ethernet/broadcom/bcmsysport.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ struct bcm_rsb { 
#define RDMA_END_ADDR_LO		0x102c



#define RDMA_MBDONE_INTR		0x1030

#define  RDMA_INTR_THRESH_MASK		0xff

#define  RDMA_INTR_THRESH_MASK		0x1ff

#define  RDMA_TIMEOUT_SHIFT		16

#define  RDMA_TIMEOUT_MASK		0xffff