git/linux-nf
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git synced 2026-04-03 23:38:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: b44: register a fixed phy using fixed_phy_register_100fd if needed

Browse Source 
In case of bcm47xx a fixed phy is used, which so far is created
by platform code, using fixed_phy_add(). This function has a number of
problems, therefore create a potentially needed fixed phy here, using
fixed_phy_register_100fd.

Due to lack of hardware, this is compile-tested only.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/53e4e74d-a49e-4f37-b970-5543a35041db@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Heiner Kallweit
2025-10-30 22:44:35 +01:00
committed by Jakub Kicinski
parent 0ee21f39c5
commit 10d2f15afb
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/broadcom/Kconfig
View File

@@ -25,6 +25,7 @@ config B44
select SSB select SSB
select MII select MII
select PHYLIB select PHYLIB
select FIXED_PHY if BCM47XX
help help
If you have a network (Ethernet) controller of this type, say Y If you have a network (Ethernet) controller of this type, say Y
or M here. or M here.

37
drivers/net/ethernet/broadcom/b44.c
View File

@@ -31,6 +31,7 @@
#include <linux/ssb/ssb.h> #include <linux/ssb/ssb.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/phy_fixed.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
@@ -2233,7 +2234,6 @@ static int b44_register_phy_one(struct b44 *bp)
struct mii_bus *mii_bus; struct mii_bus *mii_bus;
struct ssb_device *sdev = bp->sdev; struct ssb_device *sdev = bp->sdev;
struct phy_device *phydev; struct phy_device *phydev;
char bus_id[MII_BUS_ID_SIZE + 3];
struct ssb_sprom *sprom = &sdev->bus->sprom; struct ssb_sprom *sprom = &sdev->bus->sprom;
int err; int err;
@@ -2260,27 +2260,26 @@ static int b44_register_phy_one(struct b44 *bp)
goto err_out_mdiobus; goto err_out_mdiobus;
} }
if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) && phydev = mdiobus_get_phy(bp->mii_bus, bp->phy_addr);
(sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) { if (!phydev &&
sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM)) {
dev_info(sdev->dev, dev_info(sdev->dev,
"could not find PHY at %i, use fixed one\n", "could not find PHY at %i, use fixed one\n",
bp->phy_addr); bp->phy_addr);
bp->phy_addr = 0; phydev = fixed_phy_register_100fd();
snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, "fixed-0", if (!IS_ERR(phydev))
bp->phy_addr); bp->phy_addr = phydev->mdio.addr;
} else {
snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, mii_bus->id,
bp->phy_addr);
} }
phydev = phy_connect(bp->dev, bus_id, &b44_adjust_link, if (IS_ERR_OR_NULL(phydev))
PHY_INTERFACE_MODE_MII); err = -ENODEV;
if (IS_ERR(phydev)) { 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", dev_err(sdev->dev, "could not attach PHY at %i\n",
bp->phy_addr); bp->phy_addr);
err = PTR_ERR(phydev);
goto err_out_mdiobus_unregister; goto err_out_mdiobus_unregister;
} }
@@ -2293,7 +2292,6 @@ static int b44_register_phy_one(struct b44 *bp)
linkmode_copy(phydev->advertising, phydev->supported); linkmode_copy(phydev->advertising, phydev->supported);
bp->old_link = 0; bp->old_link = 0;
bp->phy_addr = phydev->mdio.addr;
phy_attached_info(phydev); phy_attached_info(phydev);
@@ -2311,10 +2309,15 @@ err_out:
static void b44_unregister_phy_one(struct b44 *bp) static void b44_unregister_phy_one(struct b44 *bp)
{ {
struct net_device *dev = bp->dev;
struct mii_bus *mii_bus = bp->mii_bus; struct mii_bus *mii_bus = bp->mii_bus;
struct net_device *dev = bp->dev;
struct phy_device *phydev;
phy_disconnect(dev->phydev); phydev = dev->phydev;
phy_disconnect(phydev);
if (phy_is_pseudo_fixed_link(phydev))
fixed_phy_unregister(phydev);
mdiobus_unregister(mii_bus); mdiobus_unregister(mii_bus);
mdiobus_free(mii_bus); mdiobus_free(mii_bus);
} }