* [PATCH net-next v5 1/5] net: renesas: rswitch: Simplify struct phy * handling
2023-02-01 13:14 [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY Yoshihiro Shimoda
@ 2023-02-01 13:14 ` Yoshihiro Shimoda
2023-02-01 13:14 ` [PATCH net-next v5 2/5] net: renesas: rswitch: Convert to phy_device Yoshihiro Shimoda
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yoshihiro Shimoda @ 2023-02-01 13:14 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: netdev, linux-renesas-soc, Yoshihiro Shimoda
Simplify struct phy *serdes handling by keeping the valiable in
the struct rswitch_device.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas•com>
---
drivers/net/ethernet/renesas/rswitch.c | 103 ++++++-------------------
drivers/net/ethernet/renesas/rswitch.h | 2 +
2 files changed, 27 insertions(+), 78 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
index 14fc0af304ce..1c154018d795 100644
--- a/drivers/net/ethernet/renesas/rswitch.c
+++ b/drivers/net/ethernet/renesas/rswitch.c
@@ -1071,32 +1071,14 @@ static struct device_node *rswitch_get_port_node(struct rswitch_device *rdev)
return port;
}
-/* Call of_node_put(mdio) after done */
-static struct device_node *rswitch_get_mdio_node(struct rswitch_device *rdev)
-{
- struct device_node *port, *mdio;
-
- port = rswitch_get_port_node(rdev);
- if (!port)
- return NULL;
-
- mdio = of_get_child_by_name(port, "mdio");
- of_node_put(port);
-
- return mdio;
-}
-
static int rswitch_etha_get_params(struct rswitch_device *rdev)
{
- struct device_node *port;
int err;
- port = rswitch_get_port_node(rdev);
- if (!port)
+ if (!rdev->np_port)
return 0; /* ignored */
- err = of_get_phy_mode(port, &rdev->etha->phy_interface);
- of_node_put(port);
+ err = of_get_phy_mode(rdev->np_port, &rdev->etha->phy_interface);
switch (rdev->etha->phy_interface) {
case PHY_INTERFACE_MODE_MII:
@@ -1133,7 +1115,7 @@ static int rswitch_mii_register(struct rswitch_device *rdev)
mii_bus->write_c45 = rswitch_etha_mii_write_c45;
mii_bus->parent = &rdev->priv->pdev->dev;
- mdio_np = rswitch_get_mdio_node(rdev);
+ mdio_np = of_get_child_by_name(rdev->np_port, "mdio");
err = of_mdiobus_register(mii_bus, mdio_np);
if (err < 0) {
mdiobus_free(mii_bus);
@@ -1185,12 +1167,9 @@ static const struct phylink_mac_ops rswitch_phylink_ops = {
static int rswitch_phylink_init(struct rswitch_device *rdev)
{
- struct device_node *port;
struct phylink *phylink;
- int err;
- port = rswitch_get_port_node(rdev);
- if (!port)
+ if (!rdev->np_port)
return -ENODEV;
rdev->phylink_config.dev = &rdev->ndev->dev;
@@ -1199,19 +1178,14 @@ static int rswitch_phylink_init(struct rswitch_device *rdev)
__set_bit(PHY_INTERFACE_MODE_USXGMII, rdev->phylink_config.supported_interfaces);
rdev->phylink_config.mac_capabilities = MAC_100FD | MAC_1000FD | MAC_2500FD;
- phylink = phylink_create(&rdev->phylink_config, &port->fwnode,
+ phylink = phylink_create(&rdev->phylink_config, &rdev->np_port->fwnode,
rdev->etha->phy_interface, &rswitch_phylink_ops);
- if (IS_ERR(phylink)) {
- err = PTR_ERR(phylink);
- goto out;
- }
+ if (IS_ERR(phylink))
+ return PTR_ERR(phylink);
rdev->phylink = phylink;
- err = phylink_of_phy_connect(rdev->phylink, port, rdev->etha->phy_interface);
-out:
- of_node_put(port);
- return err;
+ return phylink_of_phy_connect(rdev->phylink, rdev->np_port, rdev->etha->phy_interface);
}
static void rswitch_phylink_deinit(struct rswitch_device *rdev)
@@ -1224,47 +1198,14 @@ static void rswitch_phylink_deinit(struct rswitch_device *rdev)
static int rswitch_serdes_set_params(struct rswitch_device *rdev)
{
- struct device_node *port = rswitch_get_port_node(rdev);
- struct phy *serdes;
int err;
- serdes = devm_of_phy_get(&rdev->priv->pdev->dev, port, NULL);
- of_node_put(port);
- if (IS_ERR(serdes))
- return PTR_ERR(serdes);
-
- err = phy_set_mode_ext(serdes, PHY_MODE_ETHERNET,
+ err = phy_set_mode_ext(rdev->serdes, PHY_MODE_ETHERNET,
rdev->etha->phy_interface);
if (err < 0)
return err;
- return phy_set_speed(serdes, rdev->etha->speed);
-}
-
-static int rswitch_serdes_init(struct rswitch_device *rdev)
-{
- struct device_node *port = rswitch_get_port_node(rdev);
- struct phy *serdes;
-
- serdes = devm_of_phy_get(&rdev->priv->pdev->dev, port, NULL);
- of_node_put(port);
- if (IS_ERR(serdes))
- return PTR_ERR(serdes);
-
- return phy_init(serdes);
-}
-
-static int rswitch_serdes_deinit(struct rswitch_device *rdev)
-{
- struct device_node *port = rswitch_get_port_node(rdev);
- struct phy *serdes;
-
- serdes = devm_of_phy_get(&rdev->priv->pdev->dev, port, NULL);
- of_node_put(port);
- if (IS_ERR(serdes))
- return PTR_ERR(serdes);
-
- return phy_exit(serdes);
+ return phy_set_speed(rdev->serdes, rdev->etha->speed);
}
static int rswitch_ether_port_init_one(struct rswitch_device *rdev)
@@ -1286,6 +1227,12 @@ static int rswitch_ether_port_init_one(struct rswitch_device *rdev)
if (err < 0)
goto err_phylink_init;
+ rdev->serdes = devm_of_phy_get(&rdev->priv->pdev->dev, rdev->np_port, NULL);
+ if (IS_ERR(rdev->serdes)) {
+ err = PTR_ERR(rdev->serdes);
+ goto err_serdes_phy_get;
+ }
+
err = rswitch_serdes_set_params(rdev);
if (err < 0)
goto err_serdes_set_params;
@@ -1293,6 +1240,7 @@ static int rswitch_ether_port_init_one(struct rswitch_device *rdev)
return 0;
err_serdes_set_params:
+err_serdes_phy_get:
rswitch_phylink_deinit(rdev);
err_phylink_init:
@@ -1318,7 +1266,7 @@ static int rswitch_ether_port_init_all(struct rswitch_private *priv)
}
rswitch_for_each_enabled_port(priv, i) {
- err = rswitch_serdes_init(priv->rdev[i]);
+ err = phy_init(priv->rdev[i]->serdes);
if (err)
goto err_serdes;
}
@@ -1327,7 +1275,7 @@ static int rswitch_ether_port_init_all(struct rswitch_private *priv)
err_serdes:
rswitch_for_each_enabled_port_continue_reverse(priv, i)
- rswitch_serdes_deinit(priv->rdev[i]);
+ phy_exit(priv->rdev[i]->serdes);
i = RSWITCH_NUM_PORTS;
err_init_one:
@@ -1342,7 +1290,7 @@ static void rswitch_ether_port_deinit_all(struct rswitch_private *priv)
int i;
for (i = 0; i < RSWITCH_NUM_PORTS; i++) {
- rswitch_serdes_deinit(priv->rdev[i]);
+ phy_exit(priv->rdev[i]->serdes);
rswitch_ether_port_deinit_one(priv->rdev[i]);
}
}
@@ -1565,7 +1513,6 @@ static int rswitch_device_alloc(struct rswitch_private *priv, int index)
{
struct platform_device *pdev = priv->pdev;
struct rswitch_device *rdev;
- struct device_node *port;
struct net_device *ndev;
int err;
@@ -1594,10 +1541,10 @@ static int rswitch_device_alloc(struct rswitch_private *priv, int index)
netif_napi_add(ndev, &rdev->napi, rswitch_poll);
- port = rswitch_get_port_node(rdev);
- rdev->disabled = !port;
- err = of_get_ethdev_address(port, ndev);
- of_node_put(port);
+ rdev->np_port = rswitch_get_port_node(rdev);
+ rdev->disabled = !rdev->np_port;
+ err = of_get_ethdev_address(rdev->np_port, ndev);
+ of_node_put(rdev->np_port);
if (err) {
if (is_valid_ether_addr(rdev->etha->mac_addr))
eth_hw_addr_set(ndev, rdev->etha->mac_addr);
@@ -1798,7 +1745,7 @@ static void rswitch_deinit(struct rswitch_private *priv)
for (i = 0; i < RSWITCH_NUM_PORTS; i++) {
struct rswitch_device *rdev = priv->rdev[i];
- rswitch_serdes_deinit(rdev);
+ phy_exit(priv->rdev[i]->serdes);
rswitch_ether_port_deinit_one(rdev);
unregister_netdev(rdev->ndev);
rswitch_device_free(priv, i);
diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/renesas/rswitch.h
index 49efb0f31c77..6ae79395006e 100644
--- a/drivers/net/ethernet/renesas/rswitch.h
+++ b/drivers/net/ethernet/renesas/rswitch.h
@@ -953,6 +953,8 @@ struct rswitch_device {
int port;
struct rswitch_etha *etha;
+ struct device_node *np_port;
+ struct phy *serdes;
};
struct rswitch_mfwd_mac_table_entry {
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v5 2/5] net: renesas: rswitch: Convert to phy_device
2023-02-01 13:14 [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY Yoshihiro Shimoda
2023-02-01 13:14 ` [PATCH net-next v5 1/5] net: renesas: rswitch: Simplify struct phy * handling Yoshihiro Shimoda
@ 2023-02-01 13:14 ` Yoshihiro Shimoda
2023-02-01 13:14 ` [PATCH net-next v5 3/5] net: renesas: rswitch: Add host_interfaces setting Yoshihiro Shimoda
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yoshihiro Shimoda @ 2023-02-01 13:14 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: netdev, linux-renesas-soc, Yoshihiro Shimoda
Intended to set phy_device->host_interfaces by phylink in the future.
But there is difficult to implement phylink properly, especially
supporting the in-band mode on this driver because extra initialization
is needed after linked the ethernet PHY up. So, convert to phy_device
from phylink.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas•com>
---
drivers/net/ethernet/renesas/rswitch.c | 110 ++++++++++++++-----------
drivers/net/ethernet/renesas/rswitch.h | 2 -
2 files changed, 62 insertions(+), 50 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
index 1c154018d795..479499f9fcb5 100644
--- a/drivers/net/ethernet/renesas/rswitch.c
+++ b/drivers/net/ethernet/renesas/rswitch.c
@@ -16,7 +16,6 @@
#include <linux/of_irq.h>
#include <linux/of_mdio.h>
#include <linux/of_net.h>
-#include <linux/phylink.h>
#include <linux/phy/phy.h>
#include <linux/pm_runtime.h>
#include <linux/rtnetlink.h>
@@ -1139,61 +1138,78 @@ static void rswitch_mii_unregister(struct rswitch_device *rdev)
}
}
-static void rswitch_mac_config(struct phylink_config *config,
- unsigned int mode,
- const struct phylink_link_state *state)
+static void rswitch_adjust_link(struct net_device *ndev)
{
-}
+ struct rswitch_device *rdev = netdev_priv(ndev);
+ struct phy_device *phydev = ndev->phydev;
-static void rswitch_mac_link_down(struct phylink_config *config,
- unsigned int mode,
- phy_interface_t interface)
-{
+ /* Current hardware has a restriction not to change speed at runtime */
+ if (phydev->link != rdev->etha->link) {
+ phy_print_status(phydev);
+ rdev->etha->link = phydev->link;
+ }
}
-static void rswitch_mac_link_up(struct phylink_config *config,
- struct phy_device *phydev, unsigned int mode,
- phy_interface_t interface, int speed,
- int duplex, bool tx_pause, bool rx_pause)
+static void rswitch_phy_remove_link_mode(struct rswitch_device *rdev,
+ struct phy_device *phydev)
{
- /* Current hardware cannot change speed at runtime */
-}
+ /* Current hardware has a restriction not to change speed at runtime */
+ switch (rdev->etha->speed) {
+ case SPEED_2500:
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Full_BIT);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Full_BIT);
+ break;
+ case SPEED_1000:
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_2500baseX_Full_BIT);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Full_BIT);
+ break;
+ case SPEED_100:
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_2500baseX_Full_BIT);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Full_BIT);
+ break;
+ default:
+ break;
+ }
-static const struct phylink_mac_ops rswitch_phylink_ops = {
- .mac_config = rswitch_mac_config,
- .mac_link_down = rswitch_mac_link_down,
- .mac_link_up = rswitch_mac_link_up,
-};
+ phy_set_max_speed(phydev, rdev->etha->speed);
+}
-static int rswitch_phylink_init(struct rswitch_device *rdev)
+static int rswitch_phy_device_init(struct rswitch_device *rdev)
{
- struct phylink *phylink;
+ struct phy_device *phydev;
+ struct device_node *phy;
if (!rdev->np_port)
return -ENODEV;
- rdev->phylink_config.dev = &rdev->ndev->dev;
- rdev->phylink_config.type = PHYLINK_NETDEV;
- __set_bit(PHY_INTERFACE_MODE_SGMII, rdev->phylink_config.supported_interfaces);
- __set_bit(PHY_INTERFACE_MODE_USXGMII, rdev->phylink_config.supported_interfaces);
- rdev->phylink_config.mac_capabilities = MAC_100FD | MAC_1000FD | MAC_2500FD;
+ phy = of_parse_phandle(rdev->np_port, "phy-handle", 0);
+ if (!phy)
+ return -ENODEV;
+
+ phydev = of_phy_connect(rdev->ndev, phy, rswitch_adjust_link, 0,
+ rdev->etha->phy_interface);
+ of_node_put(phy);
+ if (!phydev)
+ return -ENOENT;
- phylink = phylink_create(&rdev->phylink_config, &rdev->np_port->fwnode,
- rdev->etha->phy_interface, &rswitch_phylink_ops);
- if (IS_ERR(phylink))
- return PTR_ERR(phylink);
+ phy_set_max_speed(phydev, SPEED_2500);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Half_BIT);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Full_BIT);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_100baseT_Half_BIT);
+ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_1000baseT_Half_BIT);
+ rswitch_phy_remove_link_mode(rdev, phydev);
- rdev->phylink = phylink;
+ phy_attached_info(phydev);
- return phylink_of_phy_connect(rdev->phylink, rdev->np_port, rdev->etha->phy_interface);
+ return 0;
}
-static void rswitch_phylink_deinit(struct rswitch_device *rdev)
+static void rswitch_phy_device_deinit(struct rswitch_device *rdev)
{
- rtnl_lock();
- phylink_disconnect_phy(rdev->phylink);
- rtnl_unlock();
- phylink_destroy(rdev->phylink);
+ if (rdev->ndev->phydev) {
+ phy_disconnect(rdev->ndev->phydev);
+ rdev->ndev->phydev = NULL;
+ }
}
static int rswitch_serdes_set_params(struct rswitch_device *rdev)
@@ -1223,9 +1239,9 @@ static int rswitch_ether_port_init_one(struct rswitch_device *rdev)
if (err < 0)
return err;
- err = rswitch_phylink_init(rdev);
+ err = rswitch_phy_device_init(rdev);
if (err < 0)
- goto err_phylink_init;
+ goto err_phy_device_init;
rdev->serdes = devm_of_phy_get(&rdev->priv->pdev->dev, rdev->np_port, NULL);
if (IS_ERR(rdev->serdes)) {
@@ -1241,9 +1257,9 @@ static int rswitch_ether_port_init_one(struct rswitch_device *rdev)
err_serdes_set_params:
err_serdes_phy_get:
- rswitch_phylink_deinit(rdev);
+ rswitch_phy_device_deinit(rdev);
-err_phylink_init:
+err_phy_device_init:
rswitch_mii_unregister(rdev);
return err;
@@ -1251,7 +1267,7 @@ static int rswitch_ether_port_init_one(struct rswitch_device *rdev)
static void rswitch_ether_port_deinit_one(struct rswitch_device *rdev)
{
- rswitch_phylink_deinit(rdev);
+ rswitch_phy_device_deinit(rdev);
rswitch_mii_unregister(rdev);
}
@@ -1299,7 +1315,7 @@ static int rswitch_open(struct net_device *ndev)
{
struct rswitch_device *rdev = netdev_priv(ndev);
- phylink_start(rdev->phylink);
+ phy_start(ndev->phydev);
napi_enable(&rdev->napi);
netif_start_queue(ndev);
@@ -1319,7 +1335,7 @@ static int rswitch_stop(struct net_device *ndev)
rswitch_enadis_data_irq(rdev->priv, rdev->tx_queue->index, false);
rswitch_enadis_data_irq(rdev->priv, rdev->rx_queue->index, false);
- phylink_stop(rdev->phylink);
+ phy_stop(ndev->phydev);
napi_disable(&rdev->napi);
return 0;
@@ -1447,8 +1463,6 @@ static int rswitch_hwstamp_set(struct net_device *ndev, struct ifreq *req)
static int rswitch_eth_ioctl(struct net_device *ndev, struct ifreq *req, int cmd)
{
- struct rswitch_device *rdev = netdev_priv(ndev);
-
if (!netif_running(ndev))
return -EINVAL;
@@ -1458,7 +1472,7 @@ static int rswitch_eth_ioctl(struct net_device *ndev, struct ifreq *req, int cmd
case SIOCSHWTSTAMP:
return rswitch_hwstamp_set(ndev, req);
default:
- return phylink_mii_ioctl(rdev->phylink, req, cmd);
+ return phy_mii_ioctl(ndev->phydev, req, cmd);
}
}
diff --git a/drivers/net/ethernet/renesas/rswitch.h b/drivers/net/ethernet/renesas/rswitch.h
index 6ae79395006e..59830ab91a69 100644
--- a/drivers/net/ethernet/renesas/rswitch.h
+++ b/drivers/net/ethernet/renesas/rswitch.h
@@ -943,8 +943,6 @@ struct rswitch_device {
struct rswitch_private *priv;
struct net_device *ndev;
struct napi_struct napi;
- struct phylink *phylink;
- struct phylink_config phylink_config;
void __iomem *addr;
struct rswitch_gwca_queue *tx_queue;
struct rswitch_gwca_queue *rx_queue;
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v5 3/5] net: renesas: rswitch: Add host_interfaces setting
2023-02-01 13:14 [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY Yoshihiro Shimoda
2023-02-01 13:14 ` [PATCH net-next v5 1/5] net: renesas: rswitch: Simplify struct phy * handling Yoshihiro Shimoda
2023-02-01 13:14 ` [PATCH net-next v5 2/5] net: renesas: rswitch: Convert to phy_device Yoshihiro Shimoda
@ 2023-02-01 13:14 ` Yoshihiro Shimoda
2023-02-01 13:14 ` [PATCH net-next v5 4/5] net: renesas: rswitch: Add phy_power_{on,off}() calling Yoshihiro Shimoda
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yoshihiro Shimoda @ 2023-02-01 13:14 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: netdev, linux-renesas-soc, Yoshihiro Shimoda
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v5 4/5] net: renesas: rswitch: Add phy_power_{on,off}() calling
2023-02-01 13:14 [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY Yoshihiro Shimoda
` (2 preceding siblings ...)
2023-02-01 13:14 ` [PATCH net-next v5 3/5] net: renesas: rswitch: Add host_interfaces setting Yoshihiro Shimoda
@ 2023-02-01 13:14 ` Yoshihiro Shimoda
2023-02-01 13:14 ` [PATCH net-next v5 5/5] net: renesas: rswitch: Add "max-speed" handling Yoshihiro Shimoda
2023-02-03 9:40 ` [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY patchwork-bot+netdevbpf
5 siblings, 0 replies; 7+ messages in thread
From: Yoshihiro Shimoda @ 2023-02-01 13:14 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: netdev, linux-renesas-soc, Yoshihiro Shimoda
Some Ethernet PHYs (like marvell10g) will decide the host interface
mode by the media-side speed. So, the rswitch driver needs to
initialize one of the Ethernet SERDES (r8a779f0-eth-serdes) ports
after linked the Ethernet PHY up. The r8a779f0-eth-serdes driver has
.init() for initializing all ports and .power_on() for initializing
each port. So, add phy_power_{on,off} calling for it.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas•com>
---
drivers/net/ethernet/renesas/rswitch.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
index f8b3a81c0447..f1a0dd1098f9 100644
--- a/drivers/net/ethernet/renesas/rswitch.c
+++ b/drivers/net/ethernet/renesas/rswitch.c
@@ -1146,6 +1146,11 @@ static void rswitch_adjust_link(struct net_device *ndev)
/* Current hardware has a restriction not to change speed at runtime */
if (phydev->link != rdev->etha->link) {
phy_print_status(phydev);
+ if (phydev->link)
+ phy_power_on(rdev->serdes);
+ else
+ phy_power_off(rdev->serdes);
+
rdev->etha->link = phydev->link;
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH net-next v5 5/5] net: renesas: rswitch: Add "max-speed" handling
2023-02-01 13:14 [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY Yoshihiro Shimoda
` (3 preceding siblings ...)
2023-02-01 13:14 ` [PATCH net-next v5 4/5] net: renesas: rswitch: Add phy_power_{on,off}() calling Yoshihiro Shimoda
@ 2023-02-01 13:14 ` Yoshihiro Shimoda
2023-02-03 9:40 ` [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY patchwork-bot+netdevbpf
5 siblings, 0 replies; 7+ messages in thread
From: Yoshihiro Shimoda @ 2023-02-01 13:14 UTC (permalink / raw)
To: davem, edumazet, kuba, pabeni
Cc: netdev, linux-renesas-soc, Yoshihiro Shimoda
The previous code set the speed by the interface mode of PHY.
Also this hardware has a restriction which cannot change the speed
at runtime. To use other speed, add "max-speed" handling to set
each port's speed if needed.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas•com>
---
drivers/net/ethernet/renesas/rswitch.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
index f1a0dd1098f9..50b61a0a7f53 100644
--- a/drivers/net/ethernet/renesas/rswitch.c
+++ b/drivers/net/ethernet/renesas/rswitch.c
@@ -1072,13 +1072,23 @@ static struct device_node *rswitch_get_port_node(struct rswitch_device *rdev)
static int rswitch_etha_get_params(struct rswitch_device *rdev)
{
+ u32 max_speed;
int err;
if (!rdev->np_port)
return 0; /* ignored */
err = of_get_phy_mode(rdev->np_port, &rdev->etha->phy_interface);
+ if (err)
+ return err;
+
+ err = of_property_read_u32(rdev->np_port, "max-speed", &max_speed);
+ if (!err) {
+ rdev->etha->speed = max_speed;
+ return 0;
+ }
+ /* if no "max-speed" property, let's use default speed */
switch (rdev->etha->phy_interface) {
case PHY_INTERFACE_MODE_MII:
rdev->etha->speed = SPEED_100;
@@ -1090,11 +1100,10 @@ static int rswitch_etha_get_params(struct rswitch_device *rdev)
rdev->etha->speed = SPEED_2500;
break;
default:
- err = -EINVAL;
- break;
+ return -EINVAL;
}
- return err;
+ return 0;
}
static int rswitch_mii_register(struct rswitch_device *rdev)
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY
2023-02-01 13:14 [PATCH net-next v5 0/5] net: renesas: rswitch: Modify initialization for SERDES and PHY Yoshihiro Shimoda
` (4 preceding siblings ...)
2023-02-01 13:14 ` [PATCH net-next v5 5/5] net: renesas: rswitch: Add "max-speed" handling Yoshihiro Shimoda
@ 2023-02-03 9:40 ` patchwork-bot+netdevbpf
5 siblings, 0 replies; 7+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-02-03 9:40 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: davem, edumazet, kuba, pabeni, netdev, linux-renesas-soc
Hello:
This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft•net>:
On Wed, 1 Feb 2023 22:14:49 +0900 you wrote:
> - My platform has the 88x2110.
> - The MACTYPE setting of strap pin on the platform is SXGMII.
> - However, we realized that the SoC cannot communicate the PHY with SXGMII
> because of mismatching hardware specification.
> - We have a lot of boards which mismatch the MACTYPE setting.
>
> So, I would like to change the MACTYPE as SGMII by software for the platform.
>
> [...]
Here is the summary with links:
- [net-next,v5,1/5] net: renesas: rswitch: Simplify struct phy * handling
https://git.kernel.org/netdev/net-next/c/b46f1e579329
- [net-next,v5,2/5] net: renesas: rswitch: Convert to phy_device
https://git.kernel.org/netdev/net-next/c/c16a5033f77b
- [net-next,v5,3/5] net: renesas: rswitch: Add host_interfaces setting
https://git.kernel.org/netdev/net-next/c/0df024d0f1d3
- [net-next,v5,4/5] net: renesas: rswitch: Add phy_power_{on,off}() calling
https://git.kernel.org/netdev/net-next/c/5cb630925b49
- [net-next,v5,5/5] net: renesas: rswitch: Add "max-speed" handling
https://git.kernel.org/netdev/net-next/c/04c77d9130b6
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 7+ messages in thread