lkml.org 
[lkml]   [2020]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 06/12] mtd: rawnand: stm32_fmc2: use FMC2_TIMEOUT_MS for timeouts
    Date
    This patch removes the constant FMC2_TIMEOUT_US.
    FMC2_TIMEOUT_MS is set to 5 seconds and this constant is used
    each time that we need to wait (except when the timeout value
    is set by the framework)

    Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
    ---
    drivers/mtd/nand/raw/stm32_fmc2_nand.c | 11 +++++------
    1 file changed, 5 insertions(+), 6 deletions(-)

    diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
    index ab53314..f159c39 100644
    --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
    +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
    @@ -37,8 +37,7 @@
    /* Max ECC buffer length */
    #define FMC2_MAX_ECC_BUF_LEN (FMC2_BCHDSRS_LEN * FMC2_MAX_SG)

    -#define FMC2_TIMEOUT_US 1000
    -#define FMC2_TIMEOUT_MS 1000
    +#define FMC2_TIMEOUT_MS 5000

    /* Timings */
    #define FMC2_THIZ 1
    @@ -525,9 +524,9 @@ static int stm32_fmc2_ham_calculate(struct nand_chip *chip, const u8 *data,
    u32 sr, heccr;
    int ret;

    - ret = readl_relaxed_poll_timeout(fmc2->io_base + FMC2_SR,
    - sr, sr & FMC2_SR_NWRF, 10,
    - FMC2_TIMEOUT_MS);
    + ret = readl_relaxed_poll_timeout_atomic(fmc2->io_base + FMC2_SR,
    + sr, sr & FMC2_SR_NWRF, 1,
    + 1000 * FMC2_TIMEOUT_MS);
    if (ret) {
    dev_err(fmc2->dev, "ham timeout\n");
    return ret;
    @@ -1315,7 +1314,7 @@ static int stm32_fmc2_waitrdy(struct nand_chip *chip, unsigned long timeout_ms)
    /* Check if there is no pending requests to the NAND flash */
    if (readl_relaxed_poll_timeout_atomic(fmc2->io_base + FMC2_SR, sr,
    sr & FMC2_SR_NWRF, 1,
    - FMC2_TIMEOUT_US))
    + 1000 * FMC2_TIMEOUT_MS))
    dev_warn(fmc2->dev, "Waitrdy timeout\n");

    /* Wait tWB before R/B# signal is low */
    --
    1.9.1
    \
     
     \ /
      Last update: 2020-04-15 18:01    [W:2.965 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site