| Message ID | 20190809053539.8341-1-huangfq.daxian@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2] net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context | expand |
From: Fuqian Huang <huangfq.daxian@gmail.com> Date: Fri, 9 Aug 2019 13:35:39 +0800 > As spin_unlock_irq will enable interrupts. > Function tsi108_stat_carry is called from interrupt handler tsi108_irq. > Interrupts are enabled in interrupt handler. > Use spin_lock_irqsave/spin_unlock_irqrestore instead of spin_(un)lock_irq > in IRQ context to avoid this. > > Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> > --- > Changes in v2: > - Preserve reverse christmas tree ordering of local variables. Applied, thanks.
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c index 78a7de3fb622..c62f474b6d08 100644 --- a/drivers/net/ethernet/tundra/tsi108_eth.c +++ b/drivers/net/ethernet/tundra/tsi108_eth.c @@ -371,9 +371,10 @@ tsi108_stat_carry_one(int carry, int carry_bit, int carry_shift, static void tsi108_stat_carry(struct net_device *dev) { struct tsi108_prv_data *data = netdev_priv(dev); + unsigned long flags; u32 carry1, carry2; - spin_lock_irq(&data->misclock); + spin_lock_irqsave(&data->misclock, flags); carry1 = TSI_READ(TSI108_STAT_CARRY1); carry2 = TSI_READ(TSI108_STAT_CARRY2); @@ -441,7 +442,7 @@ static void tsi108_stat_carry(struct net_device *dev) TSI108_STAT_TXPAUSEDROP_CARRY, &data->tx_pause_drop); - spin_unlock_irq(&data->misclock); + spin_unlock_irqrestore(&data->misclock, flags); } /* Read a stat counter atomically with respect to carries.
As spin_unlock_irq will enable interrupts. Function tsi108_stat_carry is called from interrupt handler tsi108_irq. Interrupts are enabled in interrupt handler. Use spin_lock_irqsave/spin_unlock_irqrestore instead of spin_(un)lock_irq in IRQ context to avoid this. Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> --- Changes in v2: - Preserve reverse christmas tree ordering of local variables. drivers/net/ethernet/tundra/tsi108_eth.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)