nand: brcmnand: rename v4 registers
Subsystems (5)
PATCH 1/3 nand: brcmnand: rename v4 registers
These registers are also used on v3.3.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +4 -4
@@ -338,8 +338,8 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; -/* BRCMNAND v4.0 */ -static const u16 brcmnand_regs_v40[] = { +/* BRCMNAND v3.3-v4.0 */ +static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 , [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , [BRCMNAND_CMD_ADDRESS ] =0x0c ,
@@ -591,8 +591,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v60; else if (ctrl->nand_version >= 0x0500) ctrl->reg_offsets = brcmnand_regs_v50; - else if (ctrl->nand_version >= 0x0400) - ctrl->reg_offsets = brcmnand_regs_v40; + else if (ctrl->nand_version >= 0x0303) + ctrl->reg_offsets = brcmnand_regs_v33;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
Signature · 1 line
2.26.2
PATCH 2/3 nand: brcmnand: fix CS0 layout
Only v3.3-v5.0 have a different CS0 layout. v3.3- controllers use the same layout for every CS.
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +3 -2
@@ -606,8 +606,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) }else { ctrl->cs_offsets = brcmnand_cs_offsets; -/* v5.0 and earlier has a different CS0 offset layout */ -if (ctrl->nand_version <=0x0500 ) +/* v3.3-5.0 have a different CS0 offset layout */ +if (ctrl->nand_version >=0x0303 && + ctrl->nand_version <=0x0500 ) ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; }
Signature · 1 line
2.26.2
Miquel Raynal
maintainerRe: [PATCH 2/3] nand: brcmnand: fix CS0 layout
Hi Álvaro,
Álvaro Fernández Rojas <[email protected]> wrote on Sun, 10 May 2020 17:14:05 +0200:
Quoted 2 lines
Only v3.3-v5.0 have a different CS0 layout. v3.3- controllers use the same layout for every CS.
I had a hard time what you meant here, just because of the trailing dash.
"Controllers before v3.3..."
would be more understandable.
Also please add a Fixes/Cc: stable tag here.
Quoted 12 lines
Signed-off-by Álvaro Fernández Rojas <[email protected]>--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/mtd/nand/raw/brcmnand/brcmnand.c +0
-0@@ -606,8 +606,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) }else {
drivers/mtd/nand/raw/brcmnand/brcmnand.c static int brcmnand_revision_init(struct brcmnand_controller *ctrl) · line 614
Quoted 10 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +3
-2ctrl->cs_offsets = brcmnand_cs_offsets; -/* v5.0 and earlier has a different CS0 offset layout */ -if (ctrl->nand_version <=0x0500 ) +/* v3.3-5.0 have a different CS0 offset layout */ +if (ctrl->nand_version >=0x0303 && + ctrl->nand_version <=0x0500 ) ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; }
Thanks,
Miquèl
PATCH 3/3 nand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández RojasTested on Netgear DGND3700v2 (BCM6362 with v2.2 controller).
--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 76 +++++++++++++++++++++--- 1 file changed, 67 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +67 -9
@@ -338,6 +338,36 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; +/* BRCMNAND v2.1-v2.2 */ +static const u16 brcmnand_regs_v21[] = { + [BRCMNAND_CMD_START ] =0x04 , + [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , + [BRCMNAND_CMD_ADDRESS ] =0x0c , + [BRCMNAND_INTFC_STATUS ] =0x5c , + [BRCMNAND_CS_SELECT ] =0x14 , + [BRCMNAND_CS_XOR ] =0x18 , + [BRCMNAND_LL_OP ] =0 , + [BRCMNAND_CS0_BASE ] =0x40 , + [BRCMNAND_CS1_BASE ] =0 , + [BRCMNAND_CORR_THRESHOLD ] =0 , + [BRCMNAND_CORR_THRESHOLD_EXT ] =0 , + [BRCMNAND_UNCORR_COUNT ] =0 , + [BRCMNAND_CORR_COUNT ] =0 , + [BRCMNAND_CORR_EXT_ADDR ] =0x60 , + [BRCMNAND_CORR_ADDR ] =0x64 , + [BRCMNAND_UNCORR_EXT_ADDR ] =0x68 , + [BRCMNAND_UNCORR_ADDR ] =0x6c , + [BRCMNAND_SEMAPHORE ] =0x50 , + [BRCMNAND_ID ] =0x54 , + [BRCMNAND_ID_EXT ] =0 , + [BRCMNAND_LL_RDATA ] =0 , + [BRCMNAND_OOB_READ_BASE ] =0x20 , + [BRCMNAND_OOB_READ_10_BASE ] =0 , + [BRCMNAND_OOB_WRITE_BASE ] =0x30 , + [BRCMNAND_OOB_WRITE_10_BASE ] =0 , + [BRCMNAND_FC_BASE ] =0x200 , +}; +/* BRCMNAND v3.3-v4.0 */ static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 ,
@@ -571,12 +601,16 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; -static const unsigned int page_sizes[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int block_sizes_v2_2[] = {16 ,128 ,8 ,512 ,256 ,0 }; +static const unsigned int block_sizes[] = {16 ,128 ,8 ,512 ,0 }; +static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v2_2[] = {512 ,2048 ,4096 ,0 }; +static const unsigned int page_sizes[] = {512 ,2048 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ; -/* Only support v4.0+? */ -if (ctrl->nand_version <0x0400 ) { +/* Only support v2.1+ */ +if (ctrl->nand_version <0x0201 ) {dev_err (ctrl->dev,"version %#x not supported\n" , ctrl->nand_version);return -ENODEV ;
@@ -593,6 +627,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v50; else if (ctrl->nand_version >= 0x0303) ctrl->reg_offsets = brcmnand_regs_v33; + else if (ctrl->nand_version >= 0x0201) + ctrl->reg_offsets = brcmnand_regs_v21;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
@@ -618,14 +654,27 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes; +if (ctrl->nand_version >=0x0304 ) + ctrl->page_sizes = page_sizes_v3_4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->page_sizes = page_sizes_v2_2; +else + ctrl->page_sizes = page_sizes; +if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6; -else +else if (ctrl->nand_version >=0x0400 ) ctrl->block_sizes = block_sizes_v4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->block_sizes = block_sizes_v2_2; +else + ctrl->block_sizes = block_sizes;if (ctrl->nand_version <0x0400 ) { - ctrl->max_page_size =4096 ; +if (ctrl->nand_version <0x0202 ) + ctrl->max_page_size =2048 ; +else + ctrl->max_page_size =4096 ; ctrl->max_block_size =512 *1024 ; } }
@@ -811,6 +860,9 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)enum brcmnand_reg reg =BRCMNAND_CORR_THRESHOLD ;int cs = host->cs; +if (!ctrl->reg_offsets[reg]) +return ; +if (ctrl->nand_version ==0x0702 ) bits =7 ;else if (ctrl->nand_version >=0x0600 )
@@ -869,8 +921,10 @@ static inline u32 brcmnand_spare_area_mask(struct brcmnand_controller *ctrl)return GENMASK (7 ,0 ); else if (ctrl->nand_version >= 0x0600) return GENMASK(6, 0); - else + else if (ctrl->nand_version >= 0x0303) return GENMASK(5, 0); + else + return GENMASK(4, 0); }#define NAND_ACC_CONTROL_ECC_SHIFT 16
@@ -2390,9 +2444,11 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, tmp =nand_readreg (ctrl, acc_control_offs); tmp &= ~brcmnand_ecc_level_mask (ctrl); - tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; tmp &= ~brcmnand_spare_area_mask (ctrl); - tmp |= cfg->spare_area_size; +if (ctrl->nand_version >=0x0302 ) { + tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; + tmp |= cfg->spare_area_size; + }nand_writereg (ctrl, acc_control_offs, tmp);brcmnand_set_sector_size_1k (host, cfg->sector_size_1k);
@@ -2766,6 +2822,8 @@ const struct dev_pm_ops brcmnand_pm_ops = {EXPORT_SYMBOL_GPL (brcmnand_pm_ops);static const struct of_device_id brcmnand_of_match[] = { + { .compatible ="brcm,brcmnand-v2.1" }, + { .compatible ="brcm,brcmnand-v2.2" }, { .compatible ="brcm,brcmnand-v4.0" }, { .compatible ="brcm,brcmnand-v5.0" }, { .compatible ="brcm,brcmnand-v6.0" },
Signature · 1 line
2.26.2
Re: [PATCH 3/3] nand: brcmnand: support v2.1-v2.2 controllers
Quoted 3 lines · Álvaro Fernández Rojas
Tested on Netgear DGND3700v2 (BCM6362 with v2.2 controller).
Signed-off-by Álvaro Fernández Rojas <[email protected]>
Can you fix a couple of things for your future submissions:
- for patch count > 1, please provide a cover letter introducing your patches
- for this specific patch, you are missing a Device Tree binding document update with the new compatible strings you are adding
Thank you!
Signature · 1 line
Florian
Miquel Raynal
maintainerRe: [PATCH 3/3] nand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández RojasHi Álvaro,
Álvaro Fernández Rojas <[email protected]> wrote on Sun, 10 May 2020 17:14:06 +0200:
Quoted 1 line
Tested on Netgear DGND3700v2 (BCM6362 with v2.2 controller).
I'd propose to do this in two steps:
First rename what needs to be rename to be more accurate without adding anything specific to this version of the IP, then, in another patch, just add the necessary bits.
Quoted 48 lines
Signed-off-by Álvaro Fernández Rojas <[email protected]>--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 76 +++++++++++++++++++++--- 1 file changed, 67 insertions(+), 9 deletions(-)drivers/mtd/nand/raw/brcmnand/brcmnand.c +30
-0@@ -338,6 +338,36 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; +/* BRCMNAND v2.1-v2.2 */ +static const u16 brcmnand_regs_v21[] = { + [BRCMNAND_CMD_START ] =0x04 , + [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , + [BRCMNAND_CMD_ADDRESS ] =0x0c , + [BRCMNAND_INTFC_STATUS ] =0x5c , + [BRCMNAND_CS_SELECT ] =0x14 , + [BRCMNAND_CS_XOR ] =0x18 , + [BRCMNAND_LL_OP ] =0 , + [BRCMNAND_CS0_BASE ] =0x40 , + [BRCMNAND_CS1_BASE ] =0 , + [BRCMNAND_CORR_THRESHOLD ] =0 , + [BRCMNAND_CORR_THRESHOLD_EXT ] =0 , + [BRCMNAND_UNCORR_COUNT ] =0 , + [BRCMNAND_CORR_COUNT ] =0 , + [BRCMNAND_CORR_EXT_ADDR ] =0x60 , + [BRCMNAND_CORR_ADDR ] =0x64 , + [BRCMNAND_UNCORR_EXT_ADDR ] =0x68 , + [BRCMNAND_UNCORR_ADDR ] =0x6c , + [BRCMNAND_SEMAPHORE ] =0x50 , + [BRCMNAND_ID ] =0x54 , + [BRCMNAND_ID_EXT ] =0 , + [BRCMNAND_LL_RDATA ] =0 , + [BRCMNAND_OOB_READ_BASE ] =0x20 , + [BRCMNAND_OOB_READ_10_BASE ] =0 , + [BRCMNAND_OOB_WRITE_BASE ] =0x30 , + [BRCMNAND_OOB_WRITE_10_BASE ] =0 , + [BRCMNAND_FC_BASE ] =0x200 , +}; +/* BRCMNAND v3.3-v4.0 */ static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 ,
drivers/mtd/nand/raw/brcmnand/brcmnand.c static int brcmnand_revision_init(struct brcmnand_controller *ctrl) · line 608
Quoted 9 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +5
-1@@ -571,12 +601,16 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; -static const unsigned int page_sizes[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int block_sizes_v2_2[] = {16 ,128 ,8 ,512 ,256 ,0 }; +static const unsigned int block_sizes[] = {16 ,128 ,8 ,512 ,0 }; +static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v2_2[] = {512 ,2048 ,4096 ,0 }; +static const unsigned int page_sizes[] = {512 ,2048 ,0 };
Can you name a version everywhere?
Quoted 87 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +30
-8ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ; -/* Only support v4.0+? */ -if (ctrl->nand_version <0x0400 ) { +/* Only support v2.1+ */ +if (ctrl->nand_version <0x0201 ) {dev_err (ctrl->dev,"version %#x not supported\n" , ctrl->nand_version);return -ENODEV ;@@ -593,6 +627,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v50; else if (ctrl->nand_version >= 0x0303) ctrl->reg_offsets = brcmnand_regs_v33; + else if (ctrl->nand_version >= 0x0201) + ctrl->reg_offsets = brcmnand_regs_v21;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )@@ -618,14 +654,27 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes; +if (ctrl->nand_version >=0x0304 ) + ctrl->page_sizes = page_sizes_v3_4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->page_sizes = page_sizes_v2_2; +else + ctrl->page_sizes = page_sizes; +if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6; -else +else if (ctrl->nand_version >=0x0400 ) ctrl->block_sizes = block_sizes_v4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->block_sizes = block_sizes_v2_2; +else + ctrl->block_sizes = block_sizes;if (ctrl->nand_version <0x0400 ) { - ctrl->max_page_size =4096 ; +if (ctrl->nand_version <0x0202 ) + ctrl->max_page_size =2048 ; +else + ctrl->max_page_size =4096 ; ctrl->max_block_size =512 *1024 ; } }@@ -811,6 +860,9 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)enum brcmnand_reg reg =BRCMNAND_CORR_THRESHOLD ;int cs = host->cs; +if (!ctrl->reg_offsets[reg]) +return ; +if (ctrl->nand_version ==0x0702 ) bits =7 ;else if (ctrl->nand_version >=0x0600 )@@ -869,8 +921,10 @@ static inline u32 brcmnand_spare_area_mask(struct brcmnand_controller *ctrl)return GENMASK (7 ,0 ); else if (ctrl->nand_version >= 0x0600) return GENMASK(6, 0); - else + else if (ctrl->nand_version >= 0x0303) return GENMASK(5, 0); + else + return GENMASK(4, 0); }#define NAND_ACC_CONTROL_ECC_SHIFT 16@@ -2390,9 +2444,11 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, tmp =nand_readreg (ctrl, acc_control_offs); tmp &= ~brcmnand_ecc_level_mask (ctrl); - tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; tmp &= ~brcmnand_spare_area_mask (ctrl); - tmp |= cfg->spare_area_size; +if (ctrl->nand_version >=0x0302 ) { + tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; + tmp |= cfg->spare_area_size; + }nand_writereg (ctrl, acc_control_offs, tmp);brcmnand_set_sector_size_1k (host, cfg->sector_size_1k);
drivers/mtd/nand/raw/brcmnand/brcmnand.c const struct dev_pm_ops brcmnand_pm_ops = { · line 2829
Quoted 8 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +2
-0@@ -2766,6 +2822,8 @@ const struct dev_pm_ops brcmnand_pm_ops = {EXPORT_SYMBOL_GPL (brcmnand_pm_ops);static const struct of_device_id brcmnand_of_match[] = { + { .compatible ="brcm,brcmnand-v2.1" }, + { .compatible ="brcm,brcmnand-v2.2" }, { .compatible ="brcm,brcmnand-v4.0" }, { .compatible ="brcm,brcmnand-v5.0" }, { .compatible ="brcm,brcmnand-v6.0" },
You should also document these new bindings in a separate patch (before this one).
Thanks,
Miquèl
Hi Álvaro,
Álvaro Fernández Rojas <[email protected]> wrote on Sun, 10 May 2020 17:14:04 +0200:
Quoted 23 lines
These registers are also used on v3.3.
Signed-off-by Álvaro Fernández Rojas <[email protected]>--- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/mtd/nand/raw/brcmnand/brcmnand.c +2
-2@@ -338,8 +338,8 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; -/* BRCMNAND v4.0 */ -static const u16 brcmnand_regs_v40[] = { +/* BRCMNAND v3.3-v4.0 */ +static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 , [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , [BRCMNAND_CMD_ADDRESS ] =0x0c ,
drivers/mtd/nand/raw/brcmnand/brcmnand.c static int brcmnand_revision_init(struct brcmnand_controller *ctrl) · line 598
Quoted 10 lines
drivers/mtd/nand/raw/brcmnand/brcmnand.c +2
-2@@ -591,8 +591,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v60; else if (ctrl->nand_version >= 0x0500) ctrl->reg_offsets = brcmnand_regs_v50; - else if (ctrl->nand_version >= 0x0400) - ctrl->reg_offsets = brcmnand_regs_v40; + else if (ctrl->nand_version >= 0x0303) + ctrl->reg_offsets = brcmnand_regs_v33;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
Miquel Raynal
maintainerHi Álvaro,
Álvaro Fernández Rojas <[email protected]> wrote on Sun, 10 May 2020 17:14:04 +0200:
Quoted 4 lines
These registers are also used on v3.3.
Signed-off-by Álvaro Fernández Rojas <[email protected]>---
BTW, all your titles should start with "mtd: rawnand: brcmnand: "
Thanks,
Miquèl
v2 cover mtd: rawnand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández RojasAdd support for v2.1 and v2.2 NAND controllers.
v2: introduce changes suggested by Miquèl.
Álvaro Fernández Rojas (5):
mtd: rawnand: brcmnand: rename v4 registers
mtd: rawnand: brcmnand: fix CS0 layout
mtd: rawnand: brcmnand: rename page sizes
dt: bindings: brcmnand: add v2.1 and v2.2 support
nand: brcmnand: support v2.1-v2.2 controllers
.../devicetree/bindings/mtd/brcm,brcmnand.txt | 2 + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 89 +++++++++++++++---- 2 files changed, 76 insertions(+), 15 deletions(-)
Signature · 6 lines
2.26.2 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v2 1/5 mtd: rawnand: brcmnand: rename v4 registers
These registers are also used on v3.3.
---
v2: fix commit title.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +4 -4
@@ -338,8 +338,8 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; -/* BRCMNAND v4.0 */ -static const u16 brcmnand_regs_v40[] = { +/* BRCMNAND v3.3-v4.0 */ +static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 , [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , [BRCMNAND_CMD_ADDRESS ] =0x0c ,
@@ -591,8 +591,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v60; else if (ctrl->nand_version >= 0x0500) ctrl->reg_offsets = brcmnand_regs_v50; - else if (ctrl->nand_version >= 0x0400) - ctrl->reg_offsets = brcmnand_regs_v40; + else if (ctrl->nand_version >= 0x0303) + ctrl->reg_offsets = brcmnand_regs_v33;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
Signature · 1 line
2.26.2
PATCH v2 2/5 mtd: rawnand: brcmnand: fix CS0 layout
In reply to Álvaro Fernández RojasOnly v3.3-v5.0 have a different CS0 layout. Controllers before v3.3 use the same layout for every CS.
---
v2: fix commit log.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +3 -2
@@ -606,8 +606,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) }else { ctrl->cs_offsets = brcmnand_cs_offsets; -/* v5.0 and earlier has a different CS0 offset layout */ -if (ctrl->nand_version <=0x0500 ) +/* v3.3-5.0 have a different CS0 offset layout */ +if (ctrl->nand_version >=0x0303 && + ctrl->nand_version <=0x0500 ) ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; }
Signature · 1 line
2.26.2
PATCH v2 3/5 mtd: rawnand: brcmnand: rename page sizes
In reply to Álvaro Fernández RojasCurrent pages sizes apply to controllers after v3.4
---
v2: add new patch.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +2 -2
@@ -571,7 +571,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; -static const unsigned int page_sizes[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ;
@@ -618,7 +618,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes; + ctrl->page_sizes = page_sizes_v3_4;if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6;else
Signature · 1 line
2.26.2
PATCH v2 4/5 dt: bindings: brcmnand: add v2.1 and v2.2 support
In reply to Álvaro Fernández RojasAdded brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2.
---
v2: add new patch
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +2 -0
@@ -20,6 +20,8 @@ Required properties: "brcm,brcmnand" and an appropriate version compatibility string, like "brcm,brcmnand-v7.0" Possible values: + brcm,brcmnand-v2.1 + brcm,brcmnand-v2.2 brcm,brcmnand-v4.0 brcm,brcmnand-v5.0 brcm,brcmnand-v6.0
Signature · 1 line
2.26.2
PATCH v2 5/5 mtd: rawnand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández RojasTested on Netgear DGND3700v2 (BCM6362 with v2.2 controller).
---
v2: split page sizes rename into a different patch.
name all block and page sizes versions.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 74 +++++++++++++++++++++--- 1 file changed, 66 insertions(+), 8 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +66 -8
@@ -338,6 +338,36 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; +/* BRCMNAND v2.1-v2.2 */ +static const u16 brcmnand_regs_v21[] = { + [BRCMNAND_CMD_START ] =0x04 , + [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , + [BRCMNAND_CMD_ADDRESS ] =0x0c , + [BRCMNAND_INTFC_STATUS ] =0x5c , + [BRCMNAND_CS_SELECT ] =0x14 , + [BRCMNAND_CS_XOR ] =0x18 , + [BRCMNAND_LL_OP ] =0 , + [BRCMNAND_CS0_BASE ] =0x40 , + [BRCMNAND_CS1_BASE ] =0 , + [BRCMNAND_CORR_THRESHOLD ] =0 , + [BRCMNAND_CORR_THRESHOLD_EXT ] =0 , + [BRCMNAND_UNCORR_COUNT ] =0 , + [BRCMNAND_CORR_COUNT ] =0 , + [BRCMNAND_CORR_EXT_ADDR ] =0x60 , + [BRCMNAND_CORR_ADDR ] =0x64 , + [BRCMNAND_UNCORR_EXT_ADDR ] =0x68 , + [BRCMNAND_UNCORR_ADDR ] =0x6c , + [BRCMNAND_SEMAPHORE ] =0x50 , + [BRCMNAND_ID ] =0x54 , + [BRCMNAND_ID_EXT ] =0 , + [BRCMNAND_LL_RDATA ] =0 , + [BRCMNAND_OOB_READ_BASE ] =0x20 , + [BRCMNAND_OOB_READ_10_BASE ] =0 , + [BRCMNAND_OOB_WRITE_BASE ] =0x30 , + [BRCMNAND_OOB_WRITE_10_BASE ] =0 , + [BRCMNAND_FC_BASE ] =0x200 , +}; +/* BRCMNAND v3.3-v4.0 */ static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 ,
@@ -571,12 +601,16 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; +static const unsigned int block_sizes_v2_2[] = {16 ,128 ,8 ,512 ,256 ,0 }; +static const unsigned int block_sizes_v2_1[] = {16 ,128 ,8 ,512 ,0 };static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v2_2[] = {512 ,2048 ,4096 ,0 }; +static const unsigned int page_sizes_v2_1[] = {512 ,2048 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ; -/* Only support v4.0+? */ -if (ctrl->nand_version <0x0400 ) { +/* Only support v2.1+ */ +if (ctrl->nand_version <0x0201 ) {dev_err (ctrl->dev,"version %#x not supported\n" , ctrl->nand_version);return -ENODEV ;
@@ -593,6 +627,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v50; else if (ctrl->nand_version >= 0x0303) ctrl->reg_offsets = brcmnand_regs_v33; + else if (ctrl->nand_version >= 0x0201) + ctrl->reg_offsets = brcmnand_regs_v21;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
@@ -618,14 +654,27 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes_v3_4; +if (ctrl->nand_version >=0x0304 ) + ctrl->page_sizes = page_sizes_v3_4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->page_sizes = page_sizes_v2_2; +else + ctrl->page_sizes = page_sizes_v2_1; +if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6; -else +else if (ctrl->nand_version >=0x0400 ) ctrl->block_sizes = block_sizes_v4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->block_sizes = block_sizes_v2_2; +else + ctrl->block_sizes = block_sizes_v2_1;if (ctrl->nand_version <0x0400 ) { - ctrl->max_page_size =4096 ; +if (ctrl->nand_version <0x0202 ) + ctrl->max_page_size =2048 ; +else + ctrl->max_page_size =4096 ; ctrl->max_block_size =512 *1024 ; } }
@@ -811,6 +860,9 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)enum brcmnand_reg reg =BRCMNAND_CORR_THRESHOLD ;int cs = host->cs; +if (!ctrl->reg_offsets[reg]) +return ; +if (ctrl->nand_version ==0x0702 ) bits =7 ;else if (ctrl->nand_version >=0x0600 )
@@ -869,8 +921,10 @@ static inline u32 brcmnand_spare_area_mask(struct brcmnand_controller *ctrl)return GENMASK (7 ,0 ); else if (ctrl->nand_version >= 0x0600) return GENMASK(6, 0); - else + else if (ctrl->nand_version >= 0x0303) return GENMASK(5, 0); + else + return GENMASK(4, 0); }#define NAND_ACC_CONTROL_ECC_SHIFT 16
@@ -2390,9 +2444,11 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, tmp =nand_readreg (ctrl, acc_control_offs); tmp &= ~brcmnand_ecc_level_mask (ctrl); - tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; tmp &= ~brcmnand_spare_area_mask (ctrl); - tmp |= cfg->spare_area_size; +if (ctrl->nand_version >=0x0302 ) { + tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; + tmp |= cfg->spare_area_size; + }nand_writereg (ctrl, acc_control_offs, tmp);brcmnand_set_sector_size_1k (host, cfg->sector_size_1k);
@@ -2766,6 +2822,8 @@ const struct dev_pm_ops brcmnand_pm_ops = {EXPORT_SYMBOL_GPL (brcmnand_pm_ops);static const struct of_device_id brcmnand_of_match[] = { + { .compatible ="brcm,brcmnand-v2.1" }, + { .compatible ="brcm,brcmnand-v2.2" }, { .compatible ="brcm,brcmnand-v4.0" }, { .compatible ="brcm,brcmnand-v5.0" }, { .compatible ="brcm,brcmnand-v6.0" },
Signature · 1 line
2.26.2
v3 cover mtd: rawnand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández RojasAdd support for v2.1 and v2.2 NAND controllers.
v3: fix v2.1 page size shift
v2: introduce changes suggested by Miquèl.
Álvaro Fernández Rojas (5):
mtd: rawnand: brcmnand: rename v4 registers
mtd: rawnand: brcmnand: fix CS0 layout
mtd: rawnand: brcmnand: rename page sizes
dt: bindings: brcmnand: add v2.1 and v2.2 support
nand: brcmnand: support v2.1-v2.2 controllers
.../devicetree/bindings/mtd/brcm,brcmnand.txt | 2 + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 100 +++++++++++++++--- 2 files changed, 86 insertions(+), 16 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/5 mtd: rawnand: brcmnand: rename v4 registers
These registers are also used on v3.3.
---
v3: no changes.
v2: fix commit title.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +4 -4
@@ -338,8 +338,8 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; -/* BRCMNAND v4.0 */ -static const u16 brcmnand_regs_v40[] = { +/* BRCMNAND v3.3-v4.0 */ +static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 , [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , [BRCMNAND_CMD_ADDRESS ] =0x0c ,
@@ -591,8 +591,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v60; else if (ctrl->nand_version >= 0x0500) ctrl->reg_offsets = brcmnand_regs_v50; - else if (ctrl->nand_version >= 0x0400) - ctrl->reg_offsets = brcmnand_regs_v40; + else if (ctrl->nand_version >= 0x0303) + ctrl->reg_offsets = brcmnand_regs_v33;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
Signature · 1 line
2.26.2
PATCH v3 2/5 mtd: rawnand: brcmnand: fix CS0 layout
In reply to Álvaro Fernández RojasOnly v3.3-v5.0 have a different CS0 layout. Controllers before v3.3 use the same layout for every CS.
---
v3: no changes.
v2: fix commit log.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +3 -2
@@ -606,8 +606,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) }else { ctrl->cs_offsets = brcmnand_cs_offsets; -/* v5.0 and earlier has a different CS0 offset layout */ -if (ctrl->nand_version <=0x0500 ) +/* v3.3-5.0 have a different CS0 offset layout */ +if (ctrl->nand_version >=0x0303 && + ctrl->nand_version <=0x0500 ) ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; }
Signature · 1 line
2.26.2
PATCH v3 3/5 mtd: rawnand: brcmnand: rename page sizes
In reply to Álvaro Fernández RojasCurrent pages sizes apply to controllers after v3.4
---
v3: no changes.
v2: add new patch.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +2 -2
@@ -571,7 +571,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; -static const unsigned int page_sizes[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ;
@@ -618,7 +618,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes; + ctrl->page_sizes = page_sizes_v3_4;if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6;else
Signature · 1 line
2.26.2
PATCH v3 4/5 dt: bindings: brcmnand: add v2.1 and v2.2 support
In reply to Álvaro Fernández RojasAdded brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2.
---
v3: no changes.
v2: add new patch.
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +2 -0
@@ -20,6 +20,8 @@ Required properties: "brcm,brcmnand" and an appropriate version compatibility string, like "brcm,brcmnand-v7.0" Possible values: + brcm,brcmnand-v2.1 + brcm,brcmnand-v2.2 brcm,brcmnand-v4.0 brcm,brcmnand-v5.0 brcm,brcmnand-v6.0
Signature · 1 line
2.26.2
PATCH v3 5/5 nand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández Rojasv2.1: tested on Netgear DGND3700v1 (BCM6368)
v2.2: tested on Netgear DGND3700v2 (BCM6362)
---
v3: fix page size shift for v2.1 controllers.
v2: split page sizes rename into a different patch.
name all block and page sizes versions.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 85 +++++++++++++++++++++--- 1 file changed, 76 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +76 -9
@@ -264,6 +264,7 @@ struct brcmnand_controller {const unsigned int *block_sizes;unsigned int max_page_size;const unsigned int *page_sizes; +unsigned int page_size_shift;unsigned int max_oob;u32 features;
@@ -338,6 +339,36 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; +/* BRCMNAND v2.1-v2.2 */ +static const u16 brcmnand_regs_v21[] = { + [BRCMNAND_CMD_START ] =0x04 , + [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , + [BRCMNAND_CMD_ADDRESS ] =0x0c , + [BRCMNAND_INTFC_STATUS ] =0x5c , + [BRCMNAND_CS_SELECT ] =0x14 , + [BRCMNAND_CS_XOR ] =0x18 , + [BRCMNAND_LL_OP ] =0 , + [BRCMNAND_CS0_BASE ] =0x40 , + [BRCMNAND_CS1_BASE ] =0 , + [BRCMNAND_CORR_THRESHOLD ] =0 , + [BRCMNAND_CORR_THRESHOLD_EXT ] =0 , + [BRCMNAND_UNCORR_COUNT ] =0 , + [BRCMNAND_CORR_COUNT ] =0 , + [BRCMNAND_CORR_EXT_ADDR ] =0x60 , + [BRCMNAND_CORR_ADDR ] =0x64 , + [BRCMNAND_UNCORR_EXT_ADDR ] =0x68 , + [BRCMNAND_UNCORR_ADDR ] =0x6c , + [BRCMNAND_SEMAPHORE ] =0x50 , + [BRCMNAND_ID ] =0x54 , + [BRCMNAND_ID_EXT ] =0 , + [BRCMNAND_LL_RDATA ] =0 , + [BRCMNAND_OOB_READ_BASE ] =0x20 , + [BRCMNAND_OOB_READ_10_BASE ] =0 , + [BRCMNAND_OOB_WRITE_BASE ] =0x30 , + [BRCMNAND_OOB_WRITE_10_BASE ] =0 , + [BRCMNAND_FC_BASE ] =0x200 , +}; +/* BRCMNAND v3.3-v4.0 */ static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 ,
@@ -536,6 +567,9 @@ enum {CFG_BUS_WIDTH =BIT (CFG_BUS_WIDTH_SHIFT ),CFG_DEVICE_SIZE_SHIFT =24 , +/* Only for v2.1 */ + CFG_PAGE_SIZE_SHIFT_v2_1 =30 , +/* Only for pre-v7.1 (with no CFG_EXT register) */ CFG_PAGE_SIZE_SHIFT =20 , CFG_BLK_SIZE_SHIFT = 28,
@@ -571,12 +605,16 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; +static const unsigned int block_sizes_v2_2[] = {16 ,128 ,8 ,512 ,256 ,0 }; +static const unsigned int block_sizes_v2_1[] = {16 ,128 ,8 ,512 ,0 };static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v2_2[] = {512 ,2048 ,4096 ,0 }; +static const unsigned int page_sizes_v2_1[] = {512 ,2048 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ; -/* Only support v4.0+? */ -if (ctrl->nand_version <0x0400 ) { +/* Only support v2.1+ */ +if (ctrl->nand_version <0x0201 ) {dev_err (ctrl->dev,"version %#x not supported\n" , ctrl->nand_version);return -ENODEV ;
@@ -593,6 +631,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v50; else if (ctrl->nand_version >= 0x0303) ctrl->reg_offsets = brcmnand_regs_v33; + else if (ctrl->nand_version >= 0x0201) + ctrl->reg_offsets = brcmnand_regs_v21;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
@@ -618,14 +658,32 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes_v3_4; +if (ctrl->nand_version >=0x0304 ) + ctrl->page_sizes = page_sizes_v3_4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->page_sizes = page_sizes_v2_2; +else + ctrl->page_sizes = page_sizes_v2_1; + +if (ctrl->nand_version >=0x0202 ) + ctrl->page_size_shift =CFG_PAGE_SIZE_SHIFT ; +else + ctrl->page_size_shift = CFG_PAGE_SIZE_SHIFT_v2_1; +if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6; -else +else if (ctrl->nand_version >=0x0400 ) ctrl->block_sizes = block_sizes_v4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->block_sizes = block_sizes_v2_2; +else + ctrl->block_sizes = block_sizes_v2_1;if (ctrl->nand_version <0x0400 ) { - ctrl->max_page_size =4096 ; +if (ctrl->nand_version <0x0202 ) + ctrl->max_page_size =2048 ; +else + ctrl->max_page_size =4096 ; ctrl->max_block_size =512 *1024 ; } }
@@ -811,6 +869,9 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)enum brcmnand_reg reg =BRCMNAND_CORR_THRESHOLD ;int cs = host->cs; +if (!ctrl->reg_offsets[reg]) +return ; +if (ctrl->nand_version ==0x0702 ) bits =7 ;else if (ctrl->nand_version >=0x0600 )
@@ -869,8 +930,10 @@ static inline u32 brcmnand_spare_area_mask(struct brcmnand_controller *ctrl)return GENMASK (7 ,0 ); else if (ctrl->nand_version >= 0x0600) return GENMASK(6, 0); - else + else if (ctrl->nand_version >= 0x0303) return GENMASK(5, 0); + else + return GENMASK(4, 0); }#define NAND_ACC_CONTROL_ECC_SHIFT 16
@@ -2378,7 +2441,7 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, (!!(cfg->device_width ==16 ) <<CFG_BUS_WIDTH_SHIFT ) | (device_size <<CFG_DEVICE_SIZE_SHIFT );if (cfg_offs == cfg_ext_offs) { - tmp |= (page_size <<CFG_PAGE_SIZE_SHIFT ) | + tmp |= (page_size << ctrl->page_size_shift) | (block_size <<CFG_BLK_SIZE_SHIFT );nand_writereg (ctrl, cfg_offs, tmp); }else {
@@ -2390,9 +2453,11 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, tmp =nand_readreg (ctrl, acc_control_offs); tmp &= ~brcmnand_ecc_level_mask (ctrl); - tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; tmp &= ~brcmnand_spare_area_mask (ctrl); - tmp |= cfg->spare_area_size; +if (ctrl->nand_version >=0x0302 ) { + tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; + tmp |= cfg->spare_area_size; + }nand_writereg (ctrl, acc_control_offs, tmp);brcmnand_set_sector_size_1k (host, cfg->sector_size_1k);
@@ -2766,6 +2831,8 @@ const struct dev_pm_ops brcmnand_pm_ops = {EXPORT_SYMBOL_GPL (brcmnand_pm_ops);static const struct of_device_id brcmnand_of_match[] = { + { .compatible ="brcm,brcmnand-v2.1" }, + { .compatible ="brcm,brcmnand-v2.2" }, { .compatible ="brcm,brcmnand-v4.0" }, { .compatible ="brcm,brcmnand-v5.0" }, { .compatible ="brcm,brcmnand-v6.0" },
Signature · 1 line
2.26.2
Miquel Raynal
maintainerRe: [PATCH v3 5/5] nand: brcmnand: support v2.1-v2.2 controllers
Hi Álvaro,
Álvaro Fernández Rojas <[email protected]> wrote on Fri, 22 May 2020 09:25:25 +0200:
Quoted 6 lines
v2.1: tested on Netgear DGND3700v1 (BCM6368)
v2.2: tested on Netgear DGND3700v2 (BCM6362)Signed-off-by Álvaro Fernández Rojas <[email protected]>---
v3: fix page size shift for v2.1 controllers.
You changed the subject title too which is not accurate anymore, any reason to do that? Anything else changed in this series that I am not aware of?
Quoted 183 lines
v2: split page sizes rename into a different patch.
name all block and page sizes versions.drivers/mtd/nand/raw/brcmnand/brcmnand.c | 85 +++++++++++++++++++++--- 1 file changed, 76 insertions(+), 9 deletions(-)drivers/mtd/nand/raw/brcmnand/brcmnand.c +76
-9@@ -264,6 +264,7 @@ struct brcmnand_controller {const unsigned int *block_sizes;unsigned int max_page_size;const unsigned int *page_sizes; +unsigned int page_size_shift;unsigned int max_oob;u32 features;@@ -338,6 +339,36 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; +/* BRCMNAND v2.1-v2.2 */ +static const u16 brcmnand_regs_v21[] = { + [BRCMNAND_CMD_START ] =0x04 , + [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , + [BRCMNAND_CMD_ADDRESS ] =0x0c , + [BRCMNAND_INTFC_STATUS ] =0x5c , + [BRCMNAND_CS_SELECT ] =0x14 , + [BRCMNAND_CS_XOR ] =0x18 , + [BRCMNAND_LL_OP ] =0 , + [BRCMNAND_CS0_BASE ] =0x40 , + [BRCMNAND_CS1_BASE ] =0 , + [BRCMNAND_CORR_THRESHOLD ] =0 , + [BRCMNAND_CORR_THRESHOLD_EXT ] =0 , + [BRCMNAND_UNCORR_COUNT ] =0 , + [BRCMNAND_CORR_COUNT ] =0 , + [BRCMNAND_CORR_EXT_ADDR ] =0x60 , + [BRCMNAND_CORR_ADDR ] =0x64 , + [BRCMNAND_UNCORR_EXT_ADDR ] =0x68 , + [BRCMNAND_UNCORR_ADDR ] =0x6c , + [BRCMNAND_SEMAPHORE ] =0x50 , + [BRCMNAND_ID ] =0x54 , + [BRCMNAND_ID_EXT ] =0 , + [BRCMNAND_LL_RDATA ] =0 , + [BRCMNAND_OOB_READ_BASE ] =0x20 , + [BRCMNAND_OOB_READ_10_BASE ] =0 , + [BRCMNAND_OOB_WRITE_BASE ] =0x30 , + [BRCMNAND_OOB_WRITE_10_BASE ] =0 , + [BRCMNAND_FC_BASE ] =0x200 , +}; +/* BRCMNAND v3.3-v4.0 */ static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 ,@@ -536,6 +567,9 @@ enum {CFG_BUS_WIDTH =BIT (CFG_BUS_WIDTH_SHIFT ),CFG_DEVICE_SIZE_SHIFT =24 , +/* Only for v2.1 */ + CFG_PAGE_SIZE_SHIFT_v2_1 =30 , +/* Only for pre-v7.1 (with no CFG_EXT register) */ CFG_PAGE_SIZE_SHIFT =20 , CFG_BLK_SIZE_SHIFT = 28,@@ -571,12 +605,16 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; +static const unsigned int block_sizes_v2_2[] = {16 ,128 ,8 ,512 ,256 ,0 }; +static const unsigned int block_sizes_v2_1[] = {16 ,128 ,8 ,512 ,0 };static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v2_2[] = {512 ,2048 ,4096 ,0 }; +static const unsigned int page_sizes_v2_1[] = {512 ,2048 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ; -/* Only support v4.0+? */ -if (ctrl->nand_version <0x0400 ) { +/* Only support v2.1+ */ +if (ctrl->nand_version <0x0201 ) {dev_err (ctrl->dev,"version %#x not supported\n" , ctrl->nand_version);return -ENODEV ;@@ -593,6 +631,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v50; else if (ctrl->nand_version >= 0x0303) ctrl->reg_offsets = brcmnand_regs_v33; + else if (ctrl->nand_version >= 0x0201) + ctrl->reg_offsets = brcmnand_regs_v21;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )@@ -618,14 +658,32 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes_v3_4; +if (ctrl->nand_version >=0x0304 ) + ctrl->page_sizes = page_sizes_v3_4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->page_sizes = page_sizes_v2_2; +else + ctrl->page_sizes = page_sizes_v2_1; + +if (ctrl->nand_version >=0x0202 ) + ctrl->page_size_shift =CFG_PAGE_SIZE_SHIFT ; +else + ctrl->page_size_shift = CFG_PAGE_SIZE_SHIFT_v2_1; +if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6; -else +else if (ctrl->nand_version >=0x0400 ) ctrl->block_sizes = block_sizes_v4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->block_sizes = block_sizes_v2_2; +else + ctrl->block_sizes = block_sizes_v2_1;if (ctrl->nand_version <0x0400 ) { - ctrl->max_page_size =4096 ; +if (ctrl->nand_version <0x0202 ) + ctrl->max_page_size =2048 ; +else + ctrl->max_page_size =4096 ; ctrl->max_block_size =512 *1024 ; } }@@ -811,6 +869,9 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)enum brcmnand_reg reg =BRCMNAND_CORR_THRESHOLD ;int cs = host->cs; +if (!ctrl->reg_offsets[reg]) +return ; +if (ctrl->nand_version ==0x0702 ) bits =7 ;else if (ctrl->nand_version >=0x0600 )@@ -869,8 +930,10 @@ static inline u32 brcmnand_spare_area_mask(struct brcmnand_controller *ctrl)return GENMASK (7 ,0 ); else if (ctrl->nand_version >= 0x0600) return GENMASK(6, 0); - else + else if (ctrl->nand_version >= 0x0303) return GENMASK(5, 0); + else + return GENMASK(4, 0); }#define NAND_ACC_CONTROL_ECC_SHIFT 16@@ -2378,7 +2441,7 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, (!!(cfg->device_width ==16 ) <<CFG_BUS_WIDTH_SHIFT ) | (device_size <<CFG_DEVICE_SIZE_SHIFT );if (cfg_offs == cfg_ext_offs) { - tmp |= (page_size <<CFG_PAGE_SIZE_SHIFT ) | + tmp |= (page_size << ctrl->page_size_shift) | (block_size <<CFG_BLK_SIZE_SHIFT );nand_writereg (ctrl, cfg_offs, tmp); }else {@@ -2390,9 +2453,11 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, tmp =nand_readreg (ctrl, acc_control_offs); tmp &= ~brcmnand_ecc_level_mask (ctrl); - tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; tmp &= ~brcmnand_spare_area_mask (ctrl); - tmp |= cfg->spare_area_size; +if (ctrl->nand_version >=0x0302 ) { + tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; + tmp |= cfg->spare_area_size; + }nand_writereg (ctrl, acc_control_offs, tmp);brcmnand_set_sector_size_1k (host, cfg->sector_size_1k);@@ -2766,6 +2831,8 @@ const struct dev_pm_ops brcmnand_pm_ops = {EXPORT_SYMBOL_GPL (brcmnand_pm_ops);static const struct of_device_id brcmnand_of_match[] = { + { .compatible ="brcm,brcmnand-v2.1" }, + { .compatible ="brcm,brcmnand-v2.2" }, { .compatible ="brcm,brcmnand-v4.0" }, { .compatible ="brcm,brcmnand-v5.0" }, { .compatible ="brcm,brcmnand-v6.0" },
Re: [PATCH v3 5/5] nand: brcmnand: support v2.1-v2.2 controllers
Hello Miquel,
No, nothing else changed.
I will change it again with the proper subject, sorry for that.
Best regards,
Álvaro.
Quoted 3 lines · Miquel Raynal
Quoted 2 lines
v2.1: tested on Netgear DGND3700v1 (BCM6368)
v4 cover mtd: rawnand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández RojasAdd support for v2.1 and v2.2 NAND controllers.
v4: fix commit subject.
v3: fix v2.1 page size shift
v2: introduce changes suggested by Miquèl.
Álvaro Fernández Rojas (5):
mtd: rawnand: brcmnand: rename v4 registers
mtd: rawnand: brcmnand: fix CS0 layout
mtd: rawnand: brcmnand: rename page sizes
dt: bindings: brcmnand: add v2.1 and v2.2 support
nand: brcmnand: support v2.1-v2.2 controllers
.../devicetree/bindings/mtd/brcm,brcmnand.txt | 2 + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 100 +++++++++++++++--- 2 files changed, 86 insertions(+), 16 deletions(-)
Signature · 1 line
2.26.2
PATCH v4 1/5 mtd: rawnand: brcmnand: rename v4 registers
These registers are also used on v3.3.
---
v4: no changes.
v3: no changes.
v2: fix commit title.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +4 -4
@@ -338,8 +338,8 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; -/* BRCMNAND v4.0 */ -static const u16 brcmnand_regs_v40[] = { +/* BRCMNAND v3.3-v4.0 */ +static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 , [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , [BRCMNAND_CMD_ADDRESS ] =0x0c ,
@@ -591,8 +591,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v60; else if (ctrl->nand_version >= 0x0500) ctrl->reg_offsets = brcmnand_regs_v50; - else if (ctrl->nand_version >= 0x0400) - ctrl->reg_offsets = brcmnand_regs_v40; + else if (ctrl->nand_version >= 0x0303) + ctrl->reg_offsets = brcmnand_regs_v33;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
Signature · 1 line
2.26.2
Re: [PATCH v4 1/5] mtd: rawnand: brcmnand: rename v4 registers
Quoted 4 lines · Álvaro Fernández Rojas
These registers are also used on v3.3.
Signed-off-by Álvaro Fernández Rojas <[email protected]>Reviewed-by Miquel Raynal <[email protected]>
Signature · 1 line
Florian
Re: [PATCH v4 1/5] mtd: rawnand: brcmnand: rename v4 registers
In reply to Álvaro Fernández RojasQuoted 5 lines · On Fri, 2020-05-22 at 12:15:20 UTC, =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?…
These registers are also used on v3.3.
Signed-off-by Álvaro Fernández Rojas <[email protected]>Reviewed-by Miquel Raynal <[email protected]>Acked-by Florian Fainelli <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
PATCH v4 2/5 mtd: rawnand: brcmnand: fix CS0 layout
In reply to Álvaro Fernández RojasOnly v3.3-v5.0 have a different CS0 layout. Controllers before v3.3 use the same layout for every CS.
---
v4: no changes.
v3: no changes.
v2: fix commit log.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +3 -2
@@ -606,8 +606,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) }else { ctrl->cs_offsets = brcmnand_cs_offsets; -/* v5.0 and earlier has a different CS0 offset layout */ -if (ctrl->nand_version <=0x0500 ) +/* v3.3-5.0 have a different CS0 offset layout */ +if (ctrl->nand_version >=0x0303 && + ctrl->nand_version <=0x0500 ) ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; }
Signature · 1 line
2.26.2
Re: [PATCH v4 2/5] mtd: rawnand: brcmnand: fix CS0 layout
Quoted 5 lines · Álvaro Fernández Rojas
Only v3.3-v5.0 have a different CS0 layout. Controllers before v3.3 use the same layout for every CS.
Fixes 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller")Signed-off-by Álvaro Fernández Rojas <[email protected]>
Signature · 1 line
Florian
Re: [PATCH v4 2/5] mtd: rawnand: brcmnand: fix CS0 layout
In reply to Álvaro Fernández RojasQuoted 6 lines · On Fri, 2020-05-22 at 12:15:21 UTC, =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?…
Only v3.3-v5.0 have a different CS0 layout. Controllers before v3.3 use the same layout for every CS.
Fixes 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller")Signed-off-by Álvaro Fernández Rojas <[email protected]>Acked-by Florian Fainelli <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
PATCH v4 3/5 mtd: rawnand: brcmnand: rename page sizes
In reply to Álvaro Fernández RojasCurrent pages sizes apply to controllers after v3.4
---
v4: no changes.
v3: no changes.
v2: add new patch.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +2 -2
@@ -571,7 +571,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; -static const unsigned int page_sizes[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ;
@@ -618,7 +618,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes; + ctrl->page_sizes = page_sizes_v3_4;if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6;else
Signature · 1 line
2.26.2
Re: [PATCH v4 3/5] mtd: rawnand: brcmnand: rename page sizes
Quoted 3 lines · Álvaro Fernández Rojas
Current pages sizes apply to controllers after v3.4
Signed-off-by Álvaro Fernández Rojas <[email protected]>
Signature · 1 line
Florian
Re: [PATCH v4 3/5] mtd: rawnand: brcmnand: rename page sizes
In reply to Álvaro Fernández RojasQuoted 4 lines · On Fri, 2020-05-22 at 12:15:22 UTC, =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?…
Current pages sizes apply to controllers after v3.4
Signed-off-by Álvaro Fernández Rojas <[email protected]>Acked-by Florian Fainelli <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
PATCH v4 4/5 dt: bindings: brcmnand: add v2.1 and v2.2 support
In reply to Álvaro Fernández RojasAdded brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2.
---
v4: no changes.
v3: no changes.
v2: add new patch.
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +2 -0
@@ -20,6 +20,8 @@ Required properties: "brcm,brcmnand" and an appropriate version compatibility string, like "brcm,brcmnand-v7.0" Possible values: + brcm,brcmnand-v2.1 + brcm,brcmnand-v2.2 brcm,brcmnand-v4.0 brcm,brcmnand-v5.0 brcm,brcmnand-v6.0
Signature · 1 line
2.26.2
Re: [PATCH v4 4/5] dt: bindings: brcmnand: add v2.1 and v2.2 support
Quoted 4 lines · Álvaro Fernández Rojas
Added brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2.
Signed-off-by Álvaro Fernández Rojas <[email protected]>
--
Florian
Re: [PATCH v4 4/5] dt: bindings: brcmnand: add v2.1 and v2.2 support
In reply to Álvaro Fernández RojasQuoted 5 lines · On Fri, 2020-05-22 at 12:15:23 UTC, =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?…
Added brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2.
Signed-off-by Álvaro Fernández Rojas <[email protected]>Acked-by Florian Fainelli <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel
Miquel Raynal
maintainerRe: [PATCH v4 4/5] dt: bindings: brcmnand: add v2.1 and v2.2 support
Miquel Raynal <[email protected]> wrote on Sun, 24 May 2020 21:25:50 +0200:
Quoted 8 lines · On Fri, 2020-05-22 at 12:15:23 UTC, =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?…
Quoted 5 lines
Added brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2.
Signed-off-by Álvaro Fernández Rojas <[email protected]>Acked-by Florian Fainelli <[email protected]>Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
FYI I updated the commit log:
s/dt: bindings:/dt-bindings: mtd:/
s/Added/Add/
Thanks,
Miquèl
Re: [PATCH v4 4/5] dt: bindings: brcmnand: add v2.1 and v2.2 support
Thanks for merging the patches :).
BTW, is there something wrong with patch 5?
I can see patches 1-4 applied in https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git/log/?h=nand/next, but I can’t see patch 5.
Best regards,
Álvaro.
________________________________
De: Miquel Raynal <[email protected]>
Enviado: Sunday, May 24, 2020 9:27:40 PM
Para: Álvaro Fernández Rojas <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>; [email protected] <[email protected]>
Asunto: Re: [PATCH v4 4/5] dt: bindings: brcmnand: add v2.1 and v2.2 support
Miquel Raynal <[email protected]> wrote on Sun, 24 May 2020 21:25:50 +0200:
Quoted 8 lines · On Fri, 2020-05-22 at 12:15:23 UTC, =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?…
Quoted 5 lines
Added brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2.
Signed-off-by Álvaro Fernández Rojas <[email protected]>Acked-by Florian Fainelli <[email protected]>Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
FYI I updated the commit log:
s/dt: bindings:/dt-bindings: mtd:/
s/Added/Add/
Thanks,
Miquèl
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Miquel Raynal
maintainerRe: [PATCH v4 4/5] dt: bindings: brcmnand: add v2.1 and v2.2 support
Álvaro Fernández Rojas <[email protected]> wrote on Sun, 24 May 2020 21:13:41 +0000:
Quoted 5 lines
Thanks for merging the patches :).
BTW, is there something wrong with patch 5?
I can see patches 1-4 applied in https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git/log/?h=nand/next, but I can’t see patch 5.
Done :)
PATCH v4 5/5 mtd: rawnand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández Rojasv2.1: tested on Netgear DGND3700v1 (BCM6368)
v2.2: tested on Netgear DGND3700v2 (BCM6362)
---
v4: use proper commit subject.
v3: fix page size shift for v2.1 controllers.
v2: split page sizes rename into a different patch.
name all block and page sizes versions.
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 85 +++++++++++++++++++++--- 1 file changed, 76 insertions(+), 9 deletions(-)
drivers/mtd/nand/raw/brcmnand/brcmnand.c +76 -9
@@ -264,6 +264,7 @@ struct brcmnand_controller {const unsigned int *block_sizes;unsigned int max_page_size;const unsigned int *page_sizes; +unsigned int page_size_shift;unsigned int max_oob;u32 features;
@@ -338,6 +339,36 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; +/* BRCMNAND v2.1-v2.2 */ +static const u16 brcmnand_regs_v21[] = { + [BRCMNAND_CMD_START ] =0x04 , + [BRCMNAND_CMD_EXT_ADDRESS ] =0x08 , + [BRCMNAND_CMD_ADDRESS ] =0x0c , + [BRCMNAND_INTFC_STATUS ] =0x5c , + [BRCMNAND_CS_SELECT ] =0x14 , + [BRCMNAND_CS_XOR ] =0x18 , + [BRCMNAND_LL_OP ] =0 , + [BRCMNAND_CS0_BASE ] =0x40 , + [BRCMNAND_CS1_BASE ] =0 , + [BRCMNAND_CORR_THRESHOLD ] =0 , + [BRCMNAND_CORR_THRESHOLD_EXT ] =0 , + [BRCMNAND_UNCORR_COUNT ] =0 , + [BRCMNAND_CORR_COUNT ] =0 , + [BRCMNAND_CORR_EXT_ADDR ] =0x60 , + [BRCMNAND_CORR_ADDR ] =0x64 , + [BRCMNAND_UNCORR_EXT_ADDR ] =0x68 , + [BRCMNAND_UNCORR_ADDR ] =0x6c , + [BRCMNAND_SEMAPHORE ] =0x50 , + [BRCMNAND_ID ] =0x54 , + [BRCMNAND_ID_EXT ] =0 , + [BRCMNAND_LL_RDATA ] =0 , + [BRCMNAND_OOB_READ_BASE ] =0x20 , + [BRCMNAND_OOB_READ_10_BASE ] =0 , + [BRCMNAND_OOB_WRITE_BASE ] =0x30 , + [BRCMNAND_OOB_WRITE_10_BASE ] =0 , + [BRCMNAND_FC_BASE ] =0x200 , +}; +/* BRCMNAND v3.3-v4.0 */ static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START ] =0x04 ,
@@ -536,6 +567,9 @@ enum {CFG_BUS_WIDTH =BIT (CFG_BUS_WIDTH_SHIFT ),CFG_DEVICE_SIZE_SHIFT =24 , +/* Only for v2.1 */ + CFG_PAGE_SIZE_SHIFT_v2_1 =30 , +/* Only for pre-v7.1 (with no CFG_EXT register) */ CFG_PAGE_SIZE_SHIFT =20 , CFG_BLK_SIZE_SHIFT = 28,
@@ -571,12 +605,16 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) {static const unsigned int block_sizes_v6[] = {8 ,16 ,128 ,256 ,512 ,1024 ,2048 ,0 };static const unsigned int block_sizes_v4[] = {16 ,128 ,8 ,512 ,256 ,1024 ,2048 ,0 }; +static const unsigned int block_sizes_v2_2[] = {16 ,128 ,8 ,512 ,256 ,0 }; +static const unsigned int block_sizes_v2_1[] = {16 ,128 ,8 ,512 ,0 };static const unsigned int page_sizes_v3_4[] = {512 ,2048 ,4096 ,8192 ,0 }; +static const unsigned int page_sizes_v2_2[] = {512 ,2048 ,4096 ,0 }; +static const unsigned int page_sizes_v2_1[] = {512 ,2048 ,0 }; ctrl->nand_version =nand_readreg (ctrl,0 ) &0xffff ; -/* Only support v4.0+? */ -if (ctrl->nand_version <0x0400 ) { +/* Only support v2.1+ */ +if (ctrl->nand_version <0x0201 ) {dev_err (ctrl->dev,"version %#x not supported\n" , ctrl->nand_version);return -ENODEV ;
@@ -593,6 +631,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v50; else if (ctrl->nand_version >= 0x0303) ctrl->reg_offsets = brcmnand_regs_v33; + else if (ctrl->nand_version >= 0x0201) + ctrl->reg_offsets = brcmnand_regs_v21;/* Chip-select stride */ if (ctrl->nand_version >=0x0701 )
@@ -618,14 +658,32 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size =16 *1024 ; ctrl->max_block_size =2 *1024 *1024 ; }else { - ctrl->page_sizes = page_sizes_v3_4; +if (ctrl->nand_version >=0x0304 ) + ctrl->page_sizes = page_sizes_v3_4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->page_sizes = page_sizes_v2_2; +else + ctrl->page_sizes = page_sizes_v2_1; + +if (ctrl->nand_version >=0x0202 ) + ctrl->page_size_shift =CFG_PAGE_SIZE_SHIFT ; +else + ctrl->page_size_shift = CFG_PAGE_SIZE_SHIFT_v2_1; +if (ctrl->nand_version >=0x0600 ) ctrl->block_sizes = block_sizes_v6; -else +else if (ctrl->nand_version >=0x0400 ) ctrl->block_sizes = block_sizes_v4; +else if (ctrl->nand_version >=0x0202 ) + ctrl->block_sizes = block_sizes_v2_2; +else + ctrl->block_sizes = block_sizes_v2_1;if (ctrl->nand_version <0x0400 ) { - ctrl->max_page_size =4096 ; +if (ctrl->nand_version <0x0202 ) + ctrl->max_page_size =2048 ; +else + ctrl->max_page_size =4096 ; ctrl->max_block_size =512 *1024 ; } }
@@ -811,6 +869,9 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val)enum brcmnand_reg reg =BRCMNAND_CORR_THRESHOLD ;int cs = host->cs; +if (!ctrl->reg_offsets[reg]) +return ; +if (ctrl->nand_version ==0x0702 ) bits =7 ;else if (ctrl->nand_version >=0x0600 )
@@ -869,8 +930,10 @@ static inline u32 brcmnand_spare_area_mask(struct brcmnand_controller *ctrl)return GENMASK (7 ,0 ); else if (ctrl->nand_version >= 0x0600) return GENMASK(6, 0); - else + else if (ctrl->nand_version >= 0x0303) return GENMASK(5, 0); + else + return GENMASK(4, 0); }#define NAND_ACC_CONTROL_ECC_SHIFT 16
@@ -2378,7 +2441,7 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, (!!(cfg->device_width ==16 ) <<CFG_BUS_WIDTH_SHIFT ) | (device_size <<CFG_DEVICE_SIZE_SHIFT );if (cfg_offs == cfg_ext_offs) { - tmp |= (page_size <<CFG_PAGE_SIZE_SHIFT ) | + tmp |= (page_size << ctrl->page_size_shift) | (block_size <<CFG_BLK_SIZE_SHIFT );nand_writereg (ctrl, cfg_offs, tmp); }else {
@@ -2390,9 +2453,11 @@ static int brcmnand_set_cfg(struct brcmnand_host *host, tmp =nand_readreg (ctrl, acc_control_offs); tmp &= ~brcmnand_ecc_level_mask (ctrl); - tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; tmp &= ~brcmnand_spare_area_mask (ctrl); - tmp |= cfg->spare_area_size; +if (ctrl->nand_version >=0x0302 ) { + tmp |= cfg->ecc_level <<NAND_ACC_CONTROL_ECC_SHIFT ; + tmp |= cfg->spare_area_size; + }nand_writereg (ctrl, acc_control_offs, tmp);brcmnand_set_sector_size_1k (host, cfg->sector_size_1k);
@@ -2766,6 +2831,8 @@ const struct dev_pm_ops brcmnand_pm_ops = {EXPORT_SYMBOL_GPL (brcmnand_pm_ops);static const struct of_device_id brcmnand_of_match[] = { + { .compatible ="brcm,brcmnand-v2.1" }, + { .compatible ="brcm,brcmnand-v2.2" }, { .compatible ="brcm,brcmnand-v4.0" }, { .compatible ="brcm,brcmnand-v5.0" }, { .compatible ="brcm,brcmnand-v6.0" },
Signature · 1 line
2.26.2
Re: [PATCH v4 5/5] mtd: rawnand: brcmnand: support v2.1-v2.2 controllers
Quoted 4 lines · Álvaro Fernández Rojas
v2.1: tested on Netgear DGND3700v1 (BCM6368)
v2.2: tested on Netgear DGND3700v2 (BCM6362)Signed-off-by Álvaro Fernández Rojas <[email protected]>
Signature · 1 line
Florian
Re: [PATCH v4 5/5] mtd: rawnand: brcmnand: support v2.1-v2.2 controllers
In reply to Álvaro Fernández RojasQuoted 5 lines · On Fri, 2020-05-22 at 12:15:24 UTC, =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?…
v2.1: tested on Netgear DGND3700v1 (BCM6368)
v2.2: tested on Netgear DGND3700v2 (BCM6362)Signed-off-by Álvaro Fernández Rojas <[email protected]>Acked-by Florian Fainelli <[email protected]>
Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks.
Miquel