[PATCH v1] driver: fastboot: Fix getvar_get_part_info when flash nand

[PATCH v1] driver: fastboot: Fix getvar_get_part_info when flash nand

[qianfanguijin]

From: qianfan Zhao <qianfanguijin@163.com>

find_dev_and_part return 0 on success, 1 otherwise.
So fastboot_nand_get_part_info follow this rule.

Signed-off-by: qianfan Zhao <qianfanguijin@163.com>
---
 drivers/fastboot/fb_getvar.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
index d43f2cfee6..a7a8dc458f 100644
--- a/drivers/fastboot/fb_getvar.c
+++ b/drivers/fastboot/fb_getvar.c
@@ -114,7 +114,10 @@ static int getvar_get_part_info(const char *part_name, char *response,
 	struct part_info *part_info;
 
 	r = fastboot_nand_get_part_info(part_name, &part_info, response);
-	if (r >= 0 && size)
+
+	if (r) /* find nand device and part failed */
+		r = -ENODEV;
+	else if (size)
 		*size = part_info->size;
 # else
 	fastboot_fail("this storage is not supported in bootloader", response);
-- 
2.17.1

Re: [PATCH v1] driver: fastboot: Fix getvar_get_part_info when flash nand

[Simon Glass]

On Tue, 28 Dec 2021 at 19:51, <qianfanguijin@qq.com> wrote:
>
> From: qianfan Zhao <qianfanguijin@163.com>
>
> find_dev_and_part return 0 on success, 1 otherwise.
> So fastboot_nand_get_part_info follow this rule.
>
> Signed-off-by: qianfan Zhao <qianfanguijin@163.com>
> ---
>  drivers/fastboot/fb_getvar.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>

Reviewed-by: Simon Glass <sjg@chromium.org>

Re: [PATCH v1] driver: fastboot: Fix getvar_get_part_info when flash nand

[Sean Anderson]

On 12/28/21 9:50 PM, qianfanguijin@qq.com wrote:
> From: qianfan Zhao <qianfanguijin@163.com>
> 
> find_dev_and_part return 0 on success, 1 otherwise.
> So fastboot_nand_get_part_info follow this rule.
> 
> Signed-off-by: qianfan Zhao <qianfanguijin@163.com>
> ---
>  drivers/fastboot/fb_getvar.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c
> index d43f2cfee6..a7a8dc458f 100644
> --- a/drivers/fastboot/fb_getvar.c
> +++ b/drivers/fastboot/fb_getvar.c
> @@ -114,7 +114,10 @@ static int getvar_get_part_info(const char *part_name, char *response,
>  	struct part_info *part_info;
>  
>  	r = fastboot_nand_get_part_info(part_name, &part_info, response);
> -	if (r >= 0 && size)
> +
> +	if (r) /* find nand device and part failed */

One branch does fail with -EINVAL. Can we make this something like

if (r == 1)
	r = -ENODEV;

if (size)
	*size = part_info->size

though even better would be to go and fix mtdparts_init/find_dev_and_part to return negative numbers...

--Sean