Commit 73aba63c 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:
  myri10ge: update driver version to 1.3.0-1.233
  myri10ge: more Intel chipsets providing aligned PCIe completions
  myri10ge: fix management of the firmware 4KB boundary crossing restriction
  cxgb3 - missing CPL hanler and register setting.
  cxgb3 - MAC watchdog update
  cxgb3 - avoid deadlock with mac watchdog
  skge: fix wake on lan
  sky2: phy workarounds for Yukon EC-U A1
  sky2: turn on clocks when doing resume
  sky2: turn carrier off when down
  skge: turn carrier off when down
  [PATCH] bcm43xx: Fix PPC machine checks and match loopback gain specs
  [PATCH] bcm43xx: Fix 802.11b/g scan limits to match regulatory reqs
  [PATCH] zd1211rw: Fix E2P_PHY_REG patching
  [PATCH] zd1211rw: Reject AL2230S devices
parents 29ac8cab cec34dda

drivers/net/cxgb3/common.h

+5 −2
Original line number Diff line number Diff line
@@ -478,8 +478,11 @@ 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 tx_tcnt;

	unsigned int tx_xcnt;

	u64 tx_mcnt;

	unsigned int rx_xcnt;

	u64 rx_mcnt;

	unsigned int toggle_cnt;

	unsigned int txen;

	struct mac_stats stats;

drivers/net/cxgb3/cxgb3_main.c

+9 −7
Original line number Diff line number Diff line
@@ -194,15 +194,13 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat, 


	if (link_stat != netif_carrier_ok(dev)) {

		if (link_stat) {

			t3_set_reg_field(adapter,

					 A_XGM_TXFIFO_CFG + mac->offset,

					 F_ENDROPPKT, 0);

			t3_mac_enable(mac, MAC_DIRECTION_RX);

			netif_carrier_on(dev);

		} else {

			netif_carrier_off(dev);

			t3_set_reg_field(adapter,

					 A_XGM_TXFIFO_CFG + mac->offset,

					 F_ENDROPPKT, F_ENDROPPKT);

			pi->phy.ops->power_down(&pi->phy, 1);

			t3_mac_disable(mac, MAC_DIRECTION_RX);

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

		}



		link_report(dev);
@@ -772,6 +770,8 @@ static int cxgb_up(struct adapter *adap) 
		if (err)

			goto out;



		t3_write_reg(adap, A_ULPRX_TDDP_PSZ, V_HPZ0(PAGE_SHIFT - 12));

		

		err = setup_sge_qsets(adap);

		if (err)

			goto out;
@@ -2119,7 +2119,9 @@ static void check_t3b2_mac(struct adapter *adapter) 
{

	int i;



	rtnl_lock();                      /* synchronize with ifdown */

	if (!rtnl_trylock())	/* synchronize with ifdown */

		return;



	for_each_port(adapter, i) {

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

		struct port_info *p = netdev_priv(dev);

drivers/net/cxgb3/cxgb3_offload.c

+2 −12
Original line number Diff line number Diff line
@@ -743,17 +743,6 @@ static int do_act_establish(struct t3cdev *dev, struct sk_buff *skb) 
	}

}



static int do_set_tcb_rpl(struct t3cdev *dev, struct sk_buff *skb)

{

	struct cpl_set_tcb_rpl *rpl = cplhdr(skb);



	if (rpl->status != CPL_ERR_NONE)

		printk(KERN_ERR

		       "Unexpected SET_TCB_RPL status %u for tid %u\n",

		       rpl->status, GET_TID(rpl));

	return CPL_RET_BUF_DONE;

}



static int do_trace(struct t3cdev *dev, struct sk_buff *skb)

{

	struct cpl_trace_pkt *p = cplhdr(skb);
@@ -1215,7 +1204,8 @@ void __init cxgb3_offload_init(void) 
	t3_register_cpl_handler(CPL_CLOSE_CON_RPL, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_ABORT_REQ_RSS, do_abort_req_rss);

	t3_register_cpl_handler(CPL_ACT_ESTABLISH, do_act_establish);

	t3_register_cpl_handler(CPL_SET_TCB_RPL, do_set_tcb_rpl);

	t3_register_cpl_handler(CPL_SET_TCB_RPL, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_GET_TCB_RPL, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_RDMA_TERMINATE, do_term);

	t3_register_cpl_handler(CPL_RDMA_EC_STATUS, do_hwtid_rpl);

	t3_register_cpl_handler(CPL_TRACE_PKT, do_trace);

drivers/net/cxgb3/regs.h

+6 −0
Original line number Diff line number Diff line
@@ -1234,9 +1234,15 @@ 


#define A_ULPRX_ISCSI_TAGMASK 0x514



#define S_HPZ0    0

#define M_HPZ0    0xf

#define V_HPZ0(x) ((x) << S_HPZ0)

#define G_HPZ0(x) (((x) >> S_HPZ0) & M_HPZ0)



#define A_ULPRX_TDDP_LLIMIT 0x51c



#define A_ULPRX_TDDP_ULIMIT 0x520

#define A_ULPRX_TDDP_PSZ 0x528



#define A_ULPRX_STAG_LLIMIT 0x52c

drivers/net/cxgb3/xgmac.c

+80 −27
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ int t3_mac_enable(struct cmac *mac, int which) 
	int idx = macidx(mac);

	struct adapter *adap = mac->adapter;

	unsigned int oft = mac->offset;

	struct mac_stats *s = &mac->stats;

	

	if (which & MAC_DIRECTION_TX) {

		t3_write_reg(adap, A_XGM_TX_CTRL + oft, F_TXEN);
@@ -376,10 +377,16 @@ int t3_mac_enable(struct cmac *mac, int which) 
		t3_set_reg_field(adap, A_TP_PIO_DATA, 1 << idx, 1 << idx);



		t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CNT_CH0 + idx);

		mac->tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap,

		mac->tx_mcnt = s->tx_frames;

		mac->tx_tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap,

							A_TP_PIO_DATA)));

		mac->xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,

						A_XGM_TX_SPI4_SOP_EOP_CNT)));

		mac->tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,

						A_XGM_TX_SPI4_SOP_EOP_CNT +

						oft)));

		mac->rx_mcnt = s->rx_frames;

		mac->rx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,

						A_XGM_RX_SPI4_SOP_EOP_CNT +

						oft)));

		mac->txen = F_TXEN;

		mac->toggle_cnt = 0;

	}
