Commit 6bec3340 authored by Fuqian Huang's avatar Fuqian Huang Committed by Kleber Sacilotto de Souza

net: tundra: tsi108: use spin_lock_irqsave instead of spin_lock_irq in IRQ context

BugLink: https://bugs.launchpad.net/bugs/1845374

[ Upstream commit 8c25d088 ]

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: default avatarFuqian Huang <huangfq.daxian@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent d0354843
...@@ -379,9 +379,10 @@ tsi108_stat_carry_one(int carry, int carry_bit, int carry_shift, ...@@ -379,9 +379,10 @@ tsi108_stat_carry_one(int carry, int carry_bit, int carry_shift,
static void tsi108_stat_carry(struct net_device *dev) static void tsi108_stat_carry(struct net_device *dev)
{ {
struct tsi108_prv_data *data = netdev_priv(dev); struct tsi108_prv_data *data = netdev_priv(dev);
unsigned long flags;
u32 carry1, carry2; u32 carry1, carry2;
spin_lock_irq(&data->misclock); spin_lock_irqsave(&data->misclock, flags);
carry1 = TSI_READ(TSI108_STAT_CARRY1); carry1 = TSI_READ(TSI108_STAT_CARRY1);
carry2 = TSI_READ(TSI108_STAT_CARRY2); carry2 = TSI_READ(TSI108_STAT_CARRY2);
...@@ -449,7 +450,7 @@ static void tsi108_stat_carry(struct net_device *dev) ...@@ -449,7 +450,7 @@ static void tsi108_stat_carry(struct net_device *dev)
TSI108_STAT_TXPAUSEDROP_CARRY, TSI108_STAT_TXPAUSEDROP_CARRY,
&data->tx_pause_drop); &data->tx_pause_drop);
spin_unlock_irq(&data->misclock); spin_unlock_irqrestore(&data->misclock, flags);
} }
/* Read a stat counter atomically with respect to carries. /* Read a stat counter atomically with respect to carries.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment