KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel: b53: register switch on probe

Browse source 
Currently, the b53 MDIO switch driver registers the switch on
config-init and not on device probe. Because of this, the switch
gets added every time the associated interface comes up.

This commit fixes this behavior by registering the switch on device
probe.

Compile- and run-tested on OCEDO Koala.

Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer 2018-10-22 02:35:36 +02:00 committed by Kevin Darbyshire-Bryant
parent 53020ed4b9
commit 6680fab947
1 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
target/linux/generic/files/drivers/net/phy/b53/b53_mdio.c
View file

@ -273,47 +273,34 @@ static struct b53_io_ops b53_mdio_ops = {
static int b53_phy_probe(struct phy_device *phydev) static int b53_phy_probe(struct phy_device *phydev)
{ {
struct b53_device dev; struct b53_device *dev;
int ret; int ret;
/* allow the generic phy driver to take over */ /* allow the generic phy driver to take over */
if (phydev->mdio.addr != B53_PSEUDO_PHY && phydev->mdio.addr != 0) if (phydev->mdio.addr != B53_PSEUDO_PHY && phydev->mdio.addr != 0)
return -ENODEV; return -ENODEV;
dev.current_page = 0xff; dev = b53_switch_alloc(&phydev->mdio.dev, &b53_mdio_ops, phydev->mdio.bus);
dev.priv = phydev->mdio.bus; if (!dev)
dev.ops = &b53_mdio_ops; return -ENOMEM;
dev.pdata = NULL;
mutex_init(&dev.reg_mutex);
ret = b53_switch_detect(&dev); dev->current_page = 0xff;
dev->priv = phydev->mdio.bus;
dev->ops = &b53_mdio_ops;
dev->pdata = NULL;
mutex_init(&dev->reg_mutex);
ret = b53_switch_detect(dev);
if (ret) if (ret)
return ret; return ret;
if (is5325(&dev) || is5365(&dev)) if (is5325(dev) || is5365(dev))
phydev->supported = SUPPORTED_100baseT_Full; phydev->supported = SUPPORTED_100baseT_Full;
else else
phydev->supported = SUPPORTED_1000baseT_Full; phydev->supported = SUPPORTED_1000baseT_Full;
phydev->advertising = phydev->supported; phydev->advertising = phydev->supported;
return 0;
}
static int b53_phy_config_init(struct phy_device *phydev)
{
struct b53_device *dev;
int ret;
dev = b53_switch_alloc(&phydev->mdio.dev, &b53_mdio_ops, phydev->mdio.bus);
if (!dev)
return -ENOMEM;
/* we don't use page 0xff, so force a page set */
dev->current_page = 0xff;
/* force the ethX as alias */
dev->sw_dev.alias = phydev->attached_dev->name;
ret = b53_switch_register(dev); ret = b53_switch_register(dev);
if (ret) { if (ret) {
dev_err(dev->dev, "failed to register switch: %i\n", ret); dev_err(dev->dev, "failed to register switch: %i\n", ret);
@ -325,6 +312,18 @@ static int b53_phy_config_init(struct phy_device *phydev)
return 0; return 0;
} }
static int b53_phy_config_init(struct phy_device *phydev)
{
struct b53_device *dev = phydev->priv;
/* we don't use page 0xff, so force a page set */
dev->current_page = 0xff;
/* force the ethX as alias */
dev->sw_dev.alias = phydev->attached_dev->name;
return 0;
}
static void b53_phy_remove(struct phy_device *phydev) static void b53_phy_remove(struct phy_device *phydev)
{ {
struct b53_device *priv = phydev->priv; struct b53_device *priv = phydev->priv;