env: Fix invalid env handling in env_init()
PATCH v3 1/1 env: Fix invalid env handling in env_init()
This fixes the case where there are multiple environment drivers, one of them is the default environment one, and it is followed by an environment driver which does not implement .init() callback. The default environment driver sets gd->env_valid to ENV_INVALID and returns 0 from its .init() callback implementation, which is valid behavior for default environment.
Since the subsequent environment driver does not implement .init(), it also does not modify the $ret variable in the loop. Therefore, the loop is exited with gd->env_valid=ENV_INVALID and ret=0, which means that the code further down in env_init() will not reset the environment to the default one, which is incorrect.
This patch sets the $ret variable back to -ENOENT in case the env_valid is set to ENV_INVALID by an environment driver, so that the environment would be correctly reset back to default one, unless a subsequent driver loads a valid environment.
---
V2: Reword commit message
V3: Rebase
--- env/env.c | 3 +++ 1 file changed, 3 insertions(+)
env/env.c +3 -0
@@ -334,6 +334,9 @@ int env_init(void)debug ("%s: Environment %s init done (ret=%d)\n" , __func__, drv->name, ret); + +if (gd->env_valid ==ENV_INVALID ) + ret = -ENOENT ; }if (!prio)
Signature · 1 line
2.29.2
PATCH v3 1/1 env: Fix invalid env handling in env_init()
Quoted 41 lines · Marek Vasut
This fixes the case where there are multiple environment drivers, one of them is the default environment one, and it is followed by an environment driver which does not implement .init() callback. The default environment driver sets
gd->env_validtoENV_INVALIDand returns 0 from its .init() callback implementation, which is valid behavior for default environment.Since the subsequent environment driver does not implement .init(), it also does not modify the $ret variable in the loop. Therefore, the loop is exited with gd->env_valid=ENV_INVALID and ret=0, which means that the code further down in
env_init()will not reset the environment to the default one, which is incorrect.This patch sets the $ret variable back to
-ENOENTin case theenv_validis set toENV_INVALIDby an environment driver, so that the environment would be correctly reset back to default one, unless a subsequent driver loads a valid environment.Signed-off-by Marek Vasut <[email protected]>---
V2: Reword commit message
V3: Rebase--- env/env.c | 3 +++ 1 file changed, 3 insertions(+)env/env.c +3
-1@@ -334,6 +334,9 @@ int env_init(void)debug ("%s: Environment %s init done (ret=%d)\n" , __func__, drv->name, ret); + +if (gd->env_valid ==ENV_INVALID ) + ret = -ENOENT ; }if (!prio) --
Quoted 2 lines
2.29.2
Without this patch, multiple environments with MMC being one of them fail to work as described in the commit message (becuase MMC does not have an init callback). I verified this patch resolves the issue using an IMX8M mini with CONFIG_ENV_IS_NOWHERE=y and CONFIG_ENV_IS_IN_MMC=y.
PATCH v3 1/1 env: Fix invalid env handling in env_init()
Quoted 50 lines · Tim Harvey
Quoted 41 lines · Marek Vasut
This fixes the case where there are multiple environment drivers, one of them is the default environment one, and it is followed by an environment driver which does not implement .init() callback. The default environment driver sets
gd->env_validtoENV_INVALIDand returns 0 from its .init() callback implementation, which is valid behavior for default environment.Since the subsequent environment driver does not implement .init(), it also does not modify the $ret variable in the loop. Therefore, the loop is exited with gd->env_valid=ENV_INVALID and ret=0, which means that the code further down in
env_init()will not reset the environment to the default one, which is incorrect.This patch sets the $ret variable back to
-ENOENTin case theenv_validis set toENV_INVALIDby an environment driver, so that the environment would be correctly reset back to default one, unless a subsequent driver loads a valid environment.Signed-off-by Marek Vasut <[email protected]>---
V2: Reword commit message
V3: Rebase--- env/env.c | 3 +++ 1 file changed, 3 insertions(+)env/env.c +3
-1@@ -334,6 +334,9 @@ int env_init(void)debug ("%s: Environment %s init done (ret=%d)\n" , __func__, drv->name, ret); + +if (gd->env_valid ==ENV_INVALID ) + ret = -ENOENT ; }if (!prio) --Quoted 2 lines
2.29.2
Without this patch, multiple environments with MMC being one of them fail to work as described in the commit message (becuase MMC does not have an init callback). I verified this patch resolves the issue using an IMX8M mini with
CONFIG_ENV_IS_NOWHERE=yandCONFIG_ENV_IS_IN_MMC=y.
Quoted 1 line
Tested-by Tim Harvey <[email protected]>
Thank you. This patch is still missing upstream.
PATCH v3 1/1 env: Fix invalid env handling in env_init()
In reply to Marek VasutQuoted 12 lines · Marek Vasut
This fixes the case where there are multiple environment drivers, one of them is the default environment one, and it is followed by an environment driver which does not implement .init() callback. The default environment driver sets
gd->env_validtoENV_INVALIDand returns 0 from its .init() callback implementation, which is valid behavior for default environment.Since the subsequent environment driver does not implement .init(), it also does not modify the $ret variable in the loop. Therefore, the loop is exited with gd->env_valid=ENV_INVALID and ret=0, which means that the code further down in
env_init()will not reset the environment to the default one, which is incorrect.
Quoted 7 lines
This patch sets the $ret variable back to
-ENOENTin case theenv_validis set toENV_INVALIDby an environment driver, so that the environment would be correctly reset back to default one, unless a subsequent driver loads a valid environment.Signed-off-by Marek Vasut <[email protected]>Tested-by Tim Harvey <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210418/4f2b0816/attachment.sig>