| Message ID | trinity-003579bf-615b-47b8-b1a9-f0d37f650f45-1696905960546@3c-app-mailcom-lxa01 |
|---|---|
| State | New |
| Headers | show |
| Series | [1/3] mtd: rawnand: Add destructive operation | expand |
Hi David, dregan@mail.com wrote on Tue, 10 Oct 2023 04:46:00 +0200: For the next iteration, would you mind sending the series with git-send-email or at least handle the fact that patch 2 and 3 should be an answer of patch 1 so that the three mails are kept together? > Erase and program operations need the write protect (wp) pin to be > de-asserted to take effect. Add the concept of destructive > operation and pass the information to exec_op() so controllers know > when they should de-assert this pin without having to decode > the command opcode. Based on changes proposed by Boris Brezillon. > > https://github.com/bbrezillon/linux/commit/e612e1f2c69a33ac5f2c91d13669f0f172d58717 > > Signed-off-by: David Regan <dregan@mail.com> Given that there are almost no changes in this patch the author and first SoB should remain Boris and you should add your SoB after. > > --- > drivers/mtd/nand/raw/nand_base.c | 6 ++++-- > include/linux/mtd/rawnand.h | 9 +++++++++ > 2 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c > index d4b55155aeae..47cc2c35153b 100644 > --- a/drivers/mtd/nand/raw/nand_base.c > +++ b/drivers/mtd/nand/raw/nand_base.c > @@ -1494,7 +1494,8 @@ static int nand_exec_prog_page_op(struct nand_chip *chip, unsigned int page, > NAND_COMMON_TIMING_NS(conf, tWB_max)), > NAND_OP_WAIT_RDY(NAND_COMMON_TIMING_MS(conf, tPROG_max), 0), > }; > - struct nand_operation op = NAND_OPERATION(chip->cur_cs, instrs); > + struct nand_operation op = NAND_DESTRUCTIVE_OPERATION(chip->cur_cs, > + instrs); > int naddrs = nand_fill_column_cycles(chip, addrs, offset_in_page); > > if (naddrs < 0) > @@ -1917,7 +1918,8 @@ int nand_erase_op(struct nand_chip *chip, unsigned int eraseblock) > NAND_OP_WAIT_RDY(NAND_COMMON_TIMING_MS(conf, tBERS_max), > 0), > }; > - struct nand_operation op = NAND_OPERATION(chip->cur_cs, instrs); > + struct nand_operation op = NAND_DESTRUCTIVE_OPERATION(chip->cur_cs, > + instrs); > > if (chip->options & NAND_ROW_ADDR_3) > instrs[1].ctx.addr.naddrs++; > diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h > index 90a141ba2a5a..31aceda8616c 100644 > --- a/include/linux/mtd/rawnand.h > +++ b/include/linux/mtd/rawnand.h > @@ -1008,6 +1008,7 @@ struct nand_op_parser { > */ > struct nand_operation { > unsigned int cs; > + bool deassert_wp; > const struct nand_op_instr *instrs; > unsigned int ninstrs; > }; > @@ -1019,6 +1020,14 @@ struct nand_operation { > .ninstrs = ARRAY_SIZE(_instrs), \ > } > > +#define NAND_DESTRUCTIVE_OPERATION(_cs, _instrs) \ > + { \ > + .cs = _cs, \ > + .deassert_wp = true, \ > + .instrs = _instrs, \ > + .ninstrs = ARRAY_SIZE(_instrs), \ > + } > + > int nand_op_parser_exec_op(struct nand_chip *chip, > const struct nand_op_parser *parser, > const struct nand_operation *op, bool check_only); > -- > 2.37.3 > > Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c index d4b55155aeae..47cc2c35153b 100644 --- a/drivers/mtd/nand/raw/nand_base.c +++ b/drivers/mtd/nand/raw/nand_base.c @@ -1494,7 +1494,8 @@ static int nand_exec_prog_page_op(struct nand_chip *chip, unsigned int page, NAND_COMMON_TIMING_NS(conf, tWB_max)), NAND_OP_WAIT_RDY(NAND_COMMON_TIMING_MS(conf, tPROG_max), 0), }; - struct nand_operation op = NAND_OPERATION(chip->cur_cs, instrs); + struct nand_operation op = NAND_DESTRUCTIVE_OPERATION(chip->cur_cs, + instrs); int naddrs = nand_fill_column_cycles(chip, addrs, offset_in_page); if (naddrs < 0) @@ -1917,7 +1918,8 @@ int nand_erase_op(struct nand_chip *chip, unsigned int eraseblock) NAND_OP_WAIT_RDY(NAND_COMMON_TIMING_MS(conf, tBERS_max), 0), }; - struct nand_operation op = NAND_OPERATION(chip->cur_cs, instrs); + struct nand_operation op = NAND_DESTRUCTIVE_OPERATION(chip->cur_cs, + instrs); if (chip->options & NAND_ROW_ADDR_3) instrs[1].ctx.addr.naddrs++; diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index 90a141ba2a5a..31aceda8616c 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -1008,6 +1008,7 @@ struct nand_op_parser { */ struct nand_operation { unsigned int cs; + bool deassert_wp; const struct nand_op_instr *instrs; unsigned int ninstrs; }; @@ -1019,6 +1020,14 @@ struct nand_operation { .ninstrs = ARRAY_SIZE(_instrs), \ } +#define NAND_DESTRUCTIVE_OPERATION(_cs, _instrs) \ + { \ + .cs = _cs, \ + .deassert_wp = true, \ + .instrs = _instrs, \ + .ninstrs = ARRAY_SIZE(_instrs), \ + } + int nand_op_parser_exec_op(struct nand_chip *chip, const struct nand_op_parser *parser, const struct nand_operation *op, bool check_only);
Erase and program operations need the write protect (wp) pin to be de-asserted to take effect. Add the concept of destructive operation and pass the information to exec_op() so controllers know when they should de-assert this pin without having to decode the command opcode. Based on changes proposed by Boris Brezillon. https://github.com/bbrezillon/linux/commit/e612e1f2c69a33ac5f2c91d13669f0f172d58717 Signed-off-by: David Regan <dregan@mail.com> --- drivers/mtd/nand/raw/nand_base.c | 6 ++++-- include/linux/mtd/rawnand.h | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) -- 2.37.3