Re: [PATCH] net: dsa: add missing phy address offset
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2019-02-20 19:27:23
Also in:
lkml
On 2/20/19 10:15 AM, Marcel Reichmuth wrote:
When phys do not start at address 0 like on the mv88e6341 the wrong phy address is used and therefore the slave ports can not be initialized. This patch adds the proper offset to the phy address. Signed-off-by: Marcel Reichmuth <redacted>
You are supposed to describe the port to PHY mapping using the binding,
so for instance:
ports {
port@0 {
reg = <0>;
phy-handle = <&phy1>;
};
};
mdio {
phy1: phy@1 {
reg = <1>;
};
};
etc. is not that working for you?
quoted hunk ↗ jump to hunk
--- drivers/net/dsa/mv88e6xxx/chip.c | 3 +++ include/net/dsa.h | 1 + net/dsa/slave.c | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-)diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 12fd7ce3f1ff..0ca649f784d2 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c@@ -2198,12 +2198,15 @@ static int mv88e6xxx_setup_upstream_port(struct mv88e6xxx_chip *chip, int port) static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) { struct dsa_switch *ds = chip->ds; + struct dsa_port *dp = &ds->ports[port]; int err; u16 reg; chip->ports[port].chip = chip; chip->ports[port].port = port; + dp->phy_base_addr = chip->info->phy_base_addr; + /* MAC Forcing register: don't force link, speed, duplex or flow control * state to any particular values on physical ports, but force the CPU * port and all DSA ports to their maximum bandwidth and full duplex.diff --git a/include/net/dsa.h b/include/net/dsa.h index b3eefe8e18fd..f9c9dc1f6d21 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h@@ -196,6 +196,7 @@ struct dsa_port { struct dsa_switch *ds; unsigned int index; + unsigned int phy_base_addr; const char *name; const struct dsa_port *cpu_dp; struct device_node *dn;diff --git a/net/dsa/slave.c b/net/dsa/slave.c index a1c9fe155057..4f67dff34a3b 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c@@ -1221,7 +1221,8 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev) /* We could not connect to a designated PHY or SFP, so use the * switch internal MDIO bus instead */ - ret = dsa_slave_phy_connect(slave_dev, dp->index); + ret = dsa_slave_phy_connect(slave_dev, dp->phy_base_addr + + dp->index); if (ret) { netdev_err(slave_dev, "failed to connect to port %d: %d\n",
-- Florian