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

Commit c22c8149 authored by Divy Le Ray's avatar Divy Le Ray Committed by David S. Miller
Browse files

cxgb3: link fault fixes 



Do not call t3_link_fault() under spinlock, as it calls msleep().
Besides, only the access to pi->link_fault needs to be serialized.

Also initialize local variables before checking the link status,
link state fields might otherwise end up containing garbage.

Signed-off-by: default avatarDivy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 10b6d956

drivers/net/cxgb3/cxgb3_main.c

+5 −3
Original line number Diff line number Diff line
@@ -2496,14 +2496,16 @@ static void check_link_status(struct adapter *adapter) 
	for_each_port(adapter, i) {

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

		struct port_info *p = netdev_priv(dev);

		int link_fault;



		spin_lock_irq(&adapter->work_lock);

		if (p->link_fault) {

			t3_link_fault(adapter, i);

		link_fault = p->link_fault;

		spin_unlock_irq(&adapter->work_lock);



		if (link_fault) {

			t3_link_fault(adapter, i);

			continue;

		}

		spin_unlock_irq(&adapter->work_lock);



		if (!(p->phy.caps & SUPPORTED_IRQ) && netif_running(dev)) {

			t3_xgm_intr_disable(adapter, i);

drivers/net/cxgb3/t3_hw.c

+5 −0
Original line number Diff line number Diff line
@@ -1274,6 +1274,11 @@ void t3_link_fault(struct adapter *adapter, int port_id) 
				 A_XGM_INT_STATUS + mac->offset);

	link_fault &= F_LINKFAULTCHANGE;



	link_ok = lc->link_ok;

	speed = lc->speed;

	duplex = lc->duplex;

	fc = lc->fc;



	phy->ops->get_link_status(phy, &link_ok, &speed, &duplex, &fc);



	if (link_fault) {