mtd: nand: fix write accessor sanity checks

Message ID 1488885839-18470-1-git-send-email-yamada.masahiro@socionext.com
State New
Headers show

Commit Message

Masahiro Yamada March 7, 2017, 11:23 a.m.
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(-)

-- 
2.7.4


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Comments

Boris Brezillon March 7, 2017, 11:40 a.m. | #1
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;



______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Masahiro Yamada March 7, 2017, 1:03 p.m. | #2
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

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Patch hide | download patch | download mbox

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;