Commit fa1d90b0 authored by Colin Foster's avatar Colin Foster Committed by Jakub Kicinski

net: mscc: ocelot: check return values of writes during reset

The ocelot_reset() function utilizes regmap_field_write() but wasn't
checking return values. While this won't cause issues for the current MMIO
regmaps, it could be an issue for externally controlled interfaces.

Add checks for these return values.
Signed-off-by: default avatarColin Foster <colin.foster@in-advantage.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 21bb08cd
...@@ -211,8 +211,13 @@ static int ocelot_reset(struct ocelot *ocelot) ...@@ -211,8 +211,13 @@ static int ocelot_reset(struct ocelot *ocelot)
int err; int err;
u32 val; u32 val;
regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_INIT], 1); err = regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_INIT], 1);
regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1); if (err)
return err;
err = regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
if (err)
return err;
/* MEM_INIT is a self-clearing bit. Wait for it to be cleared (should be /* MEM_INIT is a self-clearing bit. Wait for it to be cleared (should be
* 100us) before enabling the switch core. * 100us) before enabling the switch core.
...@@ -222,10 +227,11 @@ static int ocelot_reset(struct ocelot *ocelot) ...@@ -222,10 +227,11 @@ static int ocelot_reset(struct ocelot *ocelot)
if (err) if (err)
return err; return err;
regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1); err = regmap_field_write(ocelot->regfields[SYS_RESET_CFG_MEM_ENA], 1);
regmap_field_write(ocelot->regfields[SYS_RESET_CFG_CORE_ENA], 1); if (err)
return err;
return 0; return regmap_field_write(ocelot->regfields[SYS_RESET_CFG_CORE_ENA], 1);
} }
/* Watermark encode /* Watermark encode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment