| Message ID | 20230602190455.3123018-1-brgl@bgdev.pl (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9bc009734774549f8bb8d7e526ba10e70d751a7c |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: stmmac: dwmac-qcom-ethqos: fix a regression on EMAC < 3 | expand |
On Fri, Jun 02, 2023 at 09:04:55PM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > 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. > > Fixes: b68376191c69 ("net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support") > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Reviewed-by: Andrew Halaney <ahalaney@redhat.com> Thanks for the fix, sorry about that! > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > index 16a8c361283b..f07905f00f98 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > @@ -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")) > -- > 2.39.2 >
On 03-06-2023 00:34, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > 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. > > Fixes: b68376191c69 ("net: stmmac: dwmac-qcom-ethqos: Add EMAC3 support") > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Reviewed-by: Siddharth Vadapalli <s-vadapalli@ti.com> > --- > drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > index 16a8c361283b..f07905f00f98 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > @@ -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"))
On 02-06-23, 21:04, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > 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. Reviewed-by: Vinod Koul <vkoul@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 2 Jun 2023 21:04:55 +0200 you wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > 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. > > [...] 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!
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 16a8c361283b..f07905f00f98 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -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"))