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

Commit 6d6dabac authored by Divy Le Ray's avatar Divy Le Ray Committed by Jeff Garzik
Browse files

cxgb3 - Tighten xgmac workaround 



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: default avatarDivy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8ac3ba68

drivers/net/cxgb3/cxgb3_main.c

+13 −3
Original line number Original line Diff line number Diff line
@@ -185,16 +185,26 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat, 
			int speed, int duplex, int pause)

			int speed, int duplex, int pause)

{

{

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

	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. */

	/* Skip changes from disabled ports. */

	if (!netif_running(dev))

	if (!netif_running(dev))

		return;

		return;





	if (link_stat != netif_carrier_ok(dev)) {

	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);

			netif_carrier_on(dev);

		else

		} else {

			netif_carrier_off(dev);

			netif_carrier_off(dev);

			t3_set_reg_field(adapter,

					 A_XGM_TXFIFO_CFG + mac->offset,

					 F_ENDROPPKT, F_ENDROPPKT);

		}



		link_report(dev);

		link_report(dev);

	}

	}

}

}
@@ -2119,7 +2129,7 @@ static void check_t3b2_mac(struct adapter *adapter) 
			continue;

			continue;





		status = 0;

		status = 0;

		if (netif_running(dev))

		if (netif_running(dev) && netif_carrier_ok(dev))

			status = t3b2_mac_watchdog_task(&p->mac);

			status = t3b2_mac_watchdog_task(&p->mac);

		if (status == 1)

		if (status == 1)

			p->mac.stats.num_toggled++;

			p->mac.stats.num_toggled++;

drivers/net/cxgb3/regs.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -1940,6 +1940,10 @@ 




#define V_TXFIFOTHRESH(x) ((x) << S_TXFIFOTHRESH)

#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_CTRL 0x890

#define A_XGM_SERDES_CTRL0 0x8e0

#define A_XGM_SERDES_CTRL0 0x8e0

drivers/net/cxgb3/xgmac.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -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_symbol_errs, RX_SYM_CODE_ERR_FRAMES);





	RMON_UPDATE(mac, rx_too_long, RX_OVERSIZE_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);

	v = RMON_READ(mac, A_XGM_RX_MAX_PKT_SIZE_ERR_CNT);

	if (mac->adapter->params.rev == T3_REV_B2)

	if (mac->adapter->params.rev == T3_REV_B2)