Skip to content

Commit

Permalink
cxgb3: Drain Mac Tx fifo when the port goes down.
Browse files Browse the repository at this point in the history
Drain the MAC TX fifos when a port goes down.
Back pressure might otherwise occur, leading to both
ports of the same adapter to hang.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Divy Le Ray authored and David S. Miller committed Jul 8, 2009
1 parent 88045b3 commit 34701fd
Showing 1 changed file with 28 additions and 1 deletion.
29 changes: 28 additions & 1 deletion drivers/net/cxgb3/cxgb3_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,23 @@ static void link_report(struct net_device *dev)
}
}

static void enable_tx_fifo_drain(struct adapter *adapter,
struct port_info *pi)
{
t3_set_reg_field(adapter, A_XGM_TXFIFO_CFG + pi->mac.offset, 0,
F_ENDROPPKT);
t3_write_reg(adapter, A_XGM_RX_CTRL + pi->mac.offset, 0);
t3_write_reg(adapter, A_XGM_TX_CTRL + pi->mac.offset, F_TXEN);
t3_write_reg(adapter, A_XGM_RX_CTRL + pi->mac.offset, F_RXEN);
}

static void disable_tx_fifo_drain(struct adapter *adapter,
struct port_info *pi)
{
t3_set_reg_field(adapter, A_XGM_TXFIFO_CFG + pi->mac.offset,
F_ENDROPPKT, 0);
}

void t3_os_link_fault(struct adapter *adap, int port_id, int state)
{
struct net_device *dev = adap->port[port_id];
Expand All @@ -185,6 +202,8 @@ void t3_os_link_fault(struct adapter *adap, int port_id, int state)

netif_carrier_on(dev);

disable_tx_fifo_drain(adap, pi);

/* Clear local faults */
t3_xgm_intr_disable(adap, pi->port_id);
t3_read_reg(adap, A_XGM_INT_STATUS +
Expand All @@ -200,9 +219,12 @@ void t3_os_link_fault(struct adapter *adap, int port_id, int state)
t3_xgm_intr_enable(adap, pi->port_id);

t3_mac_enable(mac, MAC_DIRECTION_TX);
} else
} else {
netif_carrier_off(dev);

/* Flush TX FIFO */
enable_tx_fifo_drain(adap, pi);
}
link_report(dev);
}

Expand Down Expand Up @@ -232,6 +254,8 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat,

if (link_stat != netif_carrier_ok(dev)) {
if (link_stat) {
disable_tx_fifo_drain(adapter, pi);

t3_mac_enable(mac, MAC_DIRECTION_RX);

/* Clear local faults */
Expand Down Expand Up @@ -263,6 +287,9 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat,
t3_read_reg(adapter, A_XGM_INT_STATUS + pi->mac.offset);
t3_mac_disable(mac, MAC_DIRECTION_RX);
t3_link_start(&pi->phy, mac, &pi->link_config);

/* Flush TX FIFO */
enable_tx_fifo_drain(adapter, pi);
}

link_report(dev);
Expand Down

0 comments on commit 34701fd

Please sign in to comment.