linux-mtd.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Christophe Kerello <christophe.kerello@st.com>
To: <miquel.raynal@bootlin.com>, <richard@nod.at>, <vigneshr@ti.com>,
	<lee.jones@linaro.org>, <robh+dt@kernel.org>,
	<mark.rutland@arm.com>, <tony@atomide.com>
Cc: marex@denx.de, Christophe Kerello <christophe.kerello@st.com>,
	linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
	linux-stm32@st-md-mailman.stormreply.com
Subject: [06/12] mtd: rawnand: stm32_fmc2: use FMC2_TIMEOUT_MS for timeouts
Date: Mon, 23 Mar 2020 15:58:46 +0100	[thread overview]
Message-ID: <1584975532-8038-7-git-send-email-christophe.kerello@st.com> (raw)
In-Reply-To: <1584975532-8038-1-git-send-email-christophe.kerello@st.com>

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


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

  parent reply	other threads:[~2020-03-23 15:01 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-23 14:58 [00/12] add STM32 FMC2 controller drivers Christophe Kerello
2020-03-23 14:58 ` [01/12] dt-bindings: mfd: stm32-fmc2: add STM32 FMC2 controller documentation Christophe Kerello
2020-03-23 14:58 ` [02/12] mfd: stm32-fmc2: add STM32 FMC2 controller driver Christophe Kerello
2020-03-29 23:36   ` Marek Vasut
2020-03-30  9:18     ` Christophe Kerello
2020-03-23 14:58 ` [03/12] bus: stm32-fmc2-ebi: add STM32 FMC2 EBI " Christophe Kerello
2020-03-30  1:24   ` Marek Vasut
2020-03-30  9:19     ` Christophe Kerello
2020-03-30  9:30       ` Marek Vasut
2020-03-23 14:58 ` [04/12] mtd: rawnand: stm32_fmc2: manage all errors cases at probe time Christophe Kerello
2020-03-23 14:58 ` [05/12] mtd: rawnand: stm32_fmc2: remove useless inline comments Christophe Kerello
2020-03-23 14:58 ` Christophe Kerello [this message]
2020-03-23 14:58 ` [07/12] mtd: rawnand: stm32_fmc2: cleanup Christophe Kerello
2020-03-23 14:58 ` [08/12] mtd: rawnand: stm32_fmc2: use FIELD_PREP/FIELD_GET macros Christophe Kerello
2020-03-23 14:58 ` [09/12] mtd: rawnand: stm32_fmc2: move all registers Christophe Kerello
2020-03-23 14:58 ` [10/12] mtd: rawnand: stm32_fmc2: use regmap APIs Christophe Kerello
2020-03-24  0:44   ` Marek Vasut
2020-03-24 10:38     ` Christophe Kerello
2020-03-23 14:58 ` [11/12] mtd: rawnand: stm32_fmc2: use stm32_fmc2 structure in nfc controller Christophe Kerello
2020-03-23 14:58 ` [12/12] mtd: rawnand: stm32_fmc2: add new MP1 compatible string Christophe Kerello
2020-03-24  0:37 ` [00/12] add STM32 FMC2 controller drivers Marek Vasut
2020-03-24  7:36   ` Christophe Kerello
2020-03-24 13:27     ` Marek Vasut
2020-03-24 13:37       ` Christophe Kerello

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1584975532-8038-7-git-send-email-christophe.kerello@st.com \
    --to=christophe.kerello@st.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mtd@lists.infradead.org \
    --cc=linux-stm32@st-md-mailman.stormreply.com \
    --cc=marex@denx.de \
    --cc=mark.rutland@arm.com \
    --cc=miquel.raynal@bootlin.com \
    --cc=richard@nod.at \
    --cc=robh+dt@kernel.org \
    --cc=tony@atomide.com \
    --cc=vigneshr@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).