From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6B601CDFAC for ; Sat, 4 Oct 2025 11:20:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759576836; cv=none; b=g89S6miWttPj0JrgRnWm3Qv7waj7oqtGIErm7SWoAmOhmkgkS3iU6jEZqScnjbRKKy7jBjzXADAAVkDyFfUAHCrf+fy3DwHPoJ0z0K4nAT7rsJt5sEWsZQvtfFniJGDQOE8ho54D/kuEO+VymANcOIeLnrBe7BmCiSa0sP2jO+0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759576836; c=relaxed/simple; bh=A6gbkqNPLWsws9l6PA4pY+F5/1LjeKnCBESKwULMJLg=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=XX7gaf7c9PM5a0XCgd2fd6g2LCvioPKaufHBOg3Nh8Ww3ARAHi8sHBq14yNB7F4t3B/9u6fExeKxUwIQ0dbGFb3ezq9LzhV/uv2xRWIYy5G4XhvQAYbxAuev2zUB5qJfCuwEY4g5jWxNbSk4KnH31aTfD5o48Gl2SJrOgtlp/3w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=TV651scx; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TV651scx" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-46e2c3b6d4cso25209465e9.3 for ; Sat, 04 Oct 2025 04:20:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759576832; x=1760181632; darn=lists.linux-m68k.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=lbkIsP1rGYqTUmDEWbcljfJKLg/5/O6Q1FlSSvW+JqA=; b=TV651scxEf60BAvB+BS+cvK63U20LUVKAAkOUvSxjbmgpsOJkjuRt3kcEJnBc9Vj7w ZXwrNarWebJ4n+tYc43rJkywwa35VjkicXBHshdaHm3addleVX0u9lQKckQzVEQsBWmc YfeptuXH1HbxfylYTCuRHWZ4tgN6iCk4oZdz64xUlryl/Azu5PWk7Nf0uMR7/R8trpsu UiMtAZTP4LPRbyCwkGsyR4Rq9EPSXTnaXM61JiX7zUNQjd6Gzh76qdxH6pv7Z6jwqPNL QkRVj00x8ZGNCv09NtUXl1QHB64KUsKJpnWR9ikPy04hcLkdQeo/wZX1e9NamLQD3T8h /kEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759576832; x=1760181632; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lbkIsP1rGYqTUmDEWbcljfJKLg/5/O6Q1FlSSvW+JqA=; b=WfLNehWt8UgGp+muzQPC5SOUkk6fN4TyLreF1PY7LZcphS5+fvJJffTDMlSsEQ7TQB TmyJdjJj5OsQJVPECmpcWM9xLtluUBmxdxqws+BxurIgsGZCw4ZHpunI1z1Q+LHXuzvT ZtBjMV5AZVfBYSrtWrLXUGHI+9wygTm+0wXMdsAGKH+WzXpHYMLDkjIGYiSyXrsY8veR KmbrsiOza8vDjNk5iI/jG5Q7X+eCjbI0vZ1W6FgMtSpx4+8CSmvRQsZDbaQE6WQ2n/If QjqeHDGWLBQ1Y5AITwl7AN+hNOnyAqoEBxerGExEFKGwge7+3Zj8V44Q+w1+7R4mhXNQ dIaQ== X-Forwarded-Encrypted: i=1; AJvYcCVhm2bA9fA8+FQ9TF6v5QeWCAoRJBjvAcdEq9GhDj2UoCZjlpSFMcQ2CQXoxO11vp8izCbn4aPrBBm8@lists.linux-m68k.org X-Gm-Message-State: AOJu0YwYFBbXbwYWF70weXPKNq8FFmRA1KQq8mTdDwpGptXR1/Fogh2R PbxvZsu1H065joDByCZKFYH2cJp+MIqpy5TaJuiH8Wt5mYiHrzjsEYy+ X-Gm-Gg: ASbGncuqQxqtf7yQXzBIQvHsaycaYR5ddJ3PY27bPsP/bHBPvmttGp+wcrEetdrdKF+ zf7mJT715UXDA/2QCjYO7n41vWrjEw1sYEaJrOdKhDWVWjxiGAsXPE6qAS5MieWgbTHdRltWikX Op5asV2ACmsGqWfyDg63V1ilODxwHMGA4cIzr0ZUAPGp4TLcf/OCa9ATNSesmX9hjgYAyg5HTtq +ebxkhjlT+unVy5M5+Q0Axy3NFplZ3mqwfu0cmfyde+qbtwIPn0V2XnIIxn3ok3AiZdegQCPT2V VTVp6dggqZbqwepDTJ2uRydoXE92aCyHR6Er0x8kGifQarOxl1Ut/MIESrtNz7lytk+AN92WJkY z+fqzmg/DdycBrf51vSpFWpsMI/07W47aMZBlYY3vnVksMrYxrKUXEEItc8fp6YfNnStJqCVF9h Yjbo/s90ch3j6mLwmnxkrOi1aZ0u+fhiebYWWGzT6smEo6feKpfpzZycrHx85yA7NW6NRW+zeRN Bot77hYa3klHfQv73aYZEgF X-Google-Smtp-Source: AGHT+IFa5UcQgutx0vLHvpiT3XihD7Tx8chIVMEyxBcc9Xb/6ftImpfmkCNl2MA3j99P2OCe52cS7g== X-Received: by 2002:a05:600d:8110:b0:45d:d5df:ab2d with SMTP id 5b1f17b1804b1-46e71146584mr41396905e9.26.1759576831860; Sat, 04 Oct 2025 04:20:31 -0700 (PDT) Received: from ?IPV6:2003:ea:8f35:9e00:6453:3c70:78b7:3fe5? (p200300ea8f359e0064533c7078b73fe5.dip0.t-ipconnect.de. [2003:ea:8f35:9e00:6453:3c70:78b7:3fe5]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-46e6b23d4c5sm110677325e9.17.2025.10.04.04.20.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 04 Oct 2025 04:20:31 -0700 (PDT) Message-ID: Date: Sat, 4 Oct 2025 13:20:38 +0200 Precedence: bulk X-Mailing-List: linux-m68k@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next] net: phy: fixed: let fixed_phy_add always use addr 0 and remove return value From: Heiner Kallweit To: Hauke Mehrtens , Greg Ungerer , Geert Uytterhoeven , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Thomas Bogendoerfer , Andrew Lunn , Andrew Lunn , Russell King - ARM Linux , Paolo Abeni , Eric Dumazet , Jakub Kicinski , David Miller , Takumi Sueda Cc: "netdev@vger.kernel.org" , linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org References: <762700e5-a0b1-41af-aa03-929822a39475@gmail.com> <3c0f31ce-38a8-4f1e-8c39-6aa6ac879dc6@hauke-m.de> <418949c9-9aa2-4845-be8a-3395413143c3@gmail.com> Content-Language: en-US Autocrypt: addr=hkallweit1@gmail.com; keydata= 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 In-Reply-To: <418949c9-9aa2-4845-be8a-3395413143c3@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 8/24/2025 6:36 PM, Heiner Kallweit wrote: > On 8/24/2025 6:05 PM, Hauke Mehrtens wrote: >> On 8/22/25 22:36, Heiner Kallweit wrote: >>> We have only two users of fixed_phy_add(), both use address 0 and >>> ignore the return value. So simplify fixed_phy_add() accordingly. >>> >>> Whilst at it, constify the fixed_phy_status configs. >>> >>> Note: >>> fixed_phy_add() is a legacy function which shouldn't be used in new >>> code, as it's use may be problematic: >>> - No check whether a fixed phy exists already at the given address >>> - If fixed_phy_register() is called afterwards by any other driver, >>>    then it will also use phy_addr 0, because fixed_phy_add() ignores >>>    the ida which manages address assignment >>> Drivers using a fixed phy created by fixed_phy_add() in platform code, >>> should dynamically create a fixed phy with fixed_phy_register() >>> instead. >>> >>> Signed-off-by: Heiner Kallweit >>> --- >>>   arch/m68k/coldfire/m5272.c  | 4 ++-- >>>   arch/mips/bcm47xx/setup.c   | 4 ++-- >>>   drivers/net/phy/fixed_phy.c | 4 ++-- >>>   include/linux/phy_fixed.h   | 8 ++------ >>>   4 files changed, 8 insertions(+), 12 deletions(-) >>> >>> diff --git a/arch/m68k/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c >>> index 5b70dfdab..918e2a323 100644 >>> --- a/arch/m68k/coldfire/m5272.c >>> +++ b/arch/m68k/coldfire/m5272.c >>> @@ -108,7 +108,7 @@ void __init config_BSP(char *commandp, int size) >>>    * an ethernet switch. In this case we need to use the fixed phy type, >>>    * and we need to declare it early in boot. >>>    */ >>> -static struct fixed_phy_status nettel_fixed_phy_status __initdata = { >>> +static const struct fixed_phy_status nettel_fixed_phy_status __initconst = { >>>       .link    = 1, >>>       .speed    = 100, >>>       .duplex    = 0, >>> @@ -119,7 +119,7 @@ static struct fixed_phy_status nettel_fixed_phy_status __initdata = { >>>   static int __init init_BSP(void) >>>   { >>>       m5272_uarts_init(); >>> -    fixed_phy_add(0, &nettel_fixed_phy_status); >>> +    fixed_phy_add(&nettel_fixed_phy_status); >>>       clkdev_add_table(m5272_clk_lookup, ARRAY_SIZE(m5272_clk_lookup)); >>>       return 0; >>>   } >>> diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c >>> index de426a474..a93a4266d 100644 >>> --- a/arch/mips/bcm47xx/setup.c >>> +++ b/arch/mips/bcm47xx/setup.c >>> @@ -256,7 +256,7 @@ static int __init bcm47xx_cpu_fixes(void) >>>   } >>>   arch_initcall(bcm47xx_cpu_fixes); >>>   -static struct fixed_phy_status bcm47xx_fixed_phy_status __initdata = { >>> +static const struct fixed_phy_status bcm47xx_fixed_phy_status __initconst = { >>>       .link    = 1, >>>       .speed    = SPEED_100, >>>       .duplex    = DUPLEX_FULL, >>> @@ -282,7 +282,7 @@ static int __init bcm47xx_register_bus_complete(void) >>>       bcm47xx_leds_register(); >>>       bcm47xx_workarounds(); >>>   -    fixed_phy_add(0, &bcm47xx_fixed_phy_status); >>> +    fixed_phy_add(&bcm47xx_fixed_phy_status); >>>       return 0; >>>   } >>>   device_initcall(bcm47xx_register_bus_complete); >>> diff --git a/drivers/net/phy/fixed_phy.c b/drivers/net/phy/fixed_phy.c >>> index 7902b35c5..b39532abf 100644 >>> --- a/drivers/net/phy/fixed_phy.c >>> +++ b/drivers/net/phy/fixed_phy.c >>> @@ -153,9 +153,9 @@ static int fixed_phy_add_gpiod(unsigned int irq, int phy_addr, >>>       return 0; >>>   } >>>   -int fixed_phy_add(int phy_addr, const struct fixed_phy_status *status) >>> +void fixed_phy_add(const struct fixed_phy_status *status) >>>   { >>> -    return fixed_phy_add_gpiod(PHY_POLL, phy_addr, status, NULL); >>> +    fixed_phy_add_gpiod(PHY_POLL, 0, status, NULL); >>>   } >>>   EXPORT_SYMBOL_GPL(fixed_phy_add); >>>   diff --git a/include/linux/phy_fixed.h b/include/linux/phy_fixed.h >>> index 5399b9e41..6227a1bde 100644 >>> --- a/include/linux/phy_fixed.h >>> +++ b/include/linux/phy_fixed.h >>> @@ -17,7 +17,7 @@ struct net_device; >>>     #if IS_ENABLED(CONFIG_FIXED_PHY) >>>   extern int fixed_phy_change_carrier(struct net_device *dev, bool new_carrier); >>> -int fixed_phy_add(int phy_id, const struct fixed_phy_status *status); >>> +void fixed_phy_add(const struct fixed_phy_status *status); >>>   struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, >>>                         struct device_node *np); >>>   @@ -26,11 +26,7 @@ extern int fixed_phy_set_link_update(struct phy_device *phydev, >>>               int (*link_update)(struct net_device *, >>>                          struct fixed_phy_status *)); >>>   #else >>> -static inline int fixed_phy_add(int phy_id, >>> -                const struct fixed_phy_status *status) >>> -{ >>> -    return -ENODEV; >>> -} >>> +static inline void fixed_phy_add(const struct fixed_phy_status *status) {} >>>   static inline struct phy_device * >>>   fixed_phy_register(const struct fixed_phy_status *status, >>>              struct device_node *np) >> >> Hi, >> >> I do not use this hardware any more, but Takumi reported that fixed_phy_add() is not working for the PHY registration on brcm47xx any more and we have to use fixed_phy_register(), see: >> https://github.com/openwrt/openwrt/pull/19610 >> > I suspected already that fixed_phy_add() usage doesn't work any longer, but don't > have hw to test. I think bfa54812f0bc ("net: phy: fixed_phy: set phy_mask before > calling mdiobus_register()") is to blame. > Reverting this commit or changing the line to fmb->mii_bus->phy_mask = ~1; > should fix the problem. Would be great if Takumi could test this. > Did you have the chance to test this? > The cleaner alternative would be: > - remove call to fixed_phy_add() from platform code > - let b44 call fixed_phy_register() if a fixed phy is needed > Below is a WIP version of this change. > >> Does this need a bigger refactoring anyway? >> >> Hauke > > Heiner > > > --- > drivers/net/ethernet/broadcom/Kconfig | 1 + > drivers/net/ethernet/broadcom/b44.c | 33 ++++++++++++++------------- > 2 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig > index 0fc10e6c6..99292392d 100644 > --- a/drivers/net/ethernet/broadcom/Kconfig > +++ b/drivers/net/ethernet/broadcom/Kconfig > @@ -25,6 +25,7 @@ config B44 > select SSB > select MII > select PHYLIB > + select FIXED_PHY > help > If you have a network (Ethernet) controller of this type, say Y > or M here. > diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c > index 0353359c3..abbb5953c 100644 > --- a/drivers/net/ethernet/broadcom/b44.c > +++ b/drivers/net/ethernet/broadcom/b44.c > @@ -31,6 +31,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -2233,7 +2234,6 @@ static int b44_register_phy_one(struct b44 *bp) > struct mii_bus *mii_bus; > struct ssb_device *sdev = bp->sdev; > struct phy_device *phydev; > - char bus_id[MII_BUS_ID_SIZE + 3]; > struct ssb_sprom *sprom = &sdev->bus->sprom; > int err; > > @@ -2260,27 +2260,26 @@ static int b44_register_phy_one(struct b44 *bp) > goto err_out_mdiobus; > } > > - if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) && > - (sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) { > - > + phydev = mdiobus_get_phy(bp->mii_bus, bp->phy_addr); > + if (!phydev && > + sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM)) { > dev_info(sdev->dev, > "could not find PHY at %i, use fixed one\n", > bp->phy_addr); > > - bp->phy_addr = 0; > - snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, "fixed-0", > - bp->phy_addr); > - } else { > - snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, mii_bus->id, > - bp->phy_addr); > + phydev = fixed_phy_register(NULL, NULL); > + if (!IS_ERR(phydev)) > + bp->phy_addr = phydev->mdio.addr; > } > > - phydev = phy_connect(bp->dev, bus_id, &b44_adjust_link, > - PHY_INTERFACE_MODE_MII); > - if (IS_ERR(phydev)) { > + if (IS_ERR_OR_NULL(phydev)) > + err = -ENODEV; > + else > + err = phy_connect_direct(bp->dev, phydev, &b44_adjust_link, > + PHY_INTERFACE_MODE_MII); > + if (err) { > dev_err(sdev->dev, "could not attach PHY at %i\n", > bp->phy_addr); > - err = PTR_ERR(phydev); > goto err_out_mdiobus_unregister; > } > > @@ -2293,7 +2292,6 @@ static int b44_register_phy_one(struct b44 *bp) > linkmode_copy(phydev->advertising, phydev->supported); > > bp->old_link = 0; > - bp->phy_addr = phydev->mdio.addr; > > phy_attached_info(phydev); > > @@ -2313,8 +2311,11 @@ static void b44_unregister_phy_one(struct b44 *bp) > { > struct net_device *dev = bp->dev; > struct mii_bus *mii_bus = bp->mii_bus; > + struct phy_device *phydev = dev->phydev); > > - phy_disconnect(dev->phydev); > + phy_disconnect(phydev); > + if (phy_is_pseudo_fixed_link(phydev)) > + fixed_phy_unregister(phydev); > mdiobus_unregister(mii_bus); > mdiobus_free(mii_bus); > }