|
@@ -7413,6 +7413,8 @@ static inline void tg3_netif_start(struct tg3 *tp)
|
|
|
}
|
|
|
|
|
|
static void tg3_irq_quiesce(struct tg3 *tp)
|
|
|
+ __releases(tp->lock)
|
|
|
+ __acquires(tp->lock)
|
|
|
{
|
|
|
int i;
|
|
|
|
|
@@ -7421,8 +7423,12 @@ static void tg3_irq_quiesce(struct tg3 *tp)
|
|
|
tp->irq_sync = 1;
|
|
|
smp_mb();
|
|
|
|
|
|
+ spin_unlock_bh(&tp->lock);
|
|
|
+
|
|
|
for (i = 0; i < tp->irq_cnt; i++)
|
|
|
synchronize_irq(tp->napi[i].irq_vec);
|
|
|
+
|
|
|
+ spin_lock_bh(&tp->lock);
|
|
|
}
|
|
|
|
|
|
/* Fully shutdown all tg3 driver activity elsewhere in the system.
|
|
@@ -9018,6 +9024,8 @@ static void tg3_restore_clk(struct tg3 *tp)
|
|
|
|
|
|
/* tp->lock is held. */
|
|
|
static int tg3_chip_reset(struct tg3 *tp)
|
|
|
+ __releases(tp->lock)
|
|
|
+ __acquires(tp->lock)
|
|
|
{
|
|
|
u32 val;
|
|
|
void (*write_op)(struct tg3 *, u32, u32);
|
|
@@ -9073,9 +9081,13 @@ static int tg3_chip_reset(struct tg3 *tp)
|
|
|
}
|
|
|
smp_mb();
|
|
|
|
|
|
+ tg3_full_unlock(tp);
|
|
|
+
|
|
|
for (i = 0; i < tp->irq_cnt; i++)
|
|
|
synchronize_irq(tp->napi[i].irq_vec);
|
|
|
|
|
|
+ tg3_full_lock(tp, 0);
|
|
|
+
|
|
|
if (tg3_asic_rev(tp) == ASIC_REV_57780) {
|
|
|
val = tr32(TG3_PCIE_LNKCTL) & ~TG3_PCIE_LNKCTL_L1_PLL_PD_EN;
|
|
|
tw32(TG3_PCIE_LNKCTL, val | TG3_PCIE_LNKCTL_L1_PLL_PD_DIS);
|