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

Commit d244c892 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[TG3]: support for ethtool -C 



Add support for ethtool -C with verification of user parameters.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2ed4052

drivers/net/tg3.c

+63 −2
Original line number Diff line number Diff line
@@ -5117,7 +5117,7 @@ static void tg3_set_bdinfo(struct tg3 *tp, u32 bdinfo_addr, 
}



static void __tg3_set_rx_mode(struct net_device *);

static void tg3_set_coalesce(struct tg3 *tp, struct ethtool_coalesce *ec)

static void __tg3_set_coalesce(struct tg3 *tp, struct ethtool_coalesce *ec)

{

	tw32(HOSTCC_RXCOL_TICKS, ec->rx_coalesce_usecs);

	tw32(HOSTCC_TXCOL_TICKS, ec->tx_coalesce_usecs);
@@ -5460,7 +5460,7 @@ static int tg3_reset_hw(struct tg3 *tp) 
		udelay(10);

	}



	tg3_set_coalesce(tp, &tp->coal);

	__tg3_set_coalesce(tp, &tp->coal);



	/* set status block DMA address */

	tw32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH,
@@ -7821,6 +7821,60 @@ static int tg3_get_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) 
	return 0;

}



static int tg3_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec)

{

	struct tg3 *tp = netdev_priv(dev);

	u32 max_rxcoal_tick_int = 0, max_txcoal_tick_int = 0;

	u32 max_stat_coal_ticks = 0, min_stat_coal_ticks = 0;



	if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) {

		max_rxcoal_tick_int = MAX_RXCOAL_TICK_INT;

		max_txcoal_tick_int = MAX_TXCOAL_TICK_INT;

		max_stat_coal_ticks = MAX_STAT_COAL_TICKS;

		min_stat_coal_ticks = MIN_STAT_COAL_TICKS;

	}



	if ((ec->rx_coalesce_usecs > MAX_RXCOL_TICKS) ||

	    (ec->tx_coalesce_usecs > MAX_TXCOL_TICKS) ||

	    (ec->rx_max_coalesced_frames > MAX_RXMAX_FRAMES) ||

	    (ec->tx_max_coalesced_frames > MAX_TXMAX_FRAMES) ||

	    (ec->rx_coalesce_usecs_irq > max_rxcoal_tick_int) ||

	    (ec->tx_coalesce_usecs_irq > max_txcoal_tick_int) ||

	    (ec->rx_max_coalesced_frames_irq > MAX_RXCOAL_MAXF_INT) ||

	    (ec->tx_max_coalesced_frames_irq > MAX_TXCOAL_MAXF_INT) ||

	    (ec->stats_block_coalesce_usecs > max_stat_coal_ticks) ||

	    (ec->stats_block_coalesce_usecs < min_stat_coal_ticks))

		return -EINVAL;



	/* No rx interrupts will be generated if both are zero */

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

	    (ec->rx_max_coalesced_frames == 0))

		return -EINVAL;



	/* No tx interrupts will be generated if both are zero */

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

	    (ec->tx_max_coalesced_frames == 0))

		return -EINVAL;



	/* Only copy relevant parameters, ignore all others. */

	tp->coal.rx_coalesce_usecs = ec->rx_coalesce_usecs;

	tp->coal.tx_coalesce_usecs = ec->tx_coalesce_usecs;

	tp->coal.rx_max_coalesced_frames = ec->rx_max_coalesced_frames;

	tp->coal.tx_max_coalesced_frames = ec->tx_max_coalesced_frames;

	tp->coal.rx_coalesce_usecs_irq = ec->rx_coalesce_usecs_irq;

	tp->coal.tx_coalesce_usecs_irq = ec->tx_coalesce_usecs_irq;

	tp->coal.rx_max_coalesced_frames_irq = ec->rx_max_coalesced_frames_irq;

	tp->coal.tx_max_coalesced_frames_irq = ec->tx_max_coalesced_frames_irq;

	tp->coal.stats_block_coalesce_usecs = ec->stats_block_coalesce_usecs;



	if (netif_running(dev)) {

		tg3_full_lock(tp, 0);

		__tg3_set_coalesce(tp, &tp->coal);

		tg3_full_unlock(tp);

	}

	return 0;

}



static struct ethtool_ops tg3_ethtool_ops = {

