| Message ID | 1517564875-10237-1-git-send-email-faiz_abbas@ti.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it | expand |
On Fri, 2 Feb 2018 15:17:55 +0530 Faiz Abbas <faiz_abbas@ti.com> wrote: > When booting from a non-MMC device, the MMC sub-system may not be > initialized when the environment is first accessed. > We need to make sure that the MMC sub-system is ready in even a > non-MMC boot case. > > Therefore, initialize mmc during .init() of environment. > > Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> > --- > env/ext4.c | 9 +++++++++ > env/fat.c | 9 +++++++++ > env/mmc.c | 8 ++++++++ > 3 files changed, 26 insertions(+) > > diff --git a/env/ext4.c b/env/ext4.c > index 9cdf28e..ba93e5b 100644 > --- a/env/ext4.c > +++ b/env/ext4.c > @@ -123,9 +123,18 @@ err_env_relocate: > return -EIO; > } > > +static int env_ext4_init(void) > +{ > + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc")) > + mmc_initialize(NULL); > + > + return 0; > +} > + > U_BOOT_ENV_LOCATION(ext4) = { > .location = ENVL_EXT4, > ENV_NAME("EXT4") > .load = env_ext4_load, > .save = env_save_ptr(env_ext4_save), > + .init = env_ext4_init, > }; > diff --git a/env/fat.c b/env/fat.c > index ec49c39..9f147ee 100644 > --- a/env/fat.c > +++ b/env/fat.c > @@ -112,6 +112,14 @@ err_env_relocate: > } > #endif /* LOADENV */ > > +static int env_fat_init(void) > +{ > + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc")) > + mmc_initialize(NULL); > + > + return 0; > +} > + > U_BOOT_ENV_LOCATION(fat) = { > .location = ENVL_FAT, > ENV_NAME("FAT") > @@ -121,4 +129,5 @@ U_BOOT_ENV_LOCATION(fat) = { > #ifdef CMD_SAVEENV > .save = env_save_ptr(env_fat_save), > #endif > + .init = env_fat_init, > }; > diff --git a/env/mmc.c b/env/mmc.c > index ed7bcf1..714a073 100644 > --- a/env/mmc.c > +++ b/env/mmc.c > @@ -365,6 +365,13 @@ err: > } > #endif /* CONFIG_ENV_OFFSET_REDUND */ > > +static int env_mmc_init(void) > +{ > + mmc_initialize(NULL); > + > + return 0; > +} > + > U_BOOT_ENV_LOCATION(mmc) = { > .location = ENVL_MMC, > ENV_NAME("MMC") > @@ -372,4 +379,5 @@ U_BOOT_ENV_LOCATION(mmc) = { > #ifndef CONFIG_SPL_BUILD > .save = env_save_ptr(env_mmc_save), > #endif > + .init = env_mmc_init, > }; Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
On Fri, Feb 2, 2018 at 9:47 AM, Faiz Abbas <faiz_abbas@ti.com> wrote: > When booting from a non-MMC device, the MMC sub-system may not be > initialized when the environment is first accessed. > We need to make sure that the MMC sub-system is ready in even a non-MMC > boot case. > > Therefore, initialize mmc during .init() of environment. > > Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> > --- > env/ext4.c | 9 +++++++++ > env/fat.c | 9 +++++++++ > env/mmc.c | 8 ++++++++ > 3 files changed, 26 insertions(+) > > diff --git a/env/ext4.c b/env/ext4.c > index 9cdf28e..ba93e5b 100644 > --- a/env/ext4.c > +++ b/env/ext4.c > @@ -123,9 +123,18 @@ err_env_relocate: > return -EIO; > } > > +static int env_ext4_init(void) > +{ > + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc")) Shouldn't that be CONFIG_ENV_EXT4_INTERFACE ?
Hi, On Monday 05 February 2018 02:59 AM, Alex Kiernan wrote: > On Fri, Feb 2, 2018 at 9:47 AM, Faiz Abbas <faiz_abbas@ti.com> wrote: >> When booting from a non-MMC device, the MMC sub-system may not be >> initialized when the environment is first accessed. >> We need to make sure that the MMC sub-system is ready in even a non-MMC >> boot case. >> >> Therefore, initialize mmc during .init() of environment. >> >> Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> >> --- >> env/ext4.c | 9 +++++++++ >> env/fat.c | 9 +++++++++ >> env/mmc.c | 8 ++++++++ >> 3 files changed, 26 insertions(+) >> >> diff --git a/env/ext4.c b/env/ext4.c >> index 9cdf28e..ba93e5b 100644 >> --- a/env/ext4.c >> +++ b/env/ext4.c >> @@ -123,9 +123,18 @@ err_env_relocate: >> return -EIO; >> } >> >> +static int env_ext4_init(void) >> +{ >> + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc")) > > Shouldn't that be CONFIG_ENV_EXT4_INTERFACE ? Yes. Will fix in v2. Thanks, Faiz
Dear Faiz Abbas, In message <1517564875-10237-1-git-send-email-faiz_abbas@ti.com> you wrote: > When booting from a non-MMC device, the MMC sub-system may not be > initialized when the environment is first accessed. > We need to make sure that the MMC sub-system is ready in even a non-MMC > boot case. > > Therefore, initialize mmc during .init() of environment. Do I understand correctly that you will always initialize the MMC sub-system if it is a candidate for reading the environment, even when the environment is read from elsewhere? In this case I hereby NAK this patch. U-Boot shall always use lazy initialization and never ever initialize hardware which it does not really use - see especially item 2 at [1]. [1] http://www.denx.de/wiki/U-Boot/DesignPrinciples Best regards, Wolfgang Denk
Hi Wolfgang, On Wednesday 07 February 2018 02:22 PM, Wolfgang Denk wrote: > Dear Faiz Abbas, > > In message <1517564875-10237-1-git-send-email-faiz_abbas@ti.com> you wrote: >> When booting from a non-MMC device, the MMC sub-system may not be >> initialized when the environment is first accessed. >> We need to make sure that the MMC sub-system is ready in even a non-MMC >> boot case. >> >> Therefore, initialize mmc during .init() of environment. > > Do I understand correctly that you will always initialize the MMC > sub-system if it is a candidate for reading the environment, even > when the environment is read from elsewhere? I didn't realize that U-boot was supporting multiple environment candidates now. Will try to find another place to initialize mmc. Thanks, Faiz
diff --git a/env/ext4.c b/env/ext4.c index 9cdf28e..ba93e5b 100644 --- a/env/ext4.c +++ b/env/ext4.c @@ -123,9 +123,18 @@ err_env_relocate: return -EIO; } +static int env_ext4_init(void) +{ + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc")) + mmc_initialize(NULL); + + return 0; +} + U_BOOT_ENV_LOCATION(ext4) = { .location = ENVL_EXT4, ENV_NAME("EXT4") .load = env_ext4_load, .save = env_save_ptr(env_ext4_save), + .init = env_ext4_init, }; diff --git a/env/fat.c b/env/fat.c index ec49c39..9f147ee 100644 --- a/env/fat.c +++ b/env/fat.c @@ -112,6 +112,14 @@ err_env_relocate: } #endif /* LOADENV */ +static int env_fat_init(void) +{ + if (!strcmp(CONFIG_ENV_FAT_INTERFACE, "mmc")) + mmc_initialize(NULL); + + return 0; +} + U_BOOT_ENV_LOCATION(fat) = { .location = ENVL_FAT, ENV_NAME("FAT") @@ -121,4 +129,5 @@ U_BOOT_ENV_LOCATION(fat) = { #ifdef CMD_SAVEENV .save = env_save_ptr(env_fat_save), #endif + .init = env_fat_init, }; diff --git a/env/mmc.c b/env/mmc.c index ed7bcf1..714a073 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -365,6 +365,13 @@ err: } #endif /* CONFIG_ENV_OFFSET_REDUND */ +static int env_mmc_init(void) +{ + mmc_initialize(NULL); + + return 0; +} + U_BOOT_ENV_LOCATION(mmc) = { .location = ENVL_MMC, ENV_NAME("MMC") @@ -372,4 +379,5 @@ U_BOOT_ENV_LOCATION(mmc) = { #ifndef CONFIG_SPL_BUILD .save = env_save_ptr(env_mmc_save), #endif + .init = env_mmc_init, };
When booting from a non-MMC device, the MMC sub-system may not be initialized when the environment is first accessed. We need to make sure that the MMC sub-system is ready in even a non-MMC boot case. Therefore, initialize mmc during .init() of environment. Signed-off-by: Faiz Abbas <faiz_abbas@ti.com> --- env/ext4.c | 9 +++++++++ env/fat.c | 9 +++++++++ env/mmc.c | 8 ++++++++ 3 files changed, 26 insertions(+)