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

Commit 21828163 authored by Ayaz Abdulla's avatar Ayaz Abdulla Committed by Jeff Garzik
Browse files

forcedeth: statistics optimization 



This patch optimizes the data paths that can support hw counters. It
removes the sw counted statistics.

This is the last patch for the optimization set. Bumping up version of
driver.

Signed-Off-By: default avatarAyaz Abdulla <aabdulla@nvidia.com>

Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 57fff698

drivers/net/forcedeth.c

+17 −21
Original line number Original line Diff line number Diff line
@@ -111,6 +111,7 @@ 
 *	0.57: 14 May 2006: Mac address set in probe/remove and order corrections.

 *	0.57: 14 May 2006: Mac address set in probe/remove and order corrections.

 *	0.58: 30 Oct 2006: Added support for sideband management unit.

 *	0.58: 30 Oct 2006: Added support for sideband management unit.

 *	0.59: 30 Oct 2006: Added support for recoverable error.

 *	0.59: 30 Oct 2006: Added support for recoverable error.

 *	0.60: 20 Jan 2007: Code optimizations for rings, rx & tx data paths, and stats.

 *

 *

 * Known bugs:

 * Known bugs:

 * We suspect that on some hardware no TX done interrupts are generated.

 * We suspect that on some hardware no TX done interrupts are generated.
@@ -127,7 +128,7 @@ 
#else

#else

#define DRIVERNAPI

#define DRIVERNAPI

#endif

#endif

#define FORCEDETH_VERSION		"0.59"

#define FORCEDETH_VERSION		"0.60"

#define DRV_NAME			"forcedeth"

#define DRV_NAME			"forcedeth"





#include <linux/module.h>

#include <linux/module.h>
@@ -1351,10 +1352,19 @@ static struct net_device_stats *nv_get_stats(struct net_device *dev) 
{

{

	struct fe_priv *np = netdev_priv(dev);

	struct fe_priv *np = netdev_priv(dev);





	/* It seems that the nic always generates interrupts and doesn't

	/* If the nic supports hw counters then retrieve latest values */

	 * accumulate errors internally. Thus the current values in np->stats

	if (np->driver_data & (DEV_HAS_STATISTICS_V1|DEV_HAS_STATISTICS_V2)) {

	 * are already up to date.

		nv_get_hw_stats(dev);

	 */



		/* copy to net_device stats */

		np->stats.tx_bytes = np->estats.tx_bytes;

		np->stats.tx_fifo_errors = np->estats.tx_fifo_errors;

		np->stats.tx_carrier_errors = np->estats.tx_carrier_errors;

		np->stats.rx_crc_errors = np->estats.rx_crc_errors;

		np->stats.rx_over_errors = np->estats.rx_over_errors;

		np->stats.rx_errors = np->estats.rx_errors_total;

		np->stats.tx_errors = np->estats.tx_errors_total;

	}

	return &np->stats;

	return &np->stats;

}

}
@@ -1944,16 +1954,8 @@ static void nv_tx_done_optimized(struct net_device *dev, int limit) 
		np->get_tx_ctx->dma = 0;

		np->get_tx_ctx->dma = 0;





		if (flags & NV_TX2_LASTPACKET) {

		if (flags & NV_TX2_LASTPACKET) {

			if (flags & NV_TX2_ERROR) {

			if (!(flags & NV_TX2_ERROR))

				if (flags & NV_TX2_UNDERFLOW)

					np->stats.tx_fifo_errors++;

				if (flags & NV_TX2_CARRIERLOST)

					np->stats.tx_carrier_errors++;

				np->stats.tx_errors++;

			} else {

				np->stats.tx_packets++;

				np->stats.tx_packets++;

				np->stats.tx_bytes += np->get_tx_ctx->skb->len;

			}

			dev_kfree_skb_any(np->get_tx_ctx->skb);

			dev_kfree_skb_any(np->get_tx_ctx->skb);

			np->get_tx_ctx->skb = NULL;

			np->get_tx_ctx->skb = NULL;

		}

		}
@@ -2290,7 +2292,6 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit) 
				if (flags & NV_RX2_ERROR4) {

				if (flags & NV_RX2_ERROR4) {

					len = nv_getlen(dev, skb->data, len);

					len = nv_getlen(dev, skb->data, len);

					if (len < 0) {

					if (len < 0) {

						np->stats.rx_errors++;

						dev_kfree_skb(skb);

						dev_kfree_skb(skb);

						goto next_pkt;

						goto next_pkt;

					}

					}
@@ -2303,11 +2304,6 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit) 
				}

				}

				/* the rest are hard errors */

				/* the rest are hard errors */

				else {

				else {

					if (flags & NV_RX2_CRCERR)

						np->stats.rx_crc_errors++;

					if (flags & NV_RX2_OVERFLOW)

						np->stats.rx_over_errors++;

					np->stats.rx_errors++;

					dev_kfree_skb(skb);

					dev_kfree_skb(skb);

					goto next_pkt;

					goto next_pkt;

				}

				}