	.get_settings		= tg3_get_settings,

	.set_settings		= tg3_set_settings,
@@ -7856,6 +7910,7 @@ static struct ethtool_ops tg3_ethtool_ops = { 
	.get_stats_count	= tg3_get_stats_count,

	.get_ethtool_stats	= tg3_get_ethtool_stats,

	.get_coalesce		= tg3_get_coalesce,

	.set_coalesce		= tg3_set_coalesce,

};



static void __devinit tg3_get_eeprom_size(struct tg3 *tp)
@@ -9800,6 +9855,12 @@ static void __devinit tg3_init_coal(struct tg3 *tp) 
		ec->tx_coalesce_usecs = LOW_TXCOL_TICKS_CLRTCKS;

		ec->tx_coalesce_usecs_irq = DEFAULT_TXCOAL_TICK_INT_CLRTCKS;

	}



	if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) {

		ec->rx_coalesce_usecs_irq = 0;

		ec->tx_coalesce_usecs_irq = 0;

		ec->stats_block_coalesce_usecs = 0;

	}

}



static int __devinit tg3_init_one(struct pci_dev *pdev,

drivers/net/tg3.h

+10 −0
Original line number Diff line number Diff line
@@ -879,31 +879,41 @@ 
#define  LOW_RXCOL_TICKS_CLRTCKS	 0x00000014

#define  DEFAULT_RXCOL_TICKS		 0x00000048

#define  HIGH_RXCOL_TICKS		 0x00000096

#define  MAX_RXCOL_TICKS		 0x000003ff

#define HOSTCC_TXCOL_TICKS		0x00003c0c

#define  LOW_TXCOL_TICKS		 0x00000096

#define  LOW_TXCOL_TICKS_CLRTCKS	 0x00000048

#define  DEFAULT_TXCOL_TICKS		 0x0000012c

#define  HIGH_TXCOL_TICKS		 0x00000145

#define  MAX_TXCOL_TICKS		 0x000003ff

#define HOSTCC_RXMAX_FRAMES		0x00003c10

#define  LOW_RXMAX_FRAMES		 0x00000005

#define  DEFAULT_RXMAX_FRAMES		 0x00000008

#define  HIGH_RXMAX_FRAMES		 0x00000012

#define  MAX_RXMAX_FRAMES		 0x000000ff

#define HOSTCC_TXMAX_FRAMES		0x00003c14

#define  LOW_TXMAX_FRAMES		 0x00000035

#define  DEFAULT_TXMAX_FRAMES		 0x0000004b

#define  HIGH_TXMAX_FRAMES		 0x00000052

#define  MAX_TXMAX_FRAMES		 0x000000ff

#define HOSTCC_RXCOAL_TICK_INT		0x00003c18

#define  DEFAULT_RXCOAL_TICK_INT	 0x00000019

#define  DEFAULT_RXCOAL_TICK_INT_CLRTCKS 0x00000014

#define  MAX_RXCOAL_TICK_INT		 0x000003ff

#define HOSTCC_TXCOAL_TICK_INT		0x00003c1c

#define  DEFAULT_TXCOAL_TICK_INT	 0x00000019

#define  DEFAULT_TXCOAL_TICK_INT_CLRTCKS 0x00000014

#define  MAX_TXCOAL_TICK_INT		 0x000003ff

#define HOSTCC_RXCOAL_MAXF_INT		0x00003c20

#define  DEFAULT_RXCOAL_MAXF_INT	 0x00000005

#define  MAX_RXCOAL_MAXF_INT		 0x000000ff

#define HOSTCC_TXCOAL_MAXF_INT		0x00003c24

#define  DEFAULT_TXCOAL_MAXF_INT	 0x00000005

#define  MAX_TXCOAL_MAXF_INT		 0x000000ff

#define HOSTCC_STAT_COAL_TICKS		0x00003c28

#define  DEFAULT_STAT_COAL_TICKS	 0x000f4240

#define  MAX_STAT_COAL_TICKS		 0xd693d400

#define  MIN_STAT_COAL_TICKS		 0x00000064

/* 0x3c2c --> 0x3c30 unused */

#define HOSTCC_STATS_BLK_HOST_ADDR	0x00003c30 /* 64-bit */

#define HOSTCC_STATUS_BLK_HOST_ADDR	0x00003c38 /* 64-bit */