lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0022/1039] mtd: rawnand: ingenic: JZ4740 needs oob_first read page function
    Date
    From: Paul Cercueil <paul@crapouillou.net>

    commit 0171480007d64f663aae9226303f1b1e4621229e upstream.

    The ECC engine on the JZ4740 SoC requires the ECC data to be read before
    the page; using the default page reading function does not work. Indeed,
    the old JZ4740 NAND driver (removed in 5.4) did use the 'OOB first' flag
    that existed back then.

    Use the newly created nand_read_page_hwecc_oob_first() to address this
    issue.

    This issue was not found when the new ingenic-nand driver was developed,
    most likely because the Device Tree used had the nand-ecc-mode set to
    "hw_oob_first", which seems to not be supported anymore.

    Cc: <stable@vger.kernel.org> # v5.2
    Fixes: a0ac778eb82c ("mtd: rawnand: ingenic: Add support for the JZ4740")
    Signed-off-by: Paul Cercueil <paul@crapouillou.net>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20211016132228.40254-5-paul@crapouillou.net
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 5 +++++
    1 file changed, 5 insertions(+)

    --- a/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
    +++ b/drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c
    @@ -32,6 +32,7 @@ struct jz_soc_info {
    unsigned long addr_offset;
    unsigned long cmd_offset;
    const struct mtd_ooblayout_ops *oob_layout;
    + bool oob_first;
    };

    struct ingenic_nand_cs {
    @@ -240,6 +241,9 @@ static int ingenic_nand_attach_chip(stru
    if (chip->bbt_options & NAND_BBT_USE_FLASH)
    chip->bbt_options |= NAND_BBT_NO_OOB;

    + if (nfc->soc_info->oob_first)
    + chip->ecc.read_page = nand_read_page_hwecc_oob_first;
    +
    /* For legacy reasons we use a different layout on the qi,lb60 board. */
    if (of_machine_is_compatible("qi,lb60"))
    mtd_set_ooblayout(mtd, &qi_lb60_ooblayout_ops);
    @@ -534,6 +538,7 @@ static const struct jz_soc_info jz4740_s
    .data_offset = 0x00000000,
    .cmd_offset = 0x00008000,
    .addr_offset = 0x00010000,
    + .oob_first = true,
    };

    static const struct jz_soc_info jz4725b_soc_info = {

    \
     
     \ /
      Last update: 2022-01-24 23:11    [W:2.979 / U:1.948 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site