On Mon, 2022-03-21 at 23:25 +0800, Andy Chiu wrote:
> In some SGMII use cases where both a fixed link external PHY and the
> internal PCS/PMA PHY need to be configured, we should explicitly use a
> phandle "pcs-phy" to get the reference to the PCS/PMA PHY. Otherwise, the
> driver would use "phy-handle" in the DT as the reference to both the
> external and the internal PCS/PMA PHY.
>
> In other cases where the core is connected to a SFP cage, we could still
> point phy-handle to the intenal PCS/PMA PHY, and let the driver connect
> to the SFP module, if exist, via phylink.
>
> Fixes: 1a02556086fc (net: axienet: Properly handle PCS/PMA PHY for 1000BaseX
> mode)
> Signed-off-by: Andy Chiu <andy.chiu@xxxxxxxxxx>
> Reviewed-by: Greentime Hu <greentime.hu@xxxxxxxxxx>
> ---
> drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> index 496a9227e760..163753508464 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
> @@ -2071,9 +2071,16 @@ static int axienet_probe(struct platform_device *pdev)
>
> if (lp->phy_mode == PHY_INTERFACE_MODE_SGMII ||
> lp->phy_mode == PHY_INTERFACE_MODE_1000BASEX) {
> - np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);
> + np = of_parse_phandle(pdev->dev.of_node, "pcs-handle", 0);
> if (!np) {
> - dev_err(&pdev->dev, "phy-handle required for
> 1000BaseX/SGMII\n");
> + /* Deprecated: Always use "pcs-handle" for pcs_phy.
> + * Falling back to "phy-handle" here is only for
> + * backward compatibility with old device trees.
> + */
> + np = of_parse_phandle(pdev->dev.of_node, "phy-handle",
> 0);
> + }
> + if (!np) {
> + dev_err(&pdev->dev, "pcs-handle (preferred) or phy-
> handle required for 1000BaseX/SGMII\n");
> ret = -EINVAL;
> goto cleanup_mdio;
> }
Reviewed-by: Robert Hancock <robert.hancock@xxxxxxxxxx>
--
Robert Hancock
Senior Hardware Designer, Calian Advanced Technologies
www.calian.com
