Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cxgb3 - Tighten xgmac workaround

Browse source 
Run the watchdog task when the link is up.
Flush the XGMAC Tx FIFO when the link drops.

Also remove a statistics update that should have gone
in the previous modification of xgmac.c.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Divy Le Ray 2007-03-31 00:23:24 -07:00 committed by Jeff Garzik
parent 8ac3ba68e2
commit 6d6dabac38
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/net/cxgb3/cxgb3_main.c
View file

@ -185,16 +185,26 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat,
int speed, int duplex, int pause)
{
struct net_device *dev = adapter->port[port_id];
struct port_info *pi = netdev_priv(dev);
struct cmac *mac = &pi->mac;
/* Skip changes from disabled ports. */
if (!netif_running(dev))
return;
if (link_stat != netif_carrier_ok(dev)) {
if (link_stat)
if (link_stat) {
t3_set_reg_field(adapter,
A_XGM_TXFIFO_CFG + mac->offset,
F_ENDROPPKT, 0);
netif_carrier_on(dev);
else
} else {
netif_carrier_off(dev);
t3_set_reg_field(adapter,
A_XGM_TXFIFO_CFG + mac->offset,
F_ENDROPPKT, F_ENDROPPKT);
}
link_report(dev);
}
}
@ -2119,7 +2129,7 @@ static void check_t3b2_mac(struct adapter *adapter)
continue;
status = 0;
if (netif_running(dev))
if (netif_running(dev) && netif_carrier_ok(dev))
status = t3b2_mac_watchdog_task(&p->mac);
if (status == 1)
p->mac.stats.num_toggled++;

4
drivers/net/cxgb3/regs.h
View file

@ -1940,6 +1940,10 @@
#define V_TXFIFOTHRESH(x) ((x) << S_TXFIFOTHRESH)
#define S_ENDROPPKT 21
#define V_ENDROPPKT(x) ((x) << S_ENDROPPKT)
#define F_ENDROPPKT V_ENDROPPKT(1U)
#define A_XGM_SERDES_CTRL 0x890
#define A_XGM_SERDES_CTRL0 0x8e0

1
drivers/net/cxgb3/xgmac.c
View file

@ -471,7 +471,6 @@ const struct mac_stats *t3_mac_update_stats(struct cmac *mac)
RMON_UPDATE(mac, rx_symbol_errs, RX_SYM_CODE_ERR_FRAMES);
RMON_UPDATE(mac, rx_too_long, RX_OVERSIZE_FRAMES);
mac->stats.rx_too_long += RMON_READ(mac, A_XGM_RX_MAX_PKT_SIZE_ERR_CNT);
v = RMON_READ(mac, A_XGM_RX_MAX_PKT_SIZE_ERR_CNT);
if (mac->adapter->params.rev == T3_REV_B2)