* [PATCH] mtd: rawnand: marvell: Ensure the ND_RUN bit is reset
@ 2019-04-07 19:34 Miquel Raynal
2019-04-08 8:07 ` Boris Brezillon
0 siblings, 1 reply; 3+ messages in thread
From: Miquel Raynal @ 2019-04-07 19:34 UTC (permalink / raw)
To: Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut,
Tudor Ambarus, Vignesh Raghavendra, linux-mtd
Cc: stable, Daniel Mack, Miquel Raynal
Since the migration of the driver to stop using the legacy
->select_chip() hook, there is nothing deselecting the target anymore,
thus the selection is not forced at the next access. Ensure the ND_RUN
bit is always in a clean state.
Cc: Daniel Mack <daniel@zonque.org>
Cc: stable@vger.kernel.org
Fixes: b25251414f6e00 ("mtd: rawnand: marvell: Stop implementing ->select_chip()")
Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
Hi Daniel, could you please test this version of the fix?
Thanks,
Miquèl
drivers/mtd/nand/raw/marvell_nand.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
index f38e5c1b87e4..a7d7f17d8682 100644
--- a/drivers/mtd/nand/raw/marvell_nand.c
+++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -722,12 +722,6 @@ static void marvell_nfc_select_target(struct nand_chip *chip,
struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);
u32 ndcr_generic;
- if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
- return;
-
- writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
- writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
-
/*
* Reset the NDCR register to a clean state for this particular chip,
* also clear ND_RUN bit.
@@ -736,6 +730,12 @@ static void marvell_nfc_select_target(struct nand_chip *chip,
NDCR_GENERIC_FIELDS_MASK & ~NDCR_ND_RUN;
writel_relaxed(ndcr_generic | marvell_nand->ndcr, nfc->regs + NDCR);
+ if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
+ return;
+
+ writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
+ writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
+
/* Also reset the interrupt status register */
marvell_nfc_clear_int(nfc, NDCR_ALL_INT);
--
2.19.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mtd: rawnand: marvell: Ensure the ND_RUN bit is reset
2019-04-07 19:34 [PATCH] mtd: rawnand: marvell: Ensure the ND_RUN bit is reset Miquel Raynal
@ 2019-04-08 8:07 ` Boris Brezillon
2019-04-08 8:11 ` Miquel Raynal
0 siblings, 1 reply; 3+ messages in thread
From: Boris Brezillon @ 2019-04-08 8:07 UTC (permalink / raw)
To: Miquel Raynal
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger, stable,
Marek Vasut, linux-mtd, Brian Norris, David Woodhouse,
Daniel Mack
On Sun, 7 Apr 2019 21:34:01 +0200
Miquel Raynal <miquel.raynal@bootlin.com> wrote:
> Since the migration of the driver to stop using the legacy
> ->select_chip() hook, there is nothing deselecting the target anymore,
> thus the selection is not forced at the next access. Ensure the ND_RUN
> bit is always in a clean state.
>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: stable@vger.kernel.org
> Fixes: b25251414f6e00 ("mtd: rawnand: marvell: Stop implementing ->select_chip()")
> Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
>
> Hi Daniel, could you please test this version of the fix?
>
> Thanks,
> Miquèl
>
>
> drivers/mtd/nand/raw/marvell_nand.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
> index f38e5c1b87e4..a7d7f17d8682 100644
> --- a/drivers/mtd/nand/raw/marvell_nand.c
> +++ b/drivers/mtd/nand/raw/marvell_nand.c
> @@ -722,12 +722,6 @@ static void marvell_nfc_select_target(struct nand_chip *chip,
> struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);
> u32 ndcr_generic;
>
> - if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
> - return;
> -
> - writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
> - writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
> -
> /*
> * Reset the NDCR register to a clean state for this particular chip,
> * also clear ND_RUN bit.
> @@ -736,6 +730,12 @@ static void marvell_nfc_select_target(struct nand_chip *chip,
> NDCR_GENERIC_FIELDS_MASK & ~NDCR_ND_RUN;
> writel_relaxed(ndcr_generic | marvell_nand->ndcr, nfc->regs + NDCR);
>
> + if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
> + return;
> +
> + writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
> + writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
> +
> /* Also reset the interrupt status register */
> marvell_nfc_clear_int(nfc, NDCR_ALL_INT);
I think this should also be moved before the
if (chip == nfc->selected_chip &&
die_nr == marvell_nand->selected_die)
check.
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mtd: rawnand: marvell: Ensure the ND_RUN bit is reset
2019-04-08 8:07 ` Boris Brezillon
@ 2019-04-08 8:11 ` Miquel Raynal
0 siblings, 0 replies; 3+ messages in thread
From: Miquel Raynal @ 2019-04-08 8:11 UTC (permalink / raw)
To: Boris Brezillon
Cc: Vignesh Raghavendra, Tudor Ambarus, Richard Weinberger, stable,
Marek Vasut, linux-mtd, Brian Norris, David Woodhouse,
Daniel Mack
Hi Boris,
Boris Brezillon <boris.brezillon@collabora.com> wrote on Mon, 8 Apr
2019 10:07:47 +0200:
> On Sun, 7 Apr 2019 21:34:01 +0200
> Miquel Raynal <miquel.raynal@bootlin.com> wrote:
>
> > Since the migration of the driver to stop using the legacy
> > ->select_chip() hook, there is nothing deselecting the target anymore,
> > thus the selection is not forced at the next access. Ensure the ND_RUN
> > bit is always in a clean state.
> >
> > Cc: Daniel Mack <daniel@zonque.org>
> > Cc: stable@vger.kernel.org
> > Fixes: b25251414f6e00 ("mtd: rawnand: marvell: Stop implementing ->select_chip()")
> > Suggested-by: Boris Brezillon <boris.brezillon@collabora.com>
> > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> > ---
> >
> > Hi Daniel, could you please test this version of the fix?
> >
> > Thanks,
> > Miquèl
> >
> >
> > drivers/mtd/nand/raw/marvell_nand.c | 12 ++++++------
> > 1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c
> > index f38e5c1b87e4..a7d7f17d8682 100644
> > --- a/drivers/mtd/nand/raw/marvell_nand.c
> > +++ b/drivers/mtd/nand/raw/marvell_nand.c
> > @@ -722,12 +722,6 @@ static void marvell_nfc_select_target(struct nand_chip *chip,
> > struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);
> > u32 ndcr_generic;
> >
> > - if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
> > - return;
> > -
> > - writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
> > - writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
> > -
> > /*
> > * Reset the NDCR register to a clean state for this particular chip,
> > * also clear ND_RUN bit.
> > @@ -736,6 +730,12 @@ static void marvell_nfc_select_target(struct nand_chip *chip,
> > NDCR_GENERIC_FIELDS_MASK & ~NDCR_ND_RUN;
> > writel_relaxed(ndcr_generic | marvell_nand->ndcr, nfc->regs + NDCR);
> >
> > + if (chip == nfc->selected_chip && die_nr == marvell_nand->selected_die)
> > + return;
> > +
> > + writel_relaxed(marvell_nand->ndtr0, nfc->regs + NDTR0);
> > + writel_relaxed(marvell_nand->ndtr1, nfc->regs + NDTR1);
> > +
> > /* Also reset the interrupt status register */
> > marvell_nfc_clear_int(nfc, NDCR_ALL_INT);
>
> I think this should also be moved before the
>
> if (chip == nfc->selected_chip &&
> die_nr == marvell_nand->selected_die)
>
> check.
Yes, I think it is not needed, I wanted Daniel to test. But maybe it is
better to ensure interrupts are always cleared anyway. I'll send a v2
then.
Thanks,
Miquèl
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-08 8:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-07 19:34 [PATCH] mtd: rawnand: marvell: Ensure the ND_RUN bit is reset Miquel Raynal
2019-04-08 8:07 ` Boris Brezillon
2019-04-08 8:11 ` 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).