Requesting inclusion of mtd/nand patches in linux-3.14.y

[Mason]

Hello everyone,

This is my second time requesting inclusion of a patch, please
point out any breach of protocol :-)

I have cherry-picked two mtd/nand patches on my local branch
of linux-3.14.y and I realized that these fixes might benefit
other users. (As far as I can tell, they landed in 3.15)

bd9c6e99b582 mtd: nand: don't use read_buf for 8-bit ONFI transfers
60c3bc1fd6f1 mtd: nand: fix erroneous read_buf call in nand_write_page_raw_syndrome


commit 60c3bc1fd6f1fa40b415ef5b83e2948a89a3d79c
Author: Boris BREZILLON <b.brezillon.dev@xxxxxxxxx>
Date:   Sat Feb 1 19:10:28 2014 +0100

    mtd: nand: fix erroneous read_buf call in nand_write_page_raw_syndrome
    
    read_buf is called in place of write_buf in the
    nand_write_page_raw_syndrome function.
    
    Signed-off-by: Boris BREZILLON <b.brezillon.dev@xxxxxxxxx>
    Signed-off-by: Brian Norris <computersforpeace@xxxxxxxxx>

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 79ed8ccf5065..3cb1cefcd926 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2002,7 +2002,7 @@ static int nand_write_page_raw_syndrome(struct mtd_info *mtd,
                        oob += chip->ecc.prepad;
                }
 
-               chip->read_buf(mtd, oob, eccbytes);
+               chip->write_buf(mtd, oob, eccbytes);
                oob += eccbytes;
 
                if (chip->ecc.postpad) {



commit bd9c6e99b58255b9de1982711ac9487c9a2f18be
Author: Brian Norris <computersforpeace@xxxxxxxxx>
Date:   Fri Nov 29 22:04:28 2013 -0800

    mtd: nand: don't use read_buf for 8-bit ONFI transfers
    
    Use a repeated read_byte() instead of read_buf(), since for x16 buswidth
    devices, we need to avoid the upper I/O[16:9] bits. See the following
    commit for reference:
    
    commit 05f7835975dad6b3b517f9e23415985e648fb875
    Author: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
    Date:   Thu Dec 5 22:22:04 2013 +0100
    
        mtd: nand: don't use {read,write}_buf for 8-bit transfers
    
    Now, I think that all barriers to probing ONFI on x16 devices are
    removed, so remove the check from nand_flash_detect_onfi().
    
    Tested on 8-bit ONFI NAND (Micron MT29F32G08CBADAWP).
    
    Signed-off-by: Brian Norris <computersforpeace@xxxxxxxxx>
    Tested-by: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxxxxxxxxxx>
    Tested-By: Pekon Gupta <pekon@xxxxxx>

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 6281151e4cb7..79ed8ccf5065 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -3065,7 +3065,7 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
                                        int *busw)
 {
        struct nand_onfi_params *p = &chip->onfi_params;
-       int i;
+       int i, j;
        int val;
 
        /* Try ONFI for unknown chip or LP */
@@ -3074,18 +3074,10 @@ static int nand_flash_detect_onfi(struct mtd_info *mtd, struct nand_chip *chip,
                chip->read_byte(mtd) != 'F' || chip->read_byte(mtd) != 'I')
                return 0;
 
-       /*
-        * ONFI must be probed in 8-bit mode or with NAND_BUSWIDTH_AUTO, not
-        * with NAND_BUSWIDTH_16
-        */
-       if (chip->options & NAND_BUSWIDTH_16) {
-               pr_err("ONFI cannot be probed in 16-bit mode; aborting\n");
-               return 0;
-       }
-
        chip->cmdfunc(mtd, NAND_CMD_PARAM, 0, -1);
        for (i = 0; i < 3; i++) {
-               chip->read_buf(mtd, (uint8_t *)p, sizeof(*p));
+               for (j = 0; j < sizeof(*p); j++)
+                       ((uint8_t *)p)[j] = chip->read_byte(mtd);
                if (onfi_crc16(ONFI_CRC_BASE, (uint8_t *)p, 254) ==
                                le16_to_cpu(p->crc)) {
                        break;



Regards.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/