Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1594143 > unrolled thread
| Started by | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| First post | 2017-03-07 12:40 +0100 |
| Last post | 2017-03-07 14:10 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] mtd: nand: fix write accessor sanity checks Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-03-07 12:40 +0100
Re: [PATCH] mtd: nand: fix write accessor sanity checks Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-03-07 13:30 +0100
Re: [PATCH] mtd: nand: fix write accessor sanity checks Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-03-07 14:10 +0100
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-03-07 12:40 +0100 |
| Subject | [PATCH] mtd: nand: fix write accessor sanity checks |
| Message-ID | <tilDc-6Sx-11@gated-at.bofh.it> |
If the higher level accessor chip->write_page() is implemented,
ecc->write_page() and ecc->write_page_raw() are not required.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/mtd/nand/nand_base.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index a3c0f47..c32e700 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -4585,11 +4585,12 @@ static bool invalid_ecc_page_accessors(struct nand_chip *chip)
* default helpers are not suitable when the core does not
* send the READ0/PAGEPROG commands.
*/
- return (!ecc->read_page || !ecc->write_page ||
- !ecc->read_page_raw || !ecc->write_page_raw ||
+ return !ecc->read_page || !ecc->read_page_raw ||
(NAND_HAS_SUBPAGE_READ(chip) && !ecc->read_subpage) ||
- (NAND_HAS_SUBPAGE_WRITE(chip) && !ecc->write_subpage &&
- ecc->hwctl && ecc->calculate));
+ (!chip->write_page &&
+ (!ecc->write_page || !ecc->write_page_raw ||
+ (NAND_HAS_SUBPAGE_WRITE(chip) && !ecc->write_subpage &&
+ ecc->hwctl && ecc->calculate)));
}
/**
@@ -4699,8 +4700,9 @@ int nand_scan_tail(struct mtd_info *mtd)
if ((!ecc->calculate || !ecc->correct || !ecc->hwctl) &&
(!ecc->read_page ||
ecc->read_page == nand_read_page_hwecc ||
- !ecc->write_page ||
- ecc->write_page == nand_write_page_hwecc)) {
+ (!chip->write_page &&
+ (!ecc->write_page ||
+ ecc->write_page == nand_write_page_hwecc)))) {
WARN(1, "No ECC functions supplied; hardware ECC not possible\n");
ret = -EINVAL;
goto err_free;
--
2.7.4
[toc] | [next] | [standalone]
| From | Boris Brezillon <boris.brezillon@free-electrons.com> |
|---|---|
| Date | 2017-03-07 13:30 +0100 |
| Message-ID | <timpz-7rg-3@gated-at.bofh.it> |
| In reply to | #1594143 |
On Tue, 7 Mar 2017 20:23:59 +0900
Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> If the higher level accessor chip->write_page() is implemented,
> ecc->write_page() and ecc->write_page_raw() are not required.
I'm about to remove the chip->write_page() hook [1], I hope you're not
planning to use it.
[1]https://patchwork.ozlabs.org/patch/729966/
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> drivers/mtd/nand/nand_base.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index a3c0f47..c32e700 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -4585,11 +4585,12 @@ static bool invalid_ecc_page_accessors(struct nand_chip *chip)
> * default helpers are not suitable when the core does not
> * send the READ0/PAGEPROG commands.
> */
> - return (!ecc->read_page || !ecc->write_page ||
> - !ecc->read_page_raw || !ecc->write_page_raw ||
> + return !ecc->read_page || !ecc->read_page_raw ||
> (NAND_HAS_SUBPAGE_READ(chip) && !ecc->read_subpage) ||
> - (NAND_HAS_SUBPAGE_WRITE(chip) && !ecc->write_subpage &&
> - ecc->hwctl && ecc->calculate));
> + (!chip->write_page &&
> + (!ecc->write_page || !ecc->write_page_raw ||
> + (NAND_HAS_SUBPAGE_WRITE(chip) && !ecc->write_subpage &&
> + ecc->hwctl && ecc->calculate)));
> }
>
> /**
> @@ -4699,8 +4700,9 @@ int nand_scan_tail(struct mtd_info *mtd)
> if ((!ecc->calculate || !ecc->correct || !ecc->hwctl) &&
> (!ecc->read_page ||
> ecc->read_page == nand_read_page_hwecc ||
> - !ecc->write_page ||
> - ecc->write_page == nand_write_page_hwecc)) {
> + (!chip->write_page &&
> + (!ecc->write_page ||
> + ecc->write_page == nand_write_page_hwecc)))) {
> WARN(1, "No ECC functions supplied; hardware ECC not possible\n");
> ret = -EINVAL;
> goto err_free;
[toc] | [prev] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-03-07 14:10 +0100 |
| Message-ID | <tin2h-7Xr-3@gated-at.bofh.it> |
| In reply to | #1594167 |
Hi Boris, 2017-03-07 20:40 GMT+09:00 Boris Brezillon <boris.brezillon@free-electrons.com>: > On Tue, 7 Mar 2017 20:23:59 +0900 > Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > >> If the higher level accessor chip->write_page() is implemented, >> ecc->write_page() and ecc->write_page_raw() are not required. > > I'm about to remove the chip->write_page() hook [1], I hope you're not > planning to use it. > > [1]https://patchwork.ozlabs.org/patch/729966/ > In fact, I was wondering if I should use chip->write_page() for denali.c (then I noticed this broken accessor checks). After all, I decided to not (ab)use chip->write_page(), though. Anyway, it is good that I am sure about this now. Thanks! -- Best Regards Masahiro Yamada
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web