]> www.infradead.org Git - linux.git/commitdiff
net: apple: bmac: Use IRQF_NO_AUTOEN flag in request_irq()
authorJinjie Ruan <ruanjinjie@huawei.com>
Wed, 11 Sep 2024 09:44:43 +0000 (17:44 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 13 Sep 2024 03:35:04 +0000 (20:35 -0700)
disable_irq() after request_irq() still has a time gap in which
interrupts can come. request_irq() with IRQF_NO_AUTOEN flag will
disable IRQ auto-enable when request IRQ.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Link: https://patch.msgid.link/20240911094445.1922476-2-ruanjinjie@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/apple/bmac.c

index 292b1f9cd9e78e799aa359deceed4ee3958fbb22..785f4b4ff75812becd6b7975de60f89a91c81401 100644 (file)
@@ -1317,7 +1317,7 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)
 
        timer_setup(&bp->tx_timeout, bmac_tx_timeout, 0);
 
-       ret = request_irq(dev->irq, bmac_misc_intr, 0, "BMAC-misc", dev);
+       ret = request_irq(dev->irq, bmac_misc_intr, IRQF_NO_AUTOEN, "BMAC-misc", dev);
        if (ret) {
                printk(KERN_ERR "BMAC: can't get irq %d\n", dev->irq);
                goto err_out_iounmap_rx;
@@ -1336,7 +1336,6 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match)
        /* Mask chip interrupts and disable chip, will be
         * re-enabled on open()
         */
-       disable_irq(dev->irq);
        pmac_call_feature(PMAC_FTR_BMAC_ENABLE, macio_get_of_node(bp->mdev), 0, 0);
 
        if (register_netdev(dev) != 0) {