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

Commit 2046ecf3 authored by Fuqian Huang's avatar Fuqian Huang Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 8c25d0887a8bd0e1ca2074ac0c6dff173787a83b ]

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>
parent bf489db0

drivers/net/ethernet/tundra/tsi108_eth.c

+3 −2
Original line number Diff line number Diff line
@@ -381,9 +381,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);
@@ -451,7 +452,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.