@@ -392,6 +399,7 @@ int t3_mac_disable(struct cmac *mac, int which) 
{

	int idx = macidx(mac);

	struct adapter *adap = mac->adapter;

	int val;



	if (which & MAC_DIRECTION_TX) {

		t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 0);
@@ -401,44 +409,89 @@ int t3_mac_disable(struct cmac *mac, int which) 
		t3_set_reg_field(adap, A_TP_PIO_DATA, 1 << idx, 1 << idx);

		mac->txen = 0;

	}

	if (which & MAC_DIRECTION_RX)

	if (which & MAC_DIRECTION_RX) {

		t3_set_reg_field(mac->adapter, A_XGM_RESET_CTRL + mac->offset,

				 F_PCS_RESET_, 0);

		msleep(100);

		t3_write_reg(adap, A_XGM_RX_CTRL + mac->offset, 0);

		val = F_MAC_RESET_;

		if (is_10G(adap))

			val |= F_PCS_RESET_;

		else if (uses_xaui(adap))

			val |= F_PCS_RESET_ | F_XG2G_RESET_;

		else

			val |= F_RGMII_RESET_ | F_XG2G_RESET_;

		t3_write_reg(mac->adapter, A_XGM_RESET_CTRL + mac->offset, val);

	}

	return 0;

}



int t3b2_mac_watchdog_task(struct cmac *mac)

{

	struct adapter *adap = mac->adapter;

	unsigned int tcnt, xcnt;

	struct mac_stats *s = &mac->stats;

	unsigned int tx_tcnt, tx_xcnt;

	unsigned int tx_mcnt = s->tx_frames;

	unsigned int rx_mcnt = s->rx_frames;

	unsigned int rx_xcnt;

	int status;



	t3_write_reg(adap, A_TP_PIO_ADDR, A_TP_TX_DROP_CNT_CH0 + macidx(mac));

	tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap, A_TP_PIO_DATA)));

	xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap, 

	if (tx_mcnt == mac->tx_mcnt) {

		tx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,

						A_XGM_TX_SPI4_SOP_EOP_CNT +

					       	mac->offset)));



	if (tcnt != mac->tcnt && xcnt == 0 && mac->xcnt == 0) {

		if (mac->toggle_cnt > 4) {

			t3b2_mac_reset(mac);

		if (tx_xcnt == 0) {

			t3_write_reg(adap, A_TP_PIO_ADDR,

				     A_TP_TX_DROP_CNT_CH0 + macidx(mac));

			tx_tcnt = (G_TXDROPCNTCH0RCVD(t3_read_reg(adap,

						      A_TP_PIO_DATA)));

		} else {

			mac->toggle_cnt = 0;

			status = 2;

			return 0;

		}

	} else {

			t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 0);

			t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset);

			t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset,

				     mac->txen);

			t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset);

			mac->toggle_cnt++;

			status = 1;

		mac->toggle_cnt = 0;

		return 0;

	}



	if (((tx_tcnt != mac->tx_tcnt) &&

	     (tx_xcnt == 0) && (mac->tx_xcnt == 0)) ||

	    ((mac->tx_mcnt == tx_mcnt) &&

	     (tx_xcnt != 0) && (mac->tx_xcnt != 0))) {

		if (mac->toggle_cnt > 4)

			status = 2;

		else 

			status = 1;

	} else {

		mac->toggle_cnt = 0;

		status = 0;

		return 0;

	}

	mac->tcnt = tcnt;

	mac->xcnt = xcnt;



	if (rx_mcnt != mac->rx_mcnt)

		rx_xcnt = (G_TXSPI4SOPCNT(t3_read_reg(adap,

						A_XGM_RX_SPI4_SOP_EOP_CNT +

						mac->offset)));

	else 

		return 0;



	if (mac->rx_mcnt != s->rx_frames && rx_xcnt == 0 && mac->rx_xcnt == 0) 

		status = 2;

	

	mac->tx_tcnt = tx_tcnt;

	mac->tx_xcnt = tx_xcnt;

	mac->tx_mcnt = s->tx_frames;

	mac->rx_xcnt = rx_xcnt;

	mac->rx_mcnt = s->rx_frames;

	if (status == 1) {

		t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, 0);

		t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset);  /* flush */

		t3_write_reg(adap, A_XGM_TX_CTRL + mac->offset, mac->txen);

		t3_read_reg(adap, A_XGM_TX_CTRL + mac->offset);  /* flush */

		mac->toggle_cnt++;

	} else if (status == 2) {

		t3b2_mac_reset(mac);

		mac->toggle_cnt = 0;

	}

	return status;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE