Re: [PATCH] net: macb: Perform zynqmp dynamic configuration only for SGMII interface

[Claudiu.Beznea]

On 02.02.2023 14:26, Radhey Shyam Pandey wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> In zynqmp platforms where firmware supports dynamic SGMII configuration
> but has other non-SGMII ethernet devices, it fails them with no packets
> received at the RX interface.
> 
> To fix this behaviour perform SGMII dynamic configuration only
> for the SGMII phy interface.
> 
> Fixes: 32cee7818111 ("net: macb: Add zynqmp SGMII dynamic configuration support")
> Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xxxxxxx>

Reviewed-by: Claudiu Beznea <claudiu.beznea@xxxxxxxxxxxxx>


> ---
>  drivers/net/ethernet/cadence/macb_main.c | 31 ++++++++++++------------
>  1 file changed, 16 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
> index 72e42820713d..6cda31520c42 100644
> --- a/drivers/net/ethernet/cadence/macb_main.c
> +++ b/drivers/net/ethernet/cadence/macb_main.c
> @@ -4627,25 +4627,26 @@ static int init_reset_optional(struct platform_device *pdev)
>                 if (ret)
>                         return dev_err_probe(&pdev->dev, ret,
>                                              "failed to init SGMII PHY\n");
> -       }
> 
> -       ret = zynqmp_pm_is_function_supported(PM_IOCTL, IOCTL_SET_GEM_CONFIG);
> -       if (!ret) {
> -               u32 pm_info[2];
> +               ret = zynqmp_pm_is_function_supported(PM_IOCTL, IOCTL_SET_GEM_CONFIG);
> +               if (!ret) {
> +                       u32 pm_info[2];
> +
> +                       ret = of_property_read_u32_array(pdev->dev.of_node, "power-domains",
> +                                                        pm_info, ARRAY_SIZE(pm_info));
> +                       if (ret) {
> +                               dev_err(&pdev->dev, "Failed to read power management information\n");
> +                               goto err_out_phy_exit;
> +                       }
> +                       ret = zynqmp_pm_set_gem_config(pm_info[1], GEM_CONFIG_FIXED, 0);
> +                       if (ret)
> +                               goto err_out_phy_exit;
> 
> -               ret = of_property_read_u32_array(pdev->dev.of_node, "power-domains",
> -                                                pm_info, ARRAY_SIZE(pm_info));
> -               if (ret) {
> -                       dev_err(&pdev->dev, "Failed to read power management information\n");
> -                       goto err_out_phy_exit;
> +                       ret = zynqmp_pm_set_gem_config(pm_info[1], GEM_CONFIG_SGMII_MODE, 1);
> +                       if (ret)
> +                               goto err_out_phy_exit;
>                 }
> -               ret = zynqmp_pm_set_gem_config(pm_info[1], GEM_CONFIG_FIXED, 0);
> -               if (ret)
> -                       goto err_out_phy_exit;
> 
> -               ret = zynqmp_pm_set_gem_config(pm_info[1], GEM_CONFIG_SGMII_MODE, 1);
> -               if (ret)
> -                       goto err_out_phy_exit;
>         }
> 
>         /* Fully reset controller at hardware level if mapped in device tree */
> --
> 2.25.1
>