[U-Boot,v2,5/5] imx: nandbcb: add support for writing BCB only
diff mbox series

Message ID 20191021133859.23824-6-igor.opaniuk@gmail.com
State Changes Requested
Delegated to: Stefano Babic
Headers show
Series
  • imx: nandbcb: support for i.MX7 and bcb only updates
Related show

Commit Message

Igor Opaniuk Oct. 21, 2019, 1:38 p.m. UTC
From: Igor Opaniuk <igor.opaniuk@toradex.com>

Add subcommand for add writing BCB only, where we provide appropriate
offsets for firmware1 and firmware2 and size.

Example of usage:
- nandbcb bcbonly 0x00180000 0x00080000 0x00200000
Writing 1024 bytes to 0x0: randomizing
OK
Writing 1024 bytes to 0x20000: randomizing
OK

Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
---

 arch/arm/mach-imx/cmd_nandbcb.c | 92 ++++++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 1 deletion(-)

Comments

Oleksandr Suvorov Oct. 23, 2019, 11:28 a.m. UTC | #1
On Mon, Oct 21, 2019 at 4:41 PM Igor Opaniuk <igor.opaniuk@gmail.com> wrote:
>
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
>
> Add subcommand for add writing BCB only, where we provide appropriate
> offsets for firmware1 and firmware2 and size.
>
> Example of usage:
> - nandbcb bcbonly 0x00180000 0x00080000 0x00200000
> Writing 1024 bytes to 0x0: randomizing
> OK
> Writing 1024 bytes to 0x20000: randomizing
> OK
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>

