Commit f0c7de5a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-use-irqf_no_autoen-flag-in-request_irq' 

Jinjie Ruan says:

====================
net: Use IRQF_NO_AUTOEN flag in request_irq()

As commit cbe16f35 ("genirq: Add IRQF_NO_AUTOEN for request_irq/nmi()")
said, reqeust_irq() and then disable_irq() is unsafe.

IRQF_NO_AUTOEN flag can be used by drivers to request_irq(). It prevents
the automatic enabling of the requested interrupt in the same safe way.
With that the usage can be simplified and corrected.
====================

Link: https://patch.msgid.link/20240911094445.1922476-1-ruanjinjie@huawei.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5905c024 daaba19d

drivers/net/ethernet/apple/bmac.c

+1 −2
Original line number Diff line number Diff line
@@ -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) {

drivers/net/ethernet/freescale/enetc/enetc.c

+1 −2
Original line number Diff line number Diff line
@@ -2305,12 +2305,11 @@ static int enetc_setup_irqs(struct enetc_ndev_priv *priv) 


		snprintf(v->name, sizeof(v->name), "%s-rxtx%d",

			 priv->ndev->name, i);

		err = request_irq(irq, enetc_msix, 0, v->name, v);

		err = request_irq(irq, enetc_msix, IRQF_NO_AUTOEN, v->name, v);

		if (err) {

			dev_err(priv->dev, "request_irq() failed!\n");

			goto irq_err;

		}

		disable_irq(irq);



		v->tbier_base = hw->reg + ENETC_BDR(TX, 0, ENETC_TBIER);

		v->rbier = hw->reg + ENETC_BDR(RX, i, ENETC_RBIER);

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+2 −3
Original line number Diff line number Diff line
@@ -821,14 +821,13 @@ nfp_net_prepare_vector(struct nfp_net *nn, struct nfp_net_r_vector *r_vec, 


	snprintf(r_vec->name, sizeof(r_vec->name),

		 "%s-rxtx-%d", nfp_net_name(nn), idx);

	err = request_irq(r_vec->irq_vector, r_vec->handler, 0, r_vec->name,

			  r_vec);

	err = request_irq(r_vec->irq_vector, r_vec->handler, IRQF_NO_AUTOEN,

			  r_vec->name, r_vec);

	if (err) {

		nfp_net_napi_del(&nn->dp, r_vec);

		nn_err(nn, "Error requesting IRQ %d\n", r_vec->irq_vector);

		return err;

	}

	disable_irq(r_vec->irq_vector);



	irq_set_affinity_hint(r_vec->irq_vector, &r_vec->affinity_mask);