|
@@ -8911,6 +8911,10 @@ static int tg3_chip_reset(struct tg3 *tp)
|
|
tg3_halt_cpu(tp, RX_CPU_BASE);
|
|
tg3_halt_cpu(tp, RX_CPU_BASE);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ err = tg3_poll_fw(tp);
|
|
|
|
+ if (err)
|
|
|
|
+ return err;
|
|
|
|
+
|
|
tw32(GRC_MODE, tp->grc_mode);
|
|
tw32(GRC_MODE, tp->grc_mode);
|
|
|
|
|
|
if (tg3_chip_rev_id(tp) == CHIPREV_ID_5705_A0) {
|
|
if (tg3_chip_rev_id(tp) == CHIPREV_ID_5705_A0) {
|
|
@@ -8941,10 +8945,6 @@ static int tg3_chip_reset(struct tg3 *tp)
|
|
|
|
|
|
tg3_ape_unlock(tp, TG3_APE_LOCK_GRC);
|
|
tg3_ape_unlock(tp, TG3_APE_LOCK_GRC);
|
|
|
|
|
|
- err = tg3_poll_fw(tp);
|
|
|
|
- if (err)
|
|
|
|
- return err;
|
|
|
|
-
|
|
|
|
tg3_mdio_start(tp);
|
|
tg3_mdio_start(tp);
|
|
|
|
|
|
if (tg3_flag(tp, PCI_EXPRESS) &&
|
|
if (tg3_flag(tp, PCI_EXPRESS) &&
|