[net-next,PATCH 2/2] net: stmmac: dwmac-stm32: update err status in case different of stm32mp13

Christophe Roullier posted 2 patches 1 year, 5 months ago
There is a newer version of this series
[net-next,PATCH 2/2] net: stmmac: dwmac-stm32: update err status in case different of stm32mp13
Posted by Christophe Roullier 1 year, 5 months ago
Second parameter of syscfg property (mask) is mandatory for MP13 but
optional for all other cases so need to re init err to 0 for this case
to avoid parse issue.

Fixes: 50bbc0393114 ("net: stmmac: dwmac-stm32: add management of stm32mp13 for stm32")

Signed-off-by: Christophe Roullier <christophe.roullier@foss.st.com>
---
 drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
index 8b85265ca6cf..d060d1d8bfc6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
@@ -371,10 +371,12 @@ static int stm32_dwmac_parse_data(struct stm32_dwmac *dwmac,
 	dwmac->mode_mask = SYSCFG_MP1_ETH_MASK;
 	err = of_property_read_u32_index(np, "st,syscon", 2, &dwmac->mode_mask);
 	if (err) {
-		if (dwmac->ops->is_mp13)
+		if (dwmac->ops->is_mp13) {
 			dev_err(dev, "Sysconfig register mask must be set (%d)\n", err);
-		else
+		} else {
 			dev_dbg(dev, "Warning sysconfig register mask not set\n");
+			err = 0;
+		}
 	}
 
 	return err;
-- 
2.25.1
Re: [net-next,PATCH 2/2] net: stmmac: dwmac-stm32: update err status in case different of stm32mp13
Posted by Marek Vasut 1 year, 5 months ago
On 6/27/24 10:49 AM, Christophe Roullier wrote:
> Second parameter of syscfg property (mask) is mandatory for MP13 but
> optional for all other cases so need to re init err to 0 for this case
> to avoid parse issue.

What parse issue ? Please expand this part of the commit message.

Basically if this is not MP13, and the dev_dbg() is hit, the function 
should not return error code because for non-MP13 the missing syscfg 
phandle in DT is not considered an error. So reset err to 0 in that case 
to support existing DTs without syscfg phandle.

With the commit message updated:

Reviewed-by: Marek Vasut <marex@denx.de>

[...]