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

Commit 9836f408 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6

parents e364a341 6d84b986

drivers/net/sfc/efx.c

+1 −1
Original line number Diff line number Diff line 
/****************************************************************************

 * Driver for Solarflare Solarstorm network controllers and boards

 * Copyright 2005-2006 Fen Systems Ltd.

 * Copyright 2005-2009 Solarflare Communications Inc.

 * Copyright 2005-2011 Solarflare Communications Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published

drivers/net/sfc/efx.h

+1 −1
Original line number Diff line number Diff line 
/****************************************************************************

 * Driver for Solarflare Solarstorm network controllers and boards

 * Copyright 2005-2006 Fen Systems Ltd.

 * Copyright 2006-2009 Solarflare Communications Inc.

 * Copyright 2006-2010 Solarflare Communications Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published

drivers/net/sfc/ethtool.c

+23 −4
Original line number Diff line number Diff line 
/****************************************************************************

 * Driver for Solarflare Solarstorm network controllers and boards

 * Copyright 2005-2006 Fen Systems Ltd.

 * Copyright 2006-2009 Solarflare Communications Inc.

 * Copyright 2006-2010 Solarflare Communications Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published
@@ -28,7 +28,8 @@ struct efx_ethtool_stat { 
	enum {

		EFX_ETHTOOL_STAT_SOURCE_mac_stats,

		EFX_ETHTOOL_STAT_SOURCE_nic,

		EFX_ETHTOOL_STAT_SOURCE_channel

		EFX_ETHTOOL_STAT_SOURCE_channel,

		EFX_ETHTOOL_STAT_SOURCE_tx_queue

	} source;

	unsigned offset;

	u64(*get_stat) (void *field); /* Reader function */
@@ -86,6 +87,10 @@ static u64 efx_get_atomic_stat(void *field) 
	EFX_ETHTOOL_STAT(field, channel, n_##field,		\

			 unsigned int, efx_get_uint_stat)



#define EFX_ETHTOOL_UINT_TXQ_STAT(field)			\

	EFX_ETHTOOL_STAT(tx_##field, tx_queue, field,		\

			 unsigned int, efx_get_uint_stat)



static struct efx_ethtool_stat efx_ethtool_stats[] = {

	EFX_ETHTOOL_U64_MAC_STAT(tx_bytes),

	EFX_ETHTOOL_U64_MAC_STAT(tx_good_bytes),
@@ -116,6 +121,10 @@ static struct efx_ethtool_stat efx_ethtool_stats[] = { 
	EFX_ETHTOOL_ULONG_MAC_STAT(tx_non_tcpudp),

	EFX_ETHTOOL_ULONG_MAC_STAT(tx_mac_src_error),

	EFX_ETHTOOL_ULONG_MAC_STAT(tx_ip_src_error),

	EFX_ETHTOOL_UINT_TXQ_STAT(tso_bursts),

	EFX_ETHTOOL_UINT_TXQ_STAT(tso_long_headers),

	EFX_ETHTOOL_UINT_TXQ_STAT(tso_packets),

	EFX_ETHTOOL_UINT_TXQ_STAT(pushes),

	EFX_ETHTOOL_U64_MAC_STAT(rx_bytes),

	EFX_ETHTOOL_U64_MAC_STAT(rx_good_bytes),

	EFX_ETHTOOL_U64_MAC_STAT(rx_bad_bytes),
@@ -237,7 +246,7 @@ static void efx_ethtool_get_drvinfo(struct net_device *net_dev, 
	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));

	strlcpy(info->version, EFX_DRIVER_VERSION, sizeof(info->version));

