[PATCH net] net: dsa: mv88e6xxx: lock mutex when freeing IRQs

From	Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Newsgroups	linux.kernel
Subject	[PATCH net] net: dsa: mv88e6xxx: lock mutex when freeing IRQs
Date	2017-09-26 20:00 +0200
Message-ID	<uu2jh-7SW-17@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

mv88e6xxx_g2_irq_free locks the registers mutex, but not
mv88e6xxx_g1_irq_free, which results in a stack trace from
assert_reg_lock when unloading the mv88e6xxx module. Fix this.

Fixes: 3460a5770ce9 ("net: dsa: mv88e6xxx: Mask g1 interrupts and free interrupt")
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index c6678aa9b4ef..b4359e4e5165 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -338,9 +338,11 @@ static void mv88e6xxx_g1_irq_free(struct mv88e6xxx_chip *chip)
 	int irq, virq;
 	u16 mask;
 
+	mutex_lock(&chip->reg_lock);
 	mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &mask);
 	mask |= GENMASK(chip->g1_irq.nirqs, 0);
 	mv88e6xxx_g1_write(chip, MV88E6XXX_G1_CTL1, mask);
+	mutex_unlock(&chip->reg_lock);
 
 	free_irq(chip->irq, chip);
 
-- 
2.14.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH net] net: dsa: mv88e6xxx: lock mutex when freeing IRQs Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-09-26 20:00 +0200
  Re: [PATCH net] net: dsa: mv88e6xxx: lock mutex when freeing IRQs Andrew Lunn <andrew@lunn.ch> - 2017-09-26 20:10 +0200
    Re: [PATCH net] net: dsa: mv88e6xxx: lock mutex when freeing IRQs Vivien Didelot <vivien.didelot@savoirfairelinux.com> - 2017-09-26 20:10 +0200

csiph-web