2023-02-02 12:26:47

by Pandey, Radhey Shyam

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

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 <[email protected]>
---
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

2023-02-02 13:10:45

by Jiri Pirko

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

Thu, Feb 02, 2023 at 01:26:19PM CET, [email protected] wrote:
>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 <[email protected]>

Reviewed-by: Jiri Pirko <[email protected]>

2023-02-02 13:47:00

by Michal Simek

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

On 2/2/23 13:26, Radhey Shyam Pandey wrote:
> 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 <[email protected]>

Reported-by: Michal Simek <[email protected]>
Tested-by: Michal Simek <[email protected]>

Thanks,
Michal

2023-02-03 11:23:46

by Claudiu Beznea

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

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 <[email protected]>

Reviewed-by: Claudiu Beznea <[email protected]>


> ---
> 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
>

2023-02-04 04:00:34

by patchwork-bot+netdevbpf

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

Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:

On Thu, 2 Feb 2023 17:56:19 +0530 you wrote:
> 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.
>
> [...]

Here is the summary with links:
- net: macb: Perform zynqmp dynamic configuration only for SGMII interface
https://git.kernel.org/netdev/net/c/c9011b028e95

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html