net: stmmac: dwmac-qcom-ethqos: fix a regression on EMAC < 3
Subsystems (5)
PATCH 1/1 net: stmmac: dwmac-qcom-ethqos: fix a regression on EMAC < 3
From: Bartosz Golaszewski <[email protected]>
We must not assign plat_dat->dwmac4_addrs unconditionally as for structures which don't set them, this will result in the core driver using zeroes everywhere and breaking the driver for older HW. On EMAC < 2 the address should remain NULL.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +2 -1
@@ -644,7 +644,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->fix_mac_speed = ethqos_fix_mac_speed; plat_dat->dump_debug_regs = rgmii_dump; plat_dat->has_gmac4 =1 ; - plat_dat->dwmac4_addrs = &data->dwmac4_addrs; +if (ethqos->has_emac3) + plat_dat->dwmac4_addrs = &data->dwmac4_addrs; plat_dat->pmt =1 ; plat_dat->tso_en =of_property_read_bool (np,"snps,tso" );if (of_device_is_compatible (np,"qcom,qcs404-ethqos" ))
Signature · 1 line
2.39.2
Quoted 9 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
We must not assign
plat_dat->dwmac4_addrsunconditionally as for structures which don't set them, this will result in the core driver using zeroes everywhere and breaking the driver for older HW. On EMAC < 2 the address should remain NULL.Fixes b68376191c69 ("net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support")Signed-off-by Bartosz Golaszewski <[email protected]>
Thanks for the fix, sorry about that!
Quoted 21 lines
--- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +2
-1@@ -644,7 +644,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->fix_mac_speed = ethqos_fix_mac_speed; plat_dat->dump_debug_regs = rgmii_dump; plat_dat->has_gmac4 =1 ; - plat_dat->dwmac4_addrs = &data->dwmac4_addrs; +if (ethqos->has_emac3) + plat_dat->dwmac4_addrs = &data->dwmac4_addrs; plat_dat->pmt =1 ; plat_dat->tso_en =of_property_read_bool (np,"snps,tso" );if (of_device_is_compatible (np,"qcom,qcs404-ethqos" ))Signature · 1 line
2.39.2
Quoted 9 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
We must not assign
plat_dat->dwmac4_addrsunconditionally as for structures which don't set them, this will result in the core driver using zeroes everywhere and breaking the driver for older HW. On EMAC < 2 the address should remain NULL.Fixes b68376191c69 ("net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support")Signed-off-by Bartosz Golaszewski <[email protected]>
Quoted 18 lines
--- drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +2
-1@@ -644,7 +644,8 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->fix_mac_speed = ethqos_fix_mac_speed; plat_dat->dump_debug_regs = rgmii_dump; plat_dat->has_gmac4 =1 ; - plat_dat->dwmac4_addrs = &data->dwmac4_addrs; +if (ethqos->has_emac3) + plat_dat->dwmac4_addrs = &data->dwmac4_addrs; plat_dat->pmt =1 ; plat_dat->tso_en =of_property_read_bool (np,"snps,tso" );if (of_device_is_compatible (np,"qcom,qcs404-ethqos" ))
Signature · 2 lines
Regards, Siddharth.
Quoted 6 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
We must not assign
plat_dat->dwmac4_addrsunconditionally as for structures which don't set them, this will result in the core driver using zeroes everywhere and breaking the driver for older HW. On EMAC < 2 the address should remain NULL.
Signature · 1 line
~Vinod
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 8 lines · On Fri, 2 Jun 2023 21:04:55 +0200 you wrote:
From: Bartosz Golaszewski <[email protected]>
We must not assign
plat_dat->dwmac4_addrsunconditionally as for structures which don't set them, this will result in the core driver using zeroes everywhere and breaking the driver for older HW. On EMAC < 2 the address should remain NULL.[...]
Here is the summary with links:
- [net] net: stmmac: dwmac-qcom-ethqos: fix a regression on EMAC < 3
https://git.kernel.org/netdev/net/c/9bc009734774
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html