i.MX6: nand: extend nandbcb command for imx6UL(L)
Subsystems (3)
PATCH 1/2 i.MX6: nand: extend nandbcb command for imx6UL(L)
Firmware Configuration Block(FCB) for imx6ul(l) needs to be BCH encoded. This patch depends on [1].
[1]: https://patchwork.ozlabs.org/project/uboot/list/?series=113810
--- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/cmd_nandbcb.c | 72 ++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-)
arch/arm/mach-imx/Kconfig +1 -0
@@ -74,6 +74,7 @@ config CMD_HDMIDETECT config CMD_NANDBCB bool "i.MX6 NAND Boot Control Block(BCB) command" depends on NAND && CMD_MTDPARTS + select BCH if MX6UL || MX6ULL default y if ARCH_MX6 && NAND_MXS help Unlike normal 'nand write/erase' commands, this command update
arch/arm/mach-imx/cmd_nandbcb.c +70 -2
92 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH 2/2 imx: pcl063: add nand boot support
Booting from NAND needs nandbcb and nand boot device selection
--- board/phytec/pcl063/spl.c | 3 +++ configs/phycore_pcl063_defconfig | 1 + 2 files changed, 4 insertions(+)
board/phytec/pcl063/spl.c +3 -0
@@ -197,6 +197,9 @@ void board_boot_order(u32 *spl_boot_list)case IMX6_BMODE_EMMC : boot_dev =BOOT_DEVICE_MMC2 ;break ; + case IMX6_BMODE_NAND_MIN ... IMX6_BMODE_NAND_MAX: + boot_dev =BOOT_DEVICE_NAND ; +break ;default :/* Default - BOOT_DEVICE_MMC1 */ printf ("Wrong board boot order\n" );
configs/phycore_pcl063_defconfig +1 -0
@@ -27,6 +27,7 @@ CONFIG_CMD_MTD=y CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_CACHE=y +CONFIG_CMD_NANDBCB=y CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand" CONFIG_MTDPARTS_DEFAULT="gpmi-nand:4m(uboot),1m(env),-(root)" CONFIG_CMD_UBI=y
Signature · 1 line
2.21.0
PATCH 1/2 i.MX6: nand: extend nandbcb command for imx6UL(L)
In reply to Parthiban NallathambiHi Parthiban,
Thanks a lot for working on this.
Please see comments below.
Quoted 90 lines
Firmware Configuration Block(FCB) for imx6ul(l) needs to be BCH encoded. This patch depends on [1].
[1]: https://patchwork.ozlabs.org/project/uboot/list/?series=113810
Signed-off-by Parthiban Nallathambi <[email protected]>--- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/cmd_nandbcb.c | 72 ++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-)arch/arm/mach-imx/Kconfig +1
-0@@ -74,6 +74,7 @@ config CMD_HDMIDETECT config CMD_NANDBCB bool "i.MX6 NAND Boot Control Block(BCB) command" depends on NAND && CMD_MTDPARTS + select BCH if MX6UL || MX6ULL default y if ARCH_MX6 && NAND_MXS help Unlike normal 'nand write/erase' commands, this command updatearch/arm/mach-imx/cmd_nandbcb.c +50
-0@@ -14,8 +14,10 @@#include <asm/io.h> #include <jffs2/jffs2.h> +#include <linux/bch.h> #include <linux/mtd/mtd.h> +#include <asm/arch/sys_proto.h> #include <asm/mach-imx/imx-nandbcb.h> #include <asm/mach-imx/imximage.cfg> #include <mxs_nand.h> @@ -25,6 +27,66 @@#define BF_VAL (v, bf) (((v) & bf##_MASK) >> bf##_OFFSET)#define GETBIT (v, n) (((v) >> (n)) & 0x1) +static uint8_t reverse_bit (uint8_t b) +{ + b = (b &0xf0 ) >>4 | (b &0x0f ) <<4 ; + b = (b &0xcc ) >>2 | (b &0x33 ) <<2 ; + b = (b &0xaa ) >>1 | (b &0x55 ) <<1 ; + +return b; +} + +static void encode_bch_ecc (void *buf,struct fcb_block *fcb,int eccbits) +{ +int i, j, m =13 ; +int blocksize =128 ; +int numblocks =8 ; +int ecc_buf_size = (m * eccbits +7 ) /8 ; +struct bch_control *bch =init_bch (m, eccbits,0 ); +u8 *ecc_buf =kzalloc (ecc_buf_size,GFP_KERNEL ); +u8 *tmp_buf =kzalloc (blocksize * numblocks,GFP_KERNEL ); +u8 *psrc, *pdst; + +/* +* The blocks here are bit aligned. If eccbits is a multiple of 8, +* we just can copy bytes. Otherwiese we must move the blocks to +* the next free bit position. +*/ +WARN_ON (eccbits %8 ); + +memcpy (tmp_buf, fcb,sizeof (*fcb)); + +for (i =0 ; i < numblocks; i++) { +memset (ecc_buf,0 , ecc_buf_size); + psrc = tmp_buf + i * blocksize; + pdst = buf + i * (blocksize + ecc_buf_size); + +/* copy data byte aligned to destination buf */ +memcpy (pdst, psrc, blocksize); + +/* +* imx-kobs use a modified encode_bch which reverse the +* bit order of the data before calculating bch. +* Do this in the buffer and use the bch lib here. +*/ +for (j =0 ; j < blocksize; j++) + psrc[j] =reverse_bit (psrc[j]); + +encode_bch (bch, psrc, blocksize, ecc_buf); + +/* reverse ecc bit */
arch/arm/mach-imx/cmd_nandbcb.c line 87
Quoted 10 lines
arch/arm/mach-imx/cmd_nandbcb.c +10
-0+for (j =0 ; j < ecc_buf_size; j++) + ecc_buf[j] =reverse_bit (ecc_buf[j]); + +/* Here eccbuf is byte aligned and we can just copy it */ +memcpy (pdst + blocksize, ecc_buf, ecc_buf_size); + } + +free (ecc_buf); +free (tmp_buf); +free_bch (bch);
I have used kfree() instead of free() in entire nand bcb code So, I think for consistency reason it should be kfree here.
Could you please resend this patch with above mentioned changes. Other than this,
Quoted 11 lines
arch/arm/mach-imx/cmd_nandbcb.c +1
-2static u8 calculate_parity_13_8 (u8 d) {u8 p =0 ;@@ -231,8 +293,14 @@ static int nandbcb_update(struct mtd_info *mtd, loff_t off, size_t size, goto dbbt_data_page_err; } -memcpy (fcb_raw_page +12 , fcb,sizeof (struct fcb_block )); -encode_hamming_13_8 (fcb_raw_page +12 , fcb_raw_page +12 +512 ,512 ); +if (is_mx6ul () ||is_mx6ull ()) {
arch/arm/mach-imx/cmd_nandbcb.c static int nandbcb_update(struct mtd_info *mtd, loff_t off, size_t size, · line 306
Quoted 10 lines
arch/arm/mach-imx/cmd_nandbcb.c +7
-0+/* 40 bit BCH, for i.MX6UL(L) */ +encode_bch_ecc (fcb_raw_page +32 , fcb,40 ); + }else { +memcpy (fcb_raw_page +12 , fcb,sizeof (struct fcb_block )); +encode_hamming_13_8 (fcb_raw_page +12 , + fcb_raw_page +12 +512 ,512 ); + }/* * Set the first and second byte of OOB data to 0xFF, not 0x00. These * bytes are used as the Manufacturers Bad Block Marker (MBBM). Since
PATCH 1/2 i.MX6: nand: extend nandbcb command for imx6UL(L)
Hi Shyam,
Quoted 3 lines · Shyam Saini
Hi Parthiban,
Thanks a lot for working on this.
Still enabling SECURE_BOOT fails to boot. Am yet to figure out this. Do you have secure boot working from NAND?
Quoted 107 lines
Please see comments below.
Quoted 90 lines
Firmware Configuration Block(FCB) for imx6ul(l) needs to be BCH encoded. This patch depends on [1].
[1]: https://patchwork.ozlabs.org/project/uboot/list/?series=113810
Signed-off-by Parthiban Nallathambi <[email protected]>--- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/cmd_nandbcb.c | 72 ++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-)arch/arm/mach-imx/Kconfig +1
-0@@ -74,6 +74,7 @@ config CMD_HDMIDETECT config CMD_NANDBCB bool "i.MX6 NAND Boot Control Block(BCB) command" depends on NAND && CMD_MTDPARTS + select BCH if MX6UL || MX6ULL default y if ARCH_MX6 && NAND_MXS help Unlike normal 'nand write/erase' commands, this command updatearch/arm/mach-imx/cmd_nandbcb.c +50
-0@@ -14,8 +14,10 @@#include <asm/io.h> #include <jffs2/jffs2.h> +#include <linux/bch.h> #include <linux/mtd/mtd.h> +#include <asm/arch/sys_proto.h> #include <asm/mach-imx/imx-nandbcb.h> #include <asm/mach-imx/imximage.cfg> #include <mxs_nand.h> @@ -25,6 +27,66 @@#define BF_VAL (v, bf) (((v) & bf##_MASK) >> bf##_OFFSET)#define GETBIT (v, n) (((v) >> (n)) & 0x1) +static uint8_t reverse_bit (uint8_t b) +{ + b = (b &0xf0 ) >>4 | (b &0x0f ) <<4 ; + b = (b &0xcc ) >>2 | (b &0x33 ) <<2 ; + b = (b &0xaa ) >>1 | (b &0x55 ) <<1 ; + +return b; +} + +static void encode_bch_ecc (void *buf,struct fcb_block *fcb,int eccbits) +{ +int i, j, m =13 ; +int blocksize =128 ; +int numblocks =8 ; +int ecc_buf_size = (m * eccbits +7 ) /8 ; +struct bch_control *bch =init_bch (m, eccbits,0 ); +u8 *ecc_buf =kzalloc (ecc_buf_size,GFP_KERNEL ); +u8 *tmp_buf =kzalloc (blocksize * numblocks,GFP_KERNEL ); +u8 *psrc, *pdst; + +/* +* The blocks here are bit aligned. If eccbits is a multiple of 8, +* we just can copy bytes. Otherwiese we must move the blocks to +* the next free bit position. +*/ +WARN_ON (eccbits %8 ); + +memcpy (tmp_buf, fcb,sizeof (*fcb)); + +for (i =0 ; i < numblocks; i++) { +memset (ecc_buf,0 , ecc_buf_size); + psrc = tmp_buf + i * blocksize; + pdst = buf + i * (blocksize + ecc_buf_size); + +/* copy data byte aligned to destination buf */ +memcpy (pdst, psrc, blocksize); + +/* +* imx-kobs use a modified encode_bch which reverse the +* bit order of the data before calculating bch. +* Do this in the buffer and use the bch lib here. +*/ +for (j =0 ; j < blocksize; j++) + psrc[j] =reverse_bit (psrc[j]); + +encode_bch (bch, psrc, blocksize, ecc_buf); + +/* reverse ecc bit */ arch/arm/mach-imx/cmd_nandbcb.c line 87
Quoted 10 lines
arch/arm/mach-imx/cmd_nandbcb.c +10
-0+for (j =0 ; j < ecc_buf_size; j++) + ecc_buf[j] =reverse_bit (ecc_buf[j]); + +/* Here eccbuf is byte aligned and we can just copy it */ +memcpy (pdst + blocksize, ecc_buf, ecc_buf_size); + } + +free (ecc_buf); +free (tmp_buf); +free_bch (bch);I have used
kfree()instead offree()in entire nand bcb code So, I think for consistency reason it should be kfree here.
Quoted 2 lines
Could you please resend this patch with above mentioned changes. Other than this,
Thanks, will change it to kfree in v2.
Quoted 25 lines
Quoted 12 lines
arch/arm/mach-imx/cmd_nandbcb.c +1
-2static u8 calculate_parity_13_8 (u8 d) {u8 p =0 ;@@ -231,8 +293,14 @@ static int nandbcb_update(struct mtd_info *mtd, loff_t off, size_t size, goto dbbt_data_page_err; } -memcpy (fcb_raw_page +12 , fcb,sizeof (struct fcb_block )); -encode_hamming_13_8 (fcb_raw_page +12 , fcb_raw_page +12 +512 ,512 ); +if (is_mx6ul () ||is_mx6ull ()) {arch/arm/mach-imx/cmd_nandbcb.c static int nandbcb_update(struct mtd_info *mtd, loff_t off, size_t size, · line 306
Quoted 10 lines
arch/arm/mach-imx/cmd_nandbcb.c +7
-0+/* 40 bit BCH, for i.MX6UL(L) */ +encode_bch_ecc (fcb_raw_page +32 , fcb,40 ); + }else { +memcpy (fcb_raw_page +12 , fcb,sizeof (struct fcb_block )); +encode_hamming_13_8 (fcb_raw_page +12 , + fcb_raw_page +12 +512 ,512 ); + }/* * Set the first and second byte of OOB data to 0xFF, not 0x00. These * bytes are used as the Manufacturers Bad Block Marker (MBBM). Since Acked-by Shyam Saini <[email protected]>
Signature · 6 lines
Thanks, Parthiban N DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-22 Fax: (+49)-8142-66989-80 Email: pn at denx.de
PATCH 1/2 i.MX6: nand: extend nandbcb command for imx6UL(L)
Quoted 9 lines
Hi Shyam,
Quoted 3 lines · Shyam Saini
Hi Parthiban,
Thanks a lot for working on this.
Still enabling
SECURE_BOOTfails to boot. Am yet to figure out this. Do you have secure boot working from NAND?
I haven't tried secure boot with nand and our imx6ul board has some other nand boot issues so couldn't test it soon.
Quoted 146 lines
Quoted 108 lines
Please see comments below.
Quoted 90 lines
Firmware Configuration Block(FCB) for imx6ul(l) needs to be BCH encoded. This patch depends on [1].
[1]: https://patchwork.ozlabs.org/project/uboot/list/?series=113810
Signed-off-by Parthiban Nallathambi <[email protected]>--- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-imx/cmd_nandbcb.c | 72 ++++++++++++++++++++++++++++++++- 2 files changed, 71 insertions(+), 2 deletions(-)arch/arm/mach-imx/Kconfig +1
-0@@ -74,6 +74,7 @@ config CMD_HDMIDETECT config CMD_NANDBCB bool "i.MX6 NAND Boot Control Block(BCB) command" depends on NAND && CMD_MTDPARTS + select BCH if MX6UL || MX6ULL default y if ARCH_MX6 && NAND_MXS help Unlike normal 'nand write/erase' commands, this command updatearch/arm/mach-imx/cmd_nandbcb.c +50
-0@@ -14,8 +14,10 @@#include <asm/io.h> #include <jffs2/jffs2.h> +#include <linux/bch.h> #include <linux/mtd/mtd.h> +#include <asm/arch/sys_proto.h> #include <asm/mach-imx/imx-nandbcb.h> #include <asm/mach-imx/imximage.cfg> #include <mxs_nand.h> @@ -25,6 +27,66 @@#define BF_VAL (v, bf) (((v) & bf##_MASK) >> bf##_OFFSET)#define GETBIT (v, n) (((v) >> (n)) & 0x1) +static uint8_t reverse_bit (uint8_t b) +{ + b = (b &0xf0 ) >>4 | (b &0x0f ) <<4 ; + b = (b &0xcc ) >>2 | (b &0x33 ) <<2 ; + b = (b &0xaa ) >>1 | (b &0x55 ) <<1 ; + +return b; +} + +static void encode_bch_ecc (void *buf,struct fcb_block *fcb,int eccbits) +{ +int i, j, m =13 ; +int blocksize =128 ; +int numblocks =8 ; +int ecc_buf_size = (m * eccbits +7 ) /8 ; +struct bch_control *bch =init_bch (m, eccbits,0 ); +u8 *ecc_buf =kzalloc (ecc_buf_size,GFP_KERNEL ); +u8 *tmp_buf =kzalloc (blocksize * numblocks,GFP_KERNEL ); +u8 *psrc, *pdst; + +/* +* The blocks here are bit aligned. If eccbits is a multiple of 8, +* we just can copy bytes. Otherwiese we must move the blocks to +* the next free bit position. +*/ +WARN_ON (eccbits %8 ); + +memcpy (tmp_buf, fcb,sizeof (*fcb)); + +for (i =0 ; i < numblocks; i++) { +memset (ecc_buf,0 , ecc_buf_size); + psrc = tmp_buf + i * blocksize; + pdst = buf + i * (blocksize + ecc_buf_size); + +/* copy data byte aligned to destination buf */ +memcpy (pdst, psrc, blocksize); + +/* +* imx-kobs use a modified encode_bch which reverse the +* bit order of the data before calculating bch. +* Do this in the buffer and use the bch lib here. +*/ +for (j =0 ; j < blocksize; j++) + psrc[j] =reverse_bit (psrc[j]); + +encode_bch (bch, psrc, blocksize, ecc_buf); + +/* reverse ecc bit */ arch/arm/mach-imx/cmd_nandbcb.c line 87
Quoted 10 lines
arch/arm/mach-imx/cmd_nandbcb.c +10
-0+for (j =0 ; j < ecc_buf_size; j++) + ecc_buf[j] =reverse_bit (ecc_buf[j]); + +/* Here eccbuf is byte aligned and we can just copy it */ +memcpy (pdst + blocksize, ecc_buf, ecc_buf_size); + } + +free (ecc_buf); +free (tmp_buf); +free_bch (bch);I have used
kfree()instead offree()in entire nand bcb code So, I think for consistency reason it should be kfree here.Quoted 2 lines
Could you please resend this patch with above mentioned changes. Other than this,
Thanks, will change it to kfree in v2.
Quoted 9 lines
Quoted 9 lines
arch/arm/mach-imx/cmd_nandbcb.c +0
-0static u8 calculate_parity_13_8 (u8 d) {u8 p =0 ;@@ -231,8 +293,14 @@ static int nandbcb_update(struct mtd_info *mtd, loff_t off, size_t size, goto dbbt_data_page_err; }Quoted 16 lines
arch/arm/mach-imx/cmd_nandbcb.c static int nandbcb_update(struct mtd_info *mtd, loff_t off, size_t size, · line 306
Quoted 13 lines
arch/arm/mach-imx/cmd_nandbcb.c +8
-2-memcpy (fcb_raw_page +12 , fcb,sizeof (struct fcb_block )); -encode_hamming_13_8 (fcb_raw_page +12 , fcb_raw_page +12 +512 ,512 ); +if (is_mx6ul () ||is_mx6ull ()) { +/* 40 bit BCH, for i.MX6UL(L) */ +encode_bch_ecc (fcb_raw_page +32 , fcb,40 ); + }else { +memcpy (fcb_raw_page +12 , fcb,sizeof (struct fcb_block )); +encode_hamming_13_8 (fcb_raw_page +12 , + fcb_raw_page +12 +512 ,512 ); + }/* * Set the first and second byte of OOB data to 0xFF, not 0x00. These * bytes are used as the Manufacturers Bad Block Marker (MBBM). Since Acked-by Shyam Saini <[email protected]>--
Thanks,
Parthiban NDENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-22 Fax: (+49)-8142-66989-80 Email: pn at denx.de