Commit 0ab602e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [netdrvr] ewrk3: correct card detection bug
  cxgb3 - fix white spaces in drivers/net/Kconfig
  myri10ge: update driver version to 1.3.0-1.226
  myri10ge: fix management of >4kB allocated pages
  myri10ge: update wcfifo and intr_coal_delay default values
  myri10ge: Serverworks HT2100 provides aligned PCIe completion
  mv643xx_eth: add mv643xx_eth_shutdown function
  SAA9730: Fix large pile of warnings
  Revert "ucc_geth: returns NETDEV_TX_BUSY when BD ring is full"
  cxgb3 - T3B2 pcie config space
  cxgb3 - Fix potential MAC hang
  cxgb3 - Auto-load FW if mismatch detected
  cxgb3 - fix ethtool cmd on multiple queues port
  Fix return code in pci-skeleton.c
  skge: use per-port phy locking
  skge: mask irqs when device down
  skge: deadlock on tx timeout
  [PATCH] airo: Fix an error path memory leak
  [PATCH] bcm43xx: MANUALWLAN fixes
parents 105fd108 991b5557

drivers/net/Kconfig

+13 −12
Original line number Diff line number Diff line
@@ -2374,6 +2374,7 @@ config CHELSIO_T1_NAPI 
config CHELSIO_T3

	tristate "Chelsio Communications T3 10Gb Ethernet support"

	depends on PCI

	select FW_LOADER

	help

	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet

	  adapters.

drivers/net/cxgb3/common.h

+15 −0
Original line number Diff line number Diff line
@@ -260,6 +260,10 @@ struct mac_stats { 
	unsigned long serdes_signal_loss;

	unsigned long xaui_pcs_ctc_err;

	unsigned long xaui_pcs_align_change;



	unsigned long num_toggled; /* # times toggled TxEn due to stuck TX */

	unsigned long num_resets;  /* # times reset due to stuck TX */



};



struct tp_mib_stats {
@@ -400,6 +404,12 @@ struct adapter_params { 
	unsigned int rev;	/* chip revision */

};



enum {					    /* chip revisions */

	T3_REV_A  = 0,

	T3_REV_B  = 2,

	T3_REV_B2 = 3,

};



struct trace_params {

	u32 sip;