	if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0)

		siena_print_fwver(efx, info->fw_version,

		efx_mcdi_print_fwver(efx, info->fw_version,

				     sizeof(info->fw_version));

	strlcpy(info->bus_info, pci_name(efx->pci_dev), sizeof(info->bus_info));

}
@@ -470,6 +479,7 @@ static void efx_ethtool_get_stats(struct net_device *net_dev, 
	struct efx_mac_stats *mac_stats = &efx->mac_stats;

	struct efx_ethtool_stat *stat;

	struct efx_channel *channel;

	struct efx_tx_queue *tx_queue;

	struct rtnl_link_stats64 temp;

	int i;
@@ -495,6 +505,15 @@ static void efx_ethtool_get_stats(struct net_device *net_dev, 
				data[i] += stat->get_stat((void *)channel +

							  stat->offset);

			break;

		case EFX_ETHTOOL_STAT_SOURCE_tx_queue:

			data[i] = 0;

			efx_for_each_channel(channel, efx) {

				efx_for_each_channel_tx_queue(tx_queue, channel)

					data[i] +=

						stat->get_stat((void *)tx_queue

							       + stat->offset);

			}

			break;

		}

	}

}

drivers/net/sfc/falcon.c

+6 −16
Original line number Diff line number Diff line 
/****************************************************************************

 * Driver for Solarflare Solarstorm network controllers and boards

 * Copyright 2005-2006 Fen Systems Ltd.

 * Copyright 2006-2009 Solarflare Communications Inc.

 * Copyright 2006-2010 Solarflare Communications Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published
@@ -1478,36 +1478,26 @@ static void falcon_init_rx_cfg(struct efx_nic *efx) 
	/* RX control FIFO thresholds (32 entries) */

	const unsigned ctrl_xon_thr = 20;

	const unsigned ctrl_xoff_thr = 25;

	/* RX data FIFO thresholds (256-byte units; size varies) */

	int data_xon_thr = efx_nic_rx_xon_thresh >> 8;

	int data_xoff_thr = efx_nic_rx_xoff_thresh >> 8;

	efx_oword_t reg;



	efx_reado(efx, &reg, FR_AZ_RX_CFG);

	if (efx_nic_rev(efx) <= EFX_REV_FALCON_A1) {

		/* Data FIFO size is 5.5K */

		if (data_xon_thr < 0)

			data_xon_thr = 512 >> 8;

		if (data_xoff_thr < 0)

			data_xoff_thr = 2048 >> 8;

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_DESC_PUSH_EN, 0);

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_USR_BUF_SIZE,

				    huge_buf_size);

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_MAC_TH, data_xon_thr);

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_MAC_TH, data_xoff_thr);

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_MAC_TH, 512 >> 8);

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_MAC_TH, 2048 >> 8);

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XON_TX_TH, ctrl_xon_thr);

		EFX_SET_OWORD_FIELD(reg, FRF_AA_RX_XOFF_TX_TH, ctrl_xoff_thr);

	} else {

		/* Data FIFO size is 80K; register fields moved */

		if (data_xon_thr < 0)

			data_xon_thr = 27648 >> 8; /* ~3*max MTU */

		if (data_xoff_thr < 0)

			data_xoff_thr = 54272 >> 8; /* ~80Kb - 3*max MTU */

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_DESC_PUSH_EN, 0);

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_USR_BUF_SIZE,

				    huge_buf_size);

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_MAC_TH, data_xon_thr);

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_MAC_TH, data_xoff_thr);

		/* Send XON and XOFF at ~3 * max MTU away from empty/full */

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_MAC_TH, 27648 >> 8);

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_MAC_TH, 54272 >> 8);

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XON_TX_TH, ctrl_xon_thr);

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_XOFF_TX_TH, ctrl_xoff_thr);

		EFX_SET_OWORD_FIELD(reg, FRF_BZ_RX_INGR_EN, 1);

drivers/net/sfc/falcon_boards.c

+1 −1
Original line number Diff line number Diff line 
/****************************************************************************

 * Driver for Solarflare Solarstorm network controllers and boards

 * Copyright 2007-2009 Solarflare Communications Inc.

 * Copyright 2007-2010 Solarflare Communications Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published