> ---
>
>  arch/arm/mach-imx/cmd_nandbcb.c | 92 ++++++++++++++++++++++++++++++++-
>  1 file changed, 91 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
> index fbe780ccda..d11e16cf83 100644
> --- a/arch/arm/mach-imx/cmd_nandbcb.c
> +++ b/arch/arm/mach-imx/cmd_nandbcb.c
> @@ -364,6 +364,88 @@ err:
>         return ret;
>  }
>
> +static int do_nandbcb_bcbonly(int argc, char * const argv[])
> +{
> +       struct fcb_block *fcb;
> +       struct dbbt_block *dbbt;
> +       u32 fw_len, fw1_off, fw2_off;
> +       struct mtd_info *mtd;
> +       void *dbbt_page, *dbbt_data_page;
> +       int dev, ret;
> +
> +       dev = nand_curr_device;
> +       if ((dev < 0) || (dev >= CONFIG_SYS_MAX_NAND_DEVICE) ||
> +           (!get_nand_dev_by_index(dev))) {
> +               puts("No devices available\n");
> +               return CMD_RET_FAILURE;
> +       }
> +
> +       mtd = get_nand_dev_by_index(dev);
> +
> +       if (argc < 3)
> +               return CMD_RET_FAILURE;
> +
> +       fw_len = simple_strtoul(argv[1], NULL, 16);
> +       fw1_off = simple_strtoul(argv[2], NULL, 16);
> +
> +       if (argc > 3)
> +               fw2_off = simple_strtoul(argv[3], NULL, 16);
> +       else
> +               fw2_off = fw1_off;
> +
> +       /* fill fcb */
> +       fcb = kzalloc(sizeof(*fcb), GFP_KERNEL);
> +       if (!fcb) {
> +               debug("failed to allocate fcb\n");
> +               ret = -ENOMEM;
> +               return CMD_RET_FAILURE;
> +       }
> +
> +       fill_fcb(fcb, mtd, fw1_off / mtd->writesize,
> +                fw2_off / mtd->writesize, fw_len / mtd->writesize);
> +
> +       /* fill dbbt */
> +       dbbt_page = kzalloc(mtd->writesize, GFP_KERNEL);
> +       if (!dbbt_page) {
> +               debug("failed to allocate dbbt_page\n");
> +               ret = -ENOMEM;
> +               goto fcb_err;
> +       }
> +
> +       dbbt_data_page = kzalloc(mtd->writesize, GFP_KERNEL);
> +       if (!dbbt_data_page) {
> +               debug("failed to allocate dbbt_data_page\n");
> +               ret = -ENOMEM;
> +               goto dbbt_page_err;
> +       }
> +
> +       dbbt = dbbt_page;
> +       dbbt->checksum = 0;
> +       dbbt->fingerprint = DBBT_FINGERPRINT2;
> +       dbbt->version = DBBT_VERSION_1;
> +       ret = dbbt_fill_data(mtd, dbbt_data_page, 0);
> +       if (ret < 0)
> +               goto dbbt_data_page_err;
> +       else if (ret > 0)
> +               dbbt->dbbtpages = 1;
> +
> +       /* write fcb and dbbt to nand */
> +       ret = write_fcb_dbbt(mtd, fcb, dbbt, dbbt_data_page, 0);
> +dbbt_data_page_err:
> +       kfree(dbbt_data_page);
> +dbbt_page_err:
> +       kfree(dbbt_page);
> +fcb_err:
> +       kfree(fcb);
> +
> +       if (ret < 0) {
> +               printf("failed to write FCB/DBBT\n");
> +               return CMD_RET_FAILURE;
> +       }
> +
> +       return CMD_RET_SUCCESS;
> +}
> +
>  static int do_nandbcb_update(int argc, char * const argv[])
>  {
>         struct mtd_info *mtd;
> @@ -420,6 +502,11 @@ static int do_nandbcb(cmd_tbl_t *cmdtp, int flag, int argc,
>                 goto done;
>         }
>
> +       if (strcmp(cmd, "bcbonly") == 0) {
> +               ret = do_nandbcb_bcbonly(argc, argv);
> +               goto done;
> +       }
> +
>  done:
>         if (ret != -1)
>                 return ret;
> @@ -430,7 +517,10 @@ usage:
>  #ifdef CONFIG_SYS_LONGHELP
>  static char nandbcb_help_text[] =
>         "update addr off|partition len  - update 'len' bytes starting at\n"
> -       "       'off|part' to memory address 'addr', skipping  bad blocks";
> +       "       'off|part' to memory address 'addr', skipping  bad blocks\n"
> +       "bcbonly fw-size fw1-off [fw2-off] - write only BCB (FCB and DBBT)\n"
> +       "       where `fw-size` is fw sizes in bytes, `fw1-off` and\n"
> +       "       and `fw2-off` - firmware offsets                ";
>  #endif
>
>  U_BOOT_CMD(nandbcb, 5, 1, do_nandbcb,
> --
> 2.17.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Max Krummenacher Oct. 23, 2019, 6:32 p.m. UTC | #2
On Mon, 2019-10-21 at 16:38 +0300, Igor Opaniuk wrote:
> From: Igor Opaniuk <igor.opaniuk@toradex.com>
> 
> Add subcommand for add writing BCB only, where we provide appropriate
> offsets for firmware1 and firmware2 and size.
> 
> Example of usage:
> - nandbcb bcbonly 0x00180000 0x00080000 0x00200000
> Writing 1024 bytes to 0x0: randomizing
> OK
> Writing 1024 bytes to 0x20000: randomizing
> OK
> 
> Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>

Tested-by: Max Krummenacher <max.krummenacher@toradex.com>

Patch
diff mbox series

diff --git a/arch/arm/mach-imx/cmd_nandbcb.c b/arch/arm/mach-imx/cmd_nandbcb.c
index fbe780ccda..d11e16cf83 100644
--- a/arch/arm/mach-imx/cmd_nandbcb.c
+++ b/arch/arm/mach-imx/cmd_nandbcb.c
@@ -364,6 +364,88 @@  err:
 	return ret;
 }
 
+static int do_nandbcb_bcbonly(int argc, char * const argv[])
+{
+	struct fcb_block *fcb;
+	struct dbbt_block *dbbt;
+	u32 fw_len, fw1_off, fw2_off;
+	struct mtd_info *mtd;
+	void *dbbt_page, *dbbt_data_page;
+	int dev, ret;
+
+	dev = nand_curr_device;
+	if ((dev < 0) || (dev >= CONFIG_SYS_MAX_NAND_DEVICE) ||
+	    (!get_nand_dev_by_index(dev))) {
+		puts("No devices available\n");
+		return CMD_RET_FAILURE;
+	}
+
+	mtd = get_nand_dev_by_index(dev);
+
+	if (argc < 3)
+		return CMD_RET_FAILURE;
+
+	fw_len = simple_strtoul(argv[1], NULL, 16);
+	fw1_off = simple_strtoul(argv[2], NULL, 16);
+
+	if (argc > 3)
+		fw2_off = simple_strtoul(argv[3], NULL, 16);
+	else
+		fw2_off = fw1_off;
+
+	/* fill fcb */
+	fcb = kzalloc(sizeof(*fcb), GFP_KERNEL);
+	if (!fcb) {
+		debug("failed to allocate fcb\n");
+		ret = -ENOMEM;
+		return CMD_RET_FAILURE;
+	}
+
+	fill_fcb(fcb, mtd, fw1_off / mtd->writesize,
+		 fw2_off / mtd->writesize, fw_len / mtd->writesize);
+
+	/* fill dbbt */
+	dbbt_page = kzalloc(mtd->writesize, GFP_KERNEL);
+	if (!dbbt_page) {
+		debug("failed to allocate dbbt_page\n");
+		ret = -ENOMEM;
+		goto fcb_err;
+	}
+
+	dbbt_data_page = kzalloc(mtd->writesize, GFP_KERNEL);
+	if (!dbbt_data_page) {
+		debug("failed to allocate dbbt_data_page\n");
+		ret = -ENOMEM;
+		goto dbbt_page_err;
+	}
+
+	dbbt = dbbt_page;
+	dbbt->checksum = 0;
+	dbbt->fingerprint = DBBT_FINGERPRINT2;
+	dbbt->version = DBBT_VERSION_1;
+	ret = dbbt_fill_data(mtd, dbbt_data_page, 0);
+	if (ret < 0)
+		goto dbbt_data_page_err;
+	else if (ret > 0)
+		dbbt->dbbtpages = 1;
+
+	/* write fcb and dbbt to nand */
+	ret = write_fcb_dbbt(mtd, fcb, dbbt, dbbt_data_page, 0);
+dbbt_data_page_err:
+	kfree(dbbt_data_page);
+dbbt_page_err:
+	kfree(dbbt_page);
+fcb_err:
+	kfree(fcb);
+
+	if (ret < 0) {
+		printf("failed to write FCB/DBBT\n");
+		return CMD_RET_FAILURE;
+	}
+
+	return CMD_RET_SUCCESS;
+}
+
 static int do_nandbcb_update(int argc, char * const argv[])
 {
 	struct mtd_info *mtd;
@@ -420,6 +502,11 @@  static int do_nandbcb(cmd_tbl_t *cmdtp, int flag, int argc,
 		goto done;
 	}
 
+	if (strcmp(cmd, "bcbonly") == 0) {
+		ret = do_nandbcb_bcbonly(argc, argv);
+		goto done;
+	}
+
 done:
 	if (ret != -1)
 		return ret;
@@ -430,7 +517,10 @@  usage:
 #ifdef CONFIG_SYS_LONGHELP
 static char nandbcb_help_text[] =
 	"update addr off|partition len	- update 'len' bytes starting at\n"
-	"	'off|part' to memory address 'addr', skipping  bad blocks";
+	"       'off|part' to memory address 'addr', skipping  bad blocks\n"
+	"bcbonly fw-size fw1-off [fw2-off] - write only BCB (FCB and DBBT)\n"
+	"       where `fw-size` is fw sizes in bytes, `fw1-off` and\n"
+	"       and `fw2-off` - firmware offsets		";
 #endif
 
 U_BOOT_CMD(nandbcb, 5, 1, do_nandbcb,