Revert "env: Load env when ENV_IS_NOWHERE is only location selected"
PATCH 1/1 Revert "env: Load env when ENV_IS_NOWHERE is only location selected"
This reverts commit 8d61237edbf6314a701cf78da2c5893a73ff5438.
This commit broke environment on literally every board I have access to, with this revert in place, environment works as it should again. The problem I observe with this patch is that saved environment in either SPI NOR or eMMC is never used, the system always falls back to default environment. The 'saveenv' command does succeed, but then after reset, the default env is again used.
Furthermore, the commit introduced duplicate code in env_init(), this:
"
if (!prio) {
gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = ENV_INVALID;
return 0;
}
if (ret == -ENOENT) {
gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = ENV_INVALID;
return 0;
}"
Furthermore, the commit is missing DCO SoB line.
Also note that upstream does not support UltraZed EG board, so this might have been a patch pulled from downstream which did depend on some other downstream behavior.
--- env/env.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
env/env.c +6 -7
@@ -322,18 +322,17 @@ int env_init(void)debug ("%s: Environment %s init done (ret=%d)\n" , __func__, drv->name, ret); - } - -if (!prio) { - gd->env_addr = (ulong)&default_environment[0 ]; - gd->env_valid =ENV_INVALID ; -return 0 ; +if (gd->env_valid ==ENV_INVALID ) + ret = -ENOENT ; } +if (!prio) +return -ENODEV ; +if (ret == -ENOENT ) { gd->env_addr = (ulong)&default_environment[0 ]; - gd->env_valid =ENV_INVALID ; + gd->env_valid =ENV_VALID ;return 0 ; }
Signature · 1 line
2.35.1
From your description it seems like the board I was working on must have had an environment on NOR or eMMC which could be loaded but did not allow the board to come up.
Then, the patch forces u-boot to use the default environment despite an existing env on NOR or eMMC.
Quoted 71 lines
This reverts commit
8d61237edbf6314a701cf78da2c5893a73ff5438.This commit broke environment on literally every board I have access to, with this revert in place, environment works as it should again. The problem I observe with this patch is that saved environment in either SPI NOR or eMMC is never used, the system always falls back to default environment. The 'saveenv' command does succeed, but then after reset, the default env is again used.
Furthermore, the commit introduced duplicate code in
env_init(), this:
"if (!prio) { gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = ENV_INVALID; return 0; } if (ret == -ENOENT) { gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = ENV_INVALID; return 0; }"
Furthermore, the commit is missing DCO SoB line.
Also note that upstream does not support UltraZed EG board, so this might have been a patch pulled from downstream which did depend on some other downstream behavior.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>--- env/env.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)env/env.c +6
-8@@ -322,18 +322,17 @@ int env_init(void)debug ("%s: Environment %s init done (ret=%d)\n" , __func__, drv->name, ret); - } - -if (!prio) { - gd->env_addr = (ulong)&default_environment[0 ]; - gd->env_valid =ENV_INVALID ; -return 0 ; +if (gd->env_valid ==ENV_INVALID ) + ret = -ENOENT ; } +if (!prio) +return -ENODEV ; +if (ret == -ENOENT ) { gd->env_addr = (ulong)&default_environment[0 ]; - gd->env_valid =ENV_INVALID ; + gd->env_valid =ENV_VALID ;return 0 ; } --2.35.1
Quoted 5 lines · On 4/10/22 13:54, [email protected] wrote:
Quoted 1 line
From your description it seems like the board I was working on must have
had an environment on NOR or eMMC which could be loaded but did not allow the board to come up.
Then, the patch forces u-boot to use the default environment despite an existing env on NOR or eMMC.
I suspect the board must have some other problem with the environment.
I just cannot tell what it is. This is using some downstream U-Boot fork, right ? Can you reproduce the problem in mainline too ? How ?
I am not exactly sure to be honest. We were running with this patched version for a while and it worked from what I remember.
But we have since updated u-boot and the Kernel and the latest version does not depend on this patch.
Nevertheless, I can try to recreate the problem and see if I can figure it out now. I feel like I might pick up on a few more things now that went unnoticed by me when I created the patch.
Quoted 12 lines · On 4/10/22 13:54, [email protected] wrote:
Quoted 6 lines
Quoted 1 line
From your description it seems like the board I was working on must have
had an environment on NOR or eMMC which could be loaded but did not allow
the board to come up.
Then, the patch forces u-boot to use the default environment despite an existing env on NOR or eMMC.I suspect the board must have some other problem with the environment. I just cannot tell what it is. This is using some downstream U-Boot fork, right ? Can you reproduce the problem in mainline too ? How ?
Quoted 9 lines · On 4/13/22 02:49, [email protected] wrote:
I am not exactly sure to be honest. We were running with this patched version for a while and it worked from what I remember.
But we have since updated u-boot and the Kernel and the latest version does not depend on this patch.
Nevertheless, I can try to recreate the problem and see if I can figure it out now. I feel like I might pick up on a few more things now that went unnoticed by me when I created the patch.
Thanks. Please CC me if you have a V2.
Quoted 28 lines · Marek Vasut
This reverts commit
8d61237edbf6314a701cf78da2c5893a73ff5438.This commit broke environment on literally every board I have access to, with this revert in place, environment works as it should again. The problem I observe with this patch is that saved environment in either SPI NOR or eMMC is never used, the system always falls back to default environment. The 'saveenv' command does succeed, but then after reset, the default env is again used.
Furthermore, the commit introduced duplicate code in
env_init(), this:
"if (!prio) { gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = ENV_INVALID; return 0; } if (ret == -ENOENT) { gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = ENV_INVALID; return 0; }"
Furthermore, the commit is missing DCO SoB line.
Quoted 7 lines
Also note that upstream does not support UltraZed EG board, so this might have been a patch pulled from downstream which did depend on some other downstream behavior.
Signed-off-by Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom