[PATCH net-next v5 3/5] net: renesas: rswitch: Add host_interfaces setting
From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Date: 2023-02-01 13:15:35
Also in:
linux-renesas-soc
Subsystem:
networking drivers, renesas ethernet switch driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Set phydev->host_interfaces before calling of_phy_connect() to configure the PHY with the information of host_interfaces. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/net/ethernet/renesas/rswitch.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
index 479499f9fcb5..f8b3a81c0447 100644
--- a/drivers/net/ethernet/renesas/rswitch.c
+++ b/drivers/net/ethernet/renesas/rswitch.c@@ -1178,6 +1178,7 @@ static int rswitch_phy_device_init(struct rswitch_device *rdev) { struct phy_device *phydev; struct device_node *phy; + int err = -ENOENT; if (!rdev->np_port) return -ENODEV;
@@ -1186,11 +1187,18 @@ static int rswitch_phy_device_init(struct rswitch_device *rdev) if (!phy) return -ENODEV; + /* Set phydev->host_interfaces before calling of_phy_connect() to + * configure the PHY with the information of host_interfaces. + */ + phydev = of_phy_find_device(phy); + if (!phydev) + goto out; + __set_bit(rdev->etha->phy_interface, phydev->host_interfaces); + phydev = of_phy_connect(rdev->ndev, phy, rswitch_adjust_link, 0, rdev->etha->phy_interface); - of_node_put(phy); if (!phydev) - return -ENOENT; + goto out; phy_set_max_speed(phydev, SPEED_2500); phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Half_BIT);
@@ -1201,7 +1209,11 @@ static int rswitch_phy_device_init(struct rswitch_device *rdev) phy_attached_info(phydev); - return 0; + err = 0; +out: + of_node_put(phy); + + return err; } static void rswitch_phy_device_deinit(struct rswitch_device *rdev)
--
2.25.1