lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 830/849] mtd: rawnand: gpio: Keep the driver compatible with on-die ECC engines
    Date
    From: Miquel Raynal <miquel.raynal@bootlin.com>

    commit b5b5b4dc6fcd8194b9dd38c8acdc5ab71adf44f8 upstream.

    Following the introduction of the generic ECC engine infrastructure, it
    was necessary to reorganize the code and move the ECC configuration in
    the ->attach_chip() hook. Failing to do that properly lead to a first
    series of fixes supposed to stabilize the situation. Unfortunately, this
    only fixed the use of software ECC engines, preventing any other kind of
    engine to be used, including on-die ones.

    It is now time to (finally) fix the situation by ensuring that we still
    provide a default (eg. software ECC) but will still support different
    ECC engines such as on-die ECC engines if properly described in the
    device tree.

    There are no changes needed on the core side in order to do this, but we
    just need to leverage the logic there which allows:
    1- a subsystem default (set to Host engines in the raw NAND world)
    2- a driver specific default (here set to software ECC engines)
    3- any type of engine requested by the user (ie. described in the DT)

    As the raw NAND subsystem has not yet been fully converted to the ECC
    engine infrastructure, in order to provide a default ECC engine for this
    driver we need to set chip->ecc.engine_type *before* calling
    nand_scan(). During the initialization step, the core will consider this
    entry as the default engine for this driver. This value may of course
    be overloaded by the user if the usual DT properties are provided.

    Fixes: f6341f6448e0 ("mtd: rawnand: gpio: Move the ECC initialization to ->attach_chip()")
    Cc: stable@vger.kernel.org
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20210928222258.199726-4-miquel.raynal@bootlin.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/mtd/nand/raw/gpio.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    --- a/drivers/mtd/nand/raw/gpio.c
    +++ b/drivers/mtd/nand/raw/gpio.c
    @@ -163,9 +163,8 @@ static int gpio_nand_exec_op(struct nand

    static int gpio_nand_attach_chip(struct nand_chip *chip)
    {
    - chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
    -
    - if (chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
    + if (chip->ecc.engine_type == NAND_ECC_ENGINE_TYPE_SOFT &&
    + chip->ecc.algo == NAND_ECC_ALGO_UNKNOWN)
    chip->ecc.algo = NAND_ECC_ALGO_HAMMING;

    return 0;
    @@ -365,6 +364,13 @@ static int gpio_nand_probe(struct platfo
    if (gpiomtd->nwp && !IS_ERR(gpiomtd->nwp))
    gpiod_direction_output(gpiomtd->nwp, 1);

    + /*
    + * This driver assumes that the default ECC engine should be TYPE_SOFT.
    + * Set ->engine_type before registering the NAND devices in order to
    + * provide a driver specific default value.
    + */
    + chip->ecc.engine_type = NAND_ECC_ENGINE_TYPE_SOFT;
    +
    ret = nand_scan(chip, 1);
    if (ret)
    goto err_wp;

    \
     
     \ /
      Last update: 2021-11-16 00:40    [W:2.599 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site