| Message ID | 20170724134848.19330-9-antoine.tenart@free-electrons.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Jul 24, 2017 at 03:48:38PM +0200, Antoine Tenart wrote: > SFP ports do not necessarily need to have an Ethernet PHY between the > SoC and the actual physical port. However, the driver currently makes > the "phy" property mandatory, contrary to what is stated in the Device > Tree binding. > > To allow handling the PPv2 controller on those boards, this patch makes > the PHY optional, and aligns the PPv2 driver on its device tree > documentation. It is an architectural question... but with the boards i have with an SFF port, i actually use a fixed-phy to represent the SFF. Then nothing special is needed. Also, Russell King posted his phylink patches. Once accepted, you are going to want to re-write some of this to make use of that code. Andrew
Hi Andrew, On Wed, Jul 26, 2017 at 06:20:00PM +0200, Andrew Lunn wrote: > On Mon, Jul 24, 2017 at 03:48:38PM +0200, Antoine Tenart wrote: > > SFP ports do not necessarily need to have an Ethernet PHY between the > > SoC and the actual physical port. However, the driver currently makes > > the "phy" property mandatory, contrary to what is stated in the Device > > Tree binding. > > > > To allow handling the PPv2 controller on those boards, this patch makes > > the PHY optional, and aligns the PPv2 driver on its device tree > > documentation. > > It is an architectural question... > > but with the boards i have with an SFF port, i actually use a > fixed-phy to represent the SFF. Then nothing special is needed. I was not aware of the fixed-phy, that might work for us here. Thanks for the hint! > Also, Russell King posted his phylink patches. Once accepted, you are > going to want to re-write some of this to make use of that code. And there's that as well. Thanks! Antoine
diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c index 948f5bd4ab18..f6eb98d38ced 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -6094,7 +6094,8 @@ static void mvpp2_start_dev(struct mvpp2_port *port) mvpp2_port_mii_set(port); mvpp2_port_enable(port); - phy_start(ndev->phydev); + if (ndev->phydev) + phy_start(ndev->phydev); netif_tx_start_all_queues(port->dev); } @@ -6118,7 +6119,8 @@ static void mvpp2_stop_dev(struct mvpp2_port *port) mvpp2_egress_disable(port); mvpp2_port_disable(port); - phy_stop(ndev->phydev); + if (ndev->phydev) + phy_stop(ndev->phydev); } static int mvpp2_check_ringparam_valid(struct net_device *dev, @@ -6176,6 +6178,10 @@ static int mvpp2_phy_connect(struct mvpp2_port *port) struct phy_device *phy_dev; u32 phy_addr; + /* No PHY is attached */ + if (!port->phy_node) + return 0; + phy_dev = of_phy_connect(port->dev, port->phy_node, mvpp2_link_event, 0, port->phy_interface); if (!phy_dev) { @@ -6206,6 +6212,9 @@ static void mvpp2_phy_disconnect(struct mvpp2_port *port) { struct net_device *ndev = port->dev; + if (!ndev->phydev) + return; + phy_disconnect(ndev->phydev); } @@ -6760,12 +6769,6 @@ static int mvpp2_port_probe(struct platform_device *pdev, return -ENOMEM; phy_node = of_parse_phandle(port_node, "phy", 0); - if (!phy_node) { - dev_err(&pdev->dev, "missing phy\n"); - err = -ENODEV; - goto err_free_netdev; - } - phy_mode = of_get_phy_mode(port_node); if (phy_mode < 0) { dev_err(&pdev->dev, "incorrect phy mode\n");
SFP ports do not necessarily need to have an Ethernet PHY between the SoC and the actual physical port. However, the driver currently makes the "phy" property mandatory, contrary to what is stated in the Device Tree binding. To allow handling the PPv2 controller on those boards, this patch makes the PHY optional, and aligns the PPv2 driver on its device tree documentation. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> --- drivers/net/ethernet/marvell/mvpp2.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)