	u32 sip_mask;
@@ -465,6 +475,10 @@ struct cmac { 
	struct adapter *adapter;

	unsigned int offset;

	unsigned int nucast;	/* # of address filters for unicast MACs */

	unsigned int tcnt;

	unsigned int xcnt;

	unsigned int toggle_cnt;

	unsigned int txen;

	struct mac_stats stats;

};
@@ -666,6 +680,7 @@ int t3_mac_set_address(struct cmac *mac, unsigned int idx, u8 addr[6]); 
int t3_mac_set_num_ucast(struct cmac *mac, int n);

const struct mac_stats *t3_mac_update_stats(struct cmac *mac);

int t3_mac_set_speed_duplex_fc(struct cmac *mac, int speed, int duplex, int fc);

int t3b2_mac_watchdog_task(struct cmac *mac);



void t3_mc5_prep(struct adapter *adapter, struct mc5 *mc5, int mode);

int t3_mc5_init(struct mc5 *mc5, unsigned int nservers, unsigned int nfilters,

drivers/net/cxgb3/cxgb3_main.c

+81 −9
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/workqueue.h>

#include <linux/proc_fs.h>

#include <linux/rtnetlink.h>

#include <linux/firmware.h>

#include <asm/uaccess.h>



#include "common.h"
@@ -707,6 +708,28 @@ static void bind_qsets(struct adapter *adap) 
	}

}



#define FW_FNAME "t3fw-%d.%d.bin"



static int upgrade_fw(struct adapter *adap)

{

	int ret;

	char buf[64];

	const struct firmware *fw;

	struct device *dev = &adap->pdev->dev;



	snprintf(buf, sizeof(buf), FW_FNAME, FW_VERSION_MAJOR,

		 FW_VERSION_MINOR);

	ret = request_firmware(&fw, buf, dev);

	if (ret < 0) {

		dev_err(dev, "could not upgrade firmware: unable to load %s\n",

			buf);

		return ret;

	}

	ret = t3_load_fw(adap, fw->data, fw->size);

	release_firmware(fw);

	return ret;

}



/**

 *	cxgb_up - enable the adapter

 *	@adapter: adapter being enabled
@@ -723,6 +746,8 @@ static int cxgb_up(struct adapter *adap) 


	if (!(adap->flags & FULL_INIT_DONE)) {

		err = t3_check_fw_version(adap);

		if (err == -EINVAL)

			err = upgrade_fw(adap);

		if (err)

			goto out;
@@ -1031,7 +1056,11 @@ static char stats_strings[][ETH_GSTRING_LEN] = { 
	"VLANinsertions     ",

	"TxCsumOffload      ",

	"RxCsumGood         ",

	"RxDrops            "

	"RxDrops            ",



	"CheckTXEnToggled   ",

	"CheckResets        ",



};



static int get_stats_count(struct net_device *dev)
@@ -1145,6 +1174,9 @@ static void get_stats(struct net_device *dev, struct ethtool_stats *stats, 
	*data++ = collect_sge_port_stats(adapter, pi, SGE_PSTAT_TX_CSUM);

	*data++ = collect_sge_port_stats(adapter, pi, SGE_PSTAT_RX_CSUM_GOOD);

	*data++ = s->rx_cong_drops;



	*data++ = s->num_toggled;

	*data++ = s->num_resets;

}



static inline void reg_block_dump(struct adapter *ap, void *buf,
@@ -1362,23 +1394,27 @@ static int set_rx_csum(struct net_device *dev, u32 data) 


static void get_sge_param(struct net_device *dev, struct ethtool_ringparam *e)

{

	struct adapter *adapter = dev->priv;

	const struct adapter *adapter = dev->priv;

	const struct port_info *pi = netdev_priv(dev);

	const struct qset_params *q = &adapter->params.sge.qset[pi->first_qset];



	e->rx_max_pending = MAX_RX_BUFFERS;

	e->rx_mini_max_pending = 0;

	e->rx_jumbo_max_pending = MAX_RX_JUMBO_BUFFERS;

	e->tx_max_pending = MAX_TXQ_ENTRIES;



	e->rx_pending = adapter->params.sge.qset[0].fl_size;

	e->rx_mini_pending = adapter->params.sge.qset[0].rspq_size;

	e->rx_jumbo_pending = adapter->params.sge.qset[0].jumbo_size;

	e->tx_pending = adapter->params.sge.qset[0].txq_size[0];

	e->rx_pending = q->fl_size;

	e->rx_mini_pending = q->rspq_size;

	e->rx_jumbo_pending = q->jumbo_size;

	e->tx_pending = q->txq_size[0];

}



static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e)

{

	int i;

	struct qset_params *q;

	struct adapter *adapter = dev->priv;

	const struct port_info *pi = netdev_priv(dev);



	if (e->rx_pending > MAX_RX_BUFFERS ||

	    e->rx_jumbo_pending > MAX_RX_JUMBO_BUFFERS ||
@@ -1393,9 +1429,8 @@ static int set_sge_param(struct net_device *dev, struct ethtool_ringparam *e) 
	if (adapter->flags & FULL_INIT_DONE)

		return -EBUSY;



	for (i = 0; i < SGE_QSETS; ++i) {

		struct qset_params *q = &adapter->params.sge.qset[i];



	q = &adapter->params.sge.qset[pi->first_qset];

	for (i = 0; i < pi->nqsets; ++i, ++q) {

		q->rspq_size = e->rx_mini_pending;

		q->fl_size = e->rx_pending;

		q->jumbo_size = e->rx_jumbo_pending;
@@ -2067,6 +2102,40 @@ static void check_link_status(struct adapter *adapter) 
	}

}



static void check_t3b2_mac(struct adapter *adapter)

{

	int i;



	rtnl_lock();                      /* synchronize with ifdown */

	for_each_port(adapter, i) {

		struct net_device *dev = adapter->port[i];

		struct port_info *p = netdev_priv(dev);

		int status;



		if (!netif_running(dev))

			continue;



		status = 0;

		if (netif_running(dev))

			status = t3b2_mac_watchdog_task(&p->mac);

		if (status == 1)

			p->mac.stats.num_toggled++;

		else if (status == 2) {

			struct cmac *mac = &p->mac;



			t3_mac_set_mtu(mac, dev->mtu);

			t3_mac_set_address(mac, 0, dev->dev_addr);

			cxgb_set_rxmode(dev);

			t3_link_start(&p->phy, mac, &p->link_config);

			t3_mac_enable(mac, MAC_DIRECTION_RX | MAC_DIRECTION_TX);

			t3_port_intr_enable(adapter, p->port_id);

			p->mac.stats.num_resets++;

		}

	}

	rtnl_unlock();

}





static void t3_adap_check_task(struct work_struct *work)

