Message ID | 1416926056-23142-1-git-send-email-guillaume.gardet@free.fr |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
Hello Guillaume GARDET, On Tue, Nov 25, 2014 at 6:34 AM, Guillaume GARDET <guillaume.gardet@free.fr> wrote: > Commit 9f12cd0e062614e19734b2ab37842d387457c5e5 has broken SPL EXT support. > This patch update error code check to get SPL EXT support working again. > > Tested on a Pandaboard (rev. A3). > > Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> > Cc: Tom Rini <trini@ti.com> > Cc: Suriyan Ramasami <suriyan.r@gmail.com> > > --- > common/spl/spl_ext.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c > index 5ff9bc5..9d37fd3 100644 > --- a/common/spl/spl_ext.c > +++ b/common/spl/spl_ext.c > @@ -43,7 +43,7 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, > goto end; > } > err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen); > - if (err <= 0) { > + if (err < 0) { > puts("spl: ext4fs_read failed\n"); > goto end; > } > @@ -54,12 +54,12 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, > > end: > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT > - if (err <= 0) > + if (err < 0) > printf("%s: error reading image %s, err - %d\n", > __func__, filename, err); > #endif > > - return err <= 0; > + return err < 0; > } > > #ifdef CONFIG_SPL_OS_BOOT > @@ -95,7 +95,7 @@ int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition) > goto defaults; > } > err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); > - if (err <= 0) { > + if (err < 0) { > printf("spl: error reading image %s, err - %d, falling back to default\n", > file, err); > goto defaults; > @@ -124,7 +124,7 @@ defaults: > puts("spl: ext4fs_open failed\n"); > > err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); > - if (err <= 0) { > + if (err < 0) { > #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT > printf("%s: error reading image %s, err - %d\n", > __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); > -- > 1.8.4.5 > I am not sure, if I can put a "Reviewed-by" here, but it does look good to me. Thanks - Suriyan
Hi, On 25 November 2014 at 12:55, Suriyan Ramasami <suriyan.r@gmail.com> wrote: > Hello Guillaume GARDET, > > > On Tue, Nov 25, 2014 at 6:34 AM, Guillaume GARDET > <guillaume.gardet@free.fr> wrote: >> Commit 9f12cd0e062614e19734b2ab37842d387457c5e5 has broken SPL EXT support. >> This patch update error code check to get SPL EXT support working again. >> >> Tested on a Pandaboard (rev. A3). >> >> Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> >> Cc: Tom Rini <trini@ti.com> >> Cc: Suriyan Ramasami <suriyan.r@gmail.com> >> >> --- >> common/spl/spl_ext.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c >> index 5ff9bc5..9d37fd3 100644 >> --- a/common/spl/spl_ext.c >> +++ b/common/spl/spl_ext.c >> @@ -43,7 +43,7 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, >> goto end; >> } >> err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen); >> - if (err <= 0) { >> + if (err < 0) { >> puts("spl: ext4fs_read failed\n"); >> goto end; >> } >> @@ -54,12 +54,12 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, >> >> end: >> #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT >> - if (err <= 0) >> + if (err < 0) >> printf("%s: error reading image %s, err - %d\n", >> __func__, filename, err); >> #endif >> >> - return err <= 0; >> + return err < 0; >> } >> >> #ifdef CONFIG_SPL_OS_BOOT >> @@ -95,7 +95,7 @@ int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition) >> goto defaults; >> } >> err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); >> - if (err <= 0) { >> + if (err < 0) { >> printf("spl: error reading image %s, err - %d, falling back to default\n", >> file, err); >> goto defaults; >> @@ -124,7 +124,7 @@ defaults: >> puts("spl: ext4fs_open failed\n"); >> >> err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); >> - if (err <= 0) { >> + if (err < 0) { >> #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT >> printf("%s: error reading image %s, err - %d\n", >> __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err); >> -- >> 1.8.4.5 >> > > I am not sure, if I can put a "Reviewed-by" here, but it does look good to me. > Thanks > - Suriyan Yes you can - but it needs to be in the right format. You can reply on the thread with 'Reviewed-by: <name> <email>' Reviewed-by: Simon Glass <sjg@chromium.org> Regards, Simon
On Tue, Nov 25, 2014 at 03:34:16PM +0100, Guillaume GARDET wrote: > Commit 9f12cd0e062614e19734b2ab37842d387457c5e5 has broken SPL EXT support. > This patch update error code check to get SPL EXT support working again. > > Tested on a Pandaboard (rev. A3). > > Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> > Cc: Tom Rini <trini@ti.com> > Cc: Suriyan Ramasami <suriyan.r@gmail.com> > Applied to u-boot/master (and added Reviewed-by tags), thanks!
diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index 5ff9bc5..9d37fd3 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -43,7 +43,7 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, goto end; } err = ext4fs_read((char *)header, sizeof(struct image_header), &actlen); - if (err <= 0) { + if (err < 0) { puts("spl: ext4fs_read failed\n"); goto end; } @@ -54,12 +54,12 @@ int spl_load_image_ext(block_dev_desc_t *block_dev, end: #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT - if (err <= 0) + if (err < 0) printf("%s: error reading image %s, err - %d\n", __func__, filename, err); #endif - return err <= 0; + return err < 0; } #ifdef CONFIG_SPL_OS_BOOT @@ -95,7 +95,7 @@ int spl_load_image_ext_os(block_dev_desc_t *block_dev, int partition) goto defaults; } err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); - if (err <= 0) { + if (err < 0) { printf("spl: error reading image %s, err - %d, falling back to default\n", file, err); goto defaults; @@ -124,7 +124,7 @@ defaults: puts("spl: ext4fs_open failed\n"); err = ext4fs_read((void *)CONFIG_SYS_SPL_ARGS_ADDR, filelen, &actlen); - if (err <= 0) { + if (err < 0) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("%s: error reading image %s, err - %d\n", __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
Commit 9f12cd0e062614e19734b2ab37842d387457c5e5 has broken SPL EXT support. This patch update error code check to get SPL EXT support working again. Tested on a Pandaboard (rev. A3). Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com> Cc: Suriyan Ramasami <suriyan.r@gmail.com> --- common/spl/spl_ext.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)