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

Commit 9e975cc2 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Fix io failures after chip reset 



Commit f2096f94, entitled
"tg3: Add 5720 H2BMC support", needed to add code to preserve some bits
set by firmware.  Unfortunately the new code causes throughput to stop
after a chip reset because it enables state machines before they are
ready.  This patch undoes the problematic code.  The bits will be
restored later in the init sequence.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79616895

drivers/net/tg3.c

+6 −12
Original line number Diff line number Diff line
@@ -7412,16 +7412,11 @@ static int tg3_chip_reset(struct tg3 *tp) 
		tw32(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);

	}



	if (tg3_flag(tp, ENABLE_APE))

		tp->mac_mode = MAC_MODE_APE_TX_EN |

			       MAC_MODE_APE_RX_EN |

			       MAC_MODE_TDE_ENABLE;



	if (tp->phy_flags & TG3_PHYFLG_PHY_SERDES) {

		tp->mac_mode |= MAC_MODE_PORT_MODE_TBI;

		tp->mac_mode = MAC_MODE_PORT_MODE_TBI;

		val = tp->mac_mode;

	} else if (tp->phy_flags & TG3_PHYFLG_MII_SERDES) {

		tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;

		tp->mac_mode = MAC_MODE_PORT_MODE_GMII;

		val = tp->mac_mode;

	} else

		val = 0;
@@ -8559,12 +8554,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
		udelay(10);

	}



	if (tg3_flag(tp, ENABLE_APE))

		tp->mac_mode = MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;

	else

		tp->mac_mode = 0;

	tp->mac_mode |= MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |

		MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;

			MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE |

			MAC_MODE_FHDE_ENABLE;

	if (tg3_flag(tp, ENABLE_APE))

		tp->mac_mode |= MAC_MODE_APE_TX_EN | MAC_MODE_APE_RX_EN;

	if (!tg3_flag(tp, 5705_PLUS) &&

	    !(tp->phy_flags & TG3_PHYFLG_PHY_SERDES) &&

	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700)