From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sebastian Andrzej Siewior Subject: [PATCH 4/4] net: 3com: 3c59x: irq save variant of ISR Date: Fri, 4 May 2018 17:17:49 +0200 Message-ID: <20180504151749.6966-5-bigeasy@linutronix.de> References: <20180504151749.6966-1-bigeasy@linutronix.de> Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Cc: "David S. Miller" , tglx@linutronix.de, Anna-Maria Gleixner , Steffen Klassert , Sebastian Andrzej Siewior To: netdev@vger.kernel.org Return-path: Received: from Galois.linutronix.de ([146.0.238.70]:41159 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbeEDPSI (ORCPT ); Fri, 4 May 2018 11:18:08 -0400 In-Reply-To: <20180504151749.6966-1-bigeasy@linutronix.de> Sender: netdev-owner@vger.kernel.org List-ID: From: Anna-Maria Gleixner When vortex_boomerang_interrupt() is invoked from vortex_tx_timeout() or poll_vortex() interrupts must be disabled. This detaches the interrupt disable logic from locking which requires patching for PREEMPT_RT. The advantage of avoiding spin_lock_irqsave() in the interrupt handler is minimal, but converting it removes all the extra code for callers which come not from interrupt context. Cc: Steffen Klassert Signed-off-by: Anna-Maria Gleixner Signed-off-by: Sebastian Andrzej Siewior --- drivers/net/ethernet/3com/3c59x.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/= 3c59x.c index fdafe25da153..cabbe227bb98 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c @@ -839,10 +839,7 @@ MODULE_PARM_DESC(use_mmio, "3c59x: use memory-mapped P= CI I/O resource (0-1)"); #ifdef CONFIG_NET_POLL_CONTROLLER static void poll_vortex(struct net_device *dev) { - unsigned long flags; - local_irq_save(flags); vortex_boomerang_interrupt(dev->irq, dev); - local_irq_restore(flags); } #endif =20 @@ -1904,15 +1901,7 @@ static void vortex_tx_timeout(struct net_device *dev) pr_err("%s: Interrupt posted but not delivered --" " IRQ blocked by another device?\n", dev->name); /* Bad idea here.. but we might as well handle a few events. */ - { - /* - * Block interrupts because vortex_interrupt does a bare spin_lock() - */ - unsigned long flags; - local_irq_save(flags); - vortex_boomerang_interrupt(dev->irq, dev); - local_irq_restore(flags); - } + vortex_boomerang_interrupt(dev->irq, dev); } =20 if (vortex_debug > 0) @@ -2516,16 +2505,17 @@ vortex_boomerang_interrupt(int irq, void *dev_id) { struct net_device *dev =3D dev_id; struct vortex_private *vp =3D netdev_priv(dev); + unsigned long flags; irqreturn_t ret; =20 - spin_lock(&vp->lock); + spin_lock_irqsave(&vp->lock, flags); =20 if (vp->full_bus_master_rx) ret =3D _boomerang_interrupt(dev->irq, dev); else ret =3D _vortex_interrupt(dev->irq, dev); =20 - spin_unlock(&vp->lock); + spin_unlock_irqrestore(&vp->lock, flags); =20 return ret; } --=20 2.17.0