From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935945AbeCHQ3i (ORCPT ); Thu, 8 Mar 2018 11:29:38 -0500 Received: from vps0.lunn.ch ([185.16.172.187]:51674 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754612AbeCHQ3I (ORCPT ); Thu, 8 Mar 2018 11:29:08 -0500 Date: Thu, 8 Mar 2018 17:29:05 +0100 From: Andrew Lunn To: Brad Mouring Cc: Florian Fainelli , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] net: phy: Move interrupt check from phy_check to phy_interrupt Message-ID: <20180308162905.GE5144@lunn.ch> References: <20180307225042.2205-1-brad.mouring@ni.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180307225042.2205-1-brad.mouring@ni.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 07, 2018 at 04:50:42PM -0600, Brad Mouring wrote: > If multiple phys share the same interrupt (e.g. a multi-phy chip), > the first device registered is the only one checked as phy_interrupt > will always return IRQ_HANDLED if the first phydev is not halted. > Move the interrupt check into phy_interrupt and, if it was not this > phydev, return IRQ_NONE to allow other devices on this irq a chance > to check if it was their interrupt. > > Signed-off-by: Brad Mouring > --- > drivers/net/phy/phy.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c > index e3e29c2b028b..ff1aa815568f 100644 > --- a/drivers/net/phy/phy.c > +++ b/drivers/net/phy/phy.c > @@ -632,6 +632,12 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat) > if (PHY_HALTED == phydev->state) > return IRQ_NONE; /* It can't be ours. */ > > + if (phy_interrupt_is_valid(phydev)) { Hi Brad Is this check needed? Can phy_interrupt() be called for a PHY which does not have an interrupt? > + if (phydev->drv->did_interrupt && > + !phydev->drv->did_interrupt(phydev)) > + return IRQ_NONE; > + } > + > phy_change(phydev); > > return IRQ_HANDLED; > @@ -725,16 +731,6 @@ EXPORT_SYMBOL(phy_stop_interrupts); > */ > void phy_change(struct phy_device *phydev) > { > - if (phy_interrupt_is_valid(phydev)) { > - if (phydev->drv->did_interrupt && > - !phydev->drv->did_interrupt(phydev)) > - return; > - > - if (phydev->state == PHY_HALTED) > - if (phy_disable_interrupts(phydev)) > - goto phy_err; > - } > - phy_change() can also be called via phy_mac_interrupt(). I wonder if this change is going to break anything? Did you think about that? Thanks Andrew