Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754711AbaBRJad (ORCPT ); Tue, 18 Feb 2014 04:30:33 -0500 Received: from mail-wi0-f178.google.com ([209.85.212.178]:40742 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754656AbaBRJa3 (ORCPT ); Tue, 18 Feb 2014 04:30:29 -0500 From: Grant Likely Subject: Re: [PATCH] of_mdio: fix phy interrupt passing To: Ben Dooks Cc: linux-kernel@lists.codethink.co.uk, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-sh@vger.kernel.org, sergei.shtylyov@cogentembedded.com, Ben Dooks In-Reply-To: <1392654580-3706-1-git-send-email-ben.dooks@codethink.co.uk> References: <1392654580-3706-1-git-send-email-ben.dooks@codethink.co.uk> Date: Tue, 18 Feb 2014 09:30:24 +0000 Message-Id: <20140218093024.D0E94C403C8@trevor.secretlab.ca> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 17 Feb 2014 16:29:40 +0000, Ben Dooks wrote: > The of_mdiobus_register_phy() is not setting phy->irq this causing > some drivers to incorrectly assume that the PHY does not have an > IRQ associated with it or install an interrupt handler for the > PHY. > > Simplify the code setting irq and set the phy->irq at the same > time so that the case if mdio->irq is not NULL is easier to read. > > This fixes the issue: > net eth0: attached PHY 1 (IRQ -1) to driver Micrel KSZ8041RNLI > > to the correct: > net eth0: attached PHY 1 (IRQ 416) to driver Micrel KSZ8041RNLI > > Signed-off-by: Ben Dooks > --- > drivers/of/of_mdio.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c > index 875b7b6..7b3e7b0 100644 > --- a/drivers/of/of_mdio.c > +++ b/drivers/of/of_mdio.c > @@ -44,7 +44,7 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi > { > struct phy_device *phy; > bool is_c45; > - int rc, prev_irq; > + int rc; > u32 max_speed = 0; > > is_c45 = of_device_is_compatible(child, > @@ -55,11 +55,11 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi > return 1; > > if (mdio->irq) { > - prev_irq = mdio->irq[addr]; > - mdio->irq[addr] = > - irq_of_parse_and_map(child, 0); > - if (!mdio->irq[addr]) > - mdio->irq[addr] = prev_irq; I cannot for the life for me remeber why the code was structured that way. Your change is better. > + rc = irq_of_parse_and_map(child, 0); > + if (rc > 0) { > + mdio->irq[addr] = rc; > + phy->irq = rc; > + } > } The outer if is merely protecting against no irq array being allocated for the bus. Would not the following be better: rc = irq_of_parse_and_map(child, 0); if (rc > 0) { phy->irq = rc; if (mdio->irq) mdio->irq[addr] = rc; } g. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/