* [PATCH] mtd: rawnand: hynix: Use ->exec_op() in hynix_nand_reg_write_op()
@ 2018-07-04 14:08 Boris Brezillon
2018-07-04 14:18 ` Miquel Raynal
2018-07-09 7:41 ` Miquel Raynal
0 siblings, 2 replies; 3+ messages in thread
From: Boris Brezillon @ 2018-07-04 14:08 UTC (permalink / raw)
To: Boris Brezillon, Richard Weinberger, Miquel Raynal, linux-mtd
Cc: David Woodhouse, Brian Norris, Marek Vasut, stable
Modern NAND controller drivers implement ->exec_op() instead of
->cmdfunc(), make sure we don't end up with a NULL pointer dereference
when hynix_nand_reg_write_op() is called.
Fixes: 8878b126df76 ("mtd: nand: add ->exec_op() implementation")
Cc: <stable@vger.kernel.org>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
---
drivers/mtd/nand/raw/nand_hynix.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c
index 8cbe77f447c7..4ffbb26e76d6 100644
--- a/drivers/mtd/nand/raw/nand_hynix.c
+++ b/drivers/mtd/nand/raw/nand_hynix.c
@@ -100,6 +100,16 @@ static int hynix_nand_reg_write_op(struct nand_chip *chip, u8 addr, u8 val)
struct mtd_info *mtd = nand_to_mtd(chip);
u16 column = ((u16)addr << 8) | addr;
+ if (chip->exec_op) {
+ struct nand_op_instr instrs[] = {
+ NAND_OP_ADDR(1, &addr, 0),
+ NAND_OP_8BIT_DATA_OUT(1, &val, 0),
+ };
+ struct nand_operation op = NAND_OPERATION(instrs);
+
+ return nand_exec_op(chip, &op);
+ }
+
chip->cmdfunc(mtd, NAND_CMD_NONE, column, -1);
chip->write_byte(mtd, val);
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: rawnand: hynix: Use ->exec_op() in hynix_nand_reg_write_op()
2018-07-04 14:08 [PATCH] mtd: rawnand: hynix: Use ->exec_op() in hynix_nand_reg_write_op() Boris Brezillon
@ 2018-07-04 14:18 ` Miquel Raynal
2018-07-09 7:41 ` Miquel Raynal
1 sibling, 0 replies; 3+ messages in thread
From: Miquel Raynal @ 2018-07-04 14:18 UTC (permalink / raw)
To: Boris Brezillon
Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
Marek Vasut, stable
Hi Boris,
Boris Brezillon <boris.brezillon@bootlin.com> wrote on Wed, 4 Jul 2018
16:08:58 +0200:
> Modern NAND controller drivers implement ->exec_op() instead of
> ->cmdfunc(), make sure we don't end up with a NULL pointer dereference
> when hynix_nand_reg_write_op() is called.
>
> Fixes: 8878b126df76 ("mtd: nand: add ->exec_op() implementation")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] mtd: rawnand: hynix: Use ->exec_op() in hynix_nand_reg_write_op()
2018-07-04 14:08 [PATCH] mtd: rawnand: hynix: Use ->exec_op() in hynix_nand_reg_write_op() Boris Brezillon
2018-07-04 14:18 ` Miquel Raynal
@ 2018-07-09 7:41 ` Miquel Raynal
1 sibling, 0 replies; 3+ messages in thread
From: Miquel Raynal @ 2018-07-09 7:41 UTC (permalink / raw)
To: Boris Brezillon
Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
Marek Vasut, stable
Hi Boris,
Boris Brezillon <boris.brezillon@bootlin.com> wrote on Wed, 4 Jul 2018
16:08:58 +0200:
> Modern NAND controller drivers implement ->exec_op() instead of
> ->cmdfunc(), make sure we don't end up with a NULL pointer dereference
> when hynix_nand_reg_write_op() is called.
>
> Fixes: 8878b126df76 ("mtd: nand: add ->exec_op() implementation")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
> ---
> drivers/mtd/nand/raw/nand_hynix.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/mtd/nand/raw/nand_hynix.c b/drivers/mtd/nand/raw/nand_hynix.c
> index 8cbe77f447c7..4ffbb26e76d6 100644
> --- a/drivers/mtd/nand/raw/nand_hynix.c
> +++ b/drivers/mtd/nand/raw/nand_hynix.c
> @@ -100,6 +100,16 @@ static int hynix_nand_reg_write_op(struct nand_chip *chip, u8 addr, u8 val)
> struct mtd_info *mtd = nand_to_mtd(chip);
> u16 column = ((u16)addr << 8) | addr;
>
> + if (chip->exec_op) {
> + struct nand_op_instr instrs[] = {
> + NAND_OP_ADDR(1, &addr, 0),
> + NAND_OP_8BIT_DATA_OUT(1, &val, 0),
> + };
> + struct nand_operation op = NAND_OPERATION(instrs);
> +
> + return nand_exec_op(chip, &op);
> + }
> +
> chip->cmdfunc(mtd, NAND_CMD_NONE, column, -1);
> chip->write_byte(mtd, val);
>
Applied to nand/next.
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-09 7:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-04 14:08 [PATCH] mtd: rawnand: hynix: Use ->exec_op() in hynix_nand_reg_write_op() Boris Brezillon
2018-07-04 14:18 ` Miquel Raynal
2018-07-09 7:41 ` Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).