Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753022AbdI0JGP convert rfc822-to-8bit (ORCPT ); Wed, 27 Sep 2017 05:06:15 -0400 Received: from smtp-out6.electric.net ([192.162.217.183]:56522 "EHLO smtp-out6.electric.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752750AbdI0JGM (ORCPT ); Wed, 27 Sep 2017 05:06:12 -0400 From: David Laight To: "'Vivien Didelot'" , "netdev@vger.kernel.org" CC: "linux-kernel@vger.kernel.org" , "kernel@savoirfairelinux.com" , "David S. Miller" , Florian Fainelli , Andrew Lunn Subject: RE: [PATCH net v2] net: dsa: mv88e6xxx: lock mutex when freeing IRQs Thread-Topic: [PATCH net v2] net: dsa: mv88e6xxx: lock mutex when freeing IRQs Thread-Index: AQHTNvoRC2MIqJKxfEejJa8Gks5D0qLIcX3A Date: Wed, 27 Sep 2017 09:06:01 +0000 Message-ID: <063D6719AE5E284EB5DD2968C1650D6DD00822B6@AcuExch.aculab.com> References: <20170926185721.12187-1-vivien.didelot@savoirfairelinux.com> In-Reply-To: <20170926185721.12187-1-vivien.didelot@savoirfairelinux.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.202.99.200] Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Outbound-IP: 156.67.243.126 X-Env-From: David.Laight@ACULAB.COM X-Proto: esmtps X-Revdns: X-HELO: AcuExch.aculab.com X-TLS: TLSv1:AES128-SHA:128 X-Authenticated_ID: X-PolicySMART: 3396946, 3397078 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1061 Lines: 28 From: Vivien Didelot > Sent: 26 September 2017 19:57 > 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 > --- > 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..e7ff7483d2fb 100644 > --- a/drivers/net/dsa/mv88e6xxx/chip.c > +++ b/drivers/net/dsa/mv88e6xxx/chip.c > @@ -3947,7 +3947,9 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev) > if (chip->irq > 0) { > if (chip->info->g2_irqs > 0) > mv88e6xxx_g2_irq_free(chip); > + mutex_lock(&chip->reg_lock); > mv88e6xxx_g1_irq_free(chip); > + mutex_unlock(&chip->reg_lock); Isn't the irq_free code likely to have to sleep waiting for any ISR to complete?? David