{

	struct adapter *adapter = container_of(work, struct adapter,
@@ -2087,6 +2156,9 @@ static void t3_adap_check_task(struct work_struct *work) 
		adapter->check_task_cnt = 0;

	}



	if (p->rev == T3_REV_B2)

		check_t3b2_mac(adapter);



	/* Schedule the next check update if any port is active. */

	spin_lock(&adapter->work_lock);

	if (adapter->open_device_map & PORT_MASK)

drivers/net/cxgb3/regs.h

+22 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,14 @@ 


#define A_TP_RX_TRC_KEY0 0x120



#define A_TP_TX_DROP_CNT_CH0 0x12d



#define S_TXDROPCNTCH0RCVD    0

#define M_TXDROPCNTCH0RCVD    0xffff

#define V_TXDROPCNTCH0RCVD(x) ((x) << S_TXDROPCNTCH0RCVD)

#define G_TXDROPCNTCH0RCVD(x) (((x) >> S_TXDROPCNTCH0RCVD) & \

			       M_TXDROPCNTCH0RCVD)



#define A_ULPRX_CTL 0x500



#define S_ROUND_ROBIN    4
@@ -1834,6 +1842,8 @@ 
#define V_TXPAUSEEN(x) ((x) << S_TXPAUSEEN)

#define F_TXPAUSEEN    V_TXPAUSEEN(1U)



#define A_XGM_TX_PAUSE_QUANTA 0x808



#define A_XGM_RX_CTRL 0x80c



#define S_RXEN    0
@@ -1920,6 +1930,11 @@ 


#define A_XGM_TXFIFO_CFG 0x888



#define S_TXIPG    13

#define M_TXIPG    0xff

#define V_TXIPG(x) ((x) << S_TXIPG)

#define G_TXIPG(x) (((x) >> S_TXIPG) & M_TXIPG)



#define S_TXFIFOTHRESH    4

#define M_TXFIFOTHRESH    0x1ff
@@ -2190,6 +2205,13 @@ 


#define A_XGM_RX_MAX_PKT_SIZE_ERR_CNT 0x9a4



#define A_XGM_TX_SPI4_SOP_EOP_CNT 0x9a8



#define S_TXSPI4SOPCNT    16

#define M_TXSPI4SOPCNT    0xffff

#define V_TXSPI4SOPCNT(x) ((x) << S_TXSPI4SOPCNT)

#define G_TXSPI4SOPCNT(x) (((x) >> S_TXSPI4SOPCNT) & M_TXSPI4SOPCNT)



#define A_XGM_RX_SPI4_SOP_EOP_CNT 0x9ac



#define XGMAC0_1_BASE_ADDR 0xa00

drivers/net/cxgb3/t3_hw.c

+9 −6
Original line number Diff line number Diff line
@@ -681,7 +681,8 @@ enum { 
	SF_ERASE_SECTOR = 0xd8,	/* erase sector */



	FW_FLASH_BOOT_ADDR = 0x70000,	/* start address of FW in flash */

	FW_VERS_ADDR = 0x77ffc	/* flash address holding FW version */

	FW_VERS_ADDR = 0x77ffc,    /* flash address holding FW version */

	FW_MIN_SIZE = 8            /* at least version and csum */

};



/**
@@ -935,7 +936,7 @@ int t3_load_fw(struct adapter *adapter, const u8 *fw_data, unsigned int size) 
	const u32 *p = (const u32 *)fw_data;

	int ret, addr, fw_sector = FW_FLASH_BOOT_ADDR >> 16;



	if (size & 3)

	if ((size & 3) || size < FW_MIN_SIZE)

		return -EINVAL;

	if (size > FW_VERS_ADDR + 8 - FW_FLASH_BOOT_ADDR)

		return -EFBIG;
@@ -3243,15 +3244,17 @@ void early_hw_init(struct adapter *adapter, const struct adapter_info *ai) 
}



/*

 * Reset the adapter.  PCIe cards lose their config space during reset, PCI-X

 * Reset the adapter. 

 * Older PCIe cards lose their config space during reset, PCI-X

 * ones don't.

 */

int t3_reset_adapter(struct adapter *adapter)

{

	int i;

	int i, save_and_restore_pcie = 

	    adapter->params.rev < T3_REV_B2 && is_pcie(adapter);

	uint16_t devid = 0;



	if (is_pcie(adapter))

	if (save_and_restore_pcie)

		pci_save_state(adapter->pdev);

	t3_write_reg(adapter, A_PL_RST, F_CRSTWRM | F_CRSTWRMMODE);
@@ -3269,7 +3272,7 @@ int t3_reset_adapter(struct adapter *adapter) 
	if (devid != 0x1425)

		return -1;



	if (is_pcie(adapter))

	if (save_and_restore_pcie)

		pci_restore_state(adapter->pdev);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE