From: Victor Shih <victorshihgli@gmail.com>
To: ulf.hansson@linaro.org, adrian.hunter@intel.com
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
benchuanggli@gmail.com, Lucas.Lai@genesyslogic.com.tw,
HL.Liu@genesyslogic.com.tw, Greg.tu@genesyslogic.com.tw,
dlunev@chromium.org, Victor Shih <victorshihgli@gmail.com>,
Ben Chuang <ben.chuang@genesyslogic.com.tw>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
Victor Shih <victor.shih@genesyslogic.com.tw>
Subject: [PATCH V23 07/16] mmc: sdhci-uhs2: add set_timeout()
Date: Fri, 18 Oct 2024 18:53:24 +0800 [thread overview]
Message-ID: <20241018105333.4569-8-victorshihgli@gmail.com> (raw)
In-Reply-To: <20241018105333.4569-1-victorshihgli@gmail.com>
From: Victor Shih <victor.shih@genesyslogic.com.tw>
This is a UHS-II version of sdhci's set_timeout() operation.
Use sdhci_uhs2_set_timeout() to set and calculate the timeout time.
Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw>
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Victor Shih <victor.shih@genesyslogic.com.tw>
---
Updates in V14:
- Use mmc_card_uhs2() to stead sdhci_uhs2_mode() in the
sdhci_uhs2_set_timeout().
Updates in V13:
- Modify comment message.
Updates in V8:
- Initialization be combined with declaration and realigned
in sdhci_calc_timeout_uhs2().
- Forward declare struct mmc_command in sdhci_uhs2.h.
Updates in V6:
- Use GENMASK() and FIELD_PREP() in some case.
- Use sdhci_uhs2_mode() to simplify code.
- Remove unnecessary functions.
---
drivers/mmc/host/sdhci-uhs2.c | 72 +++++++++++++++++++++++++++++++++++
drivers/mmc/host/sdhci-uhs2.h | 2 +
2 files changed, 74 insertions(+)
diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
index 756e44d84b87..6b249eb8395a 100644
--- a/drivers/mmc/host/sdhci-uhs2.c
+++ b/drivers/mmc/host/sdhci-uhs2.c
@@ -13,6 +13,7 @@
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/iopoll.h>
+#include <linux/bitfield.h>
#include "sdhci.h"
#include "sdhci-uhs2.h"
@@ -135,6 +136,77 @@ void sdhci_uhs2_set_power(struct sdhci_host *host, unsigned char mode, unsigned
}
EXPORT_SYMBOL_GPL(sdhci_uhs2_set_power);
+static u8 sdhci_calc_timeout_uhs2(struct sdhci_host *host, u8 *cmd_res, u8 *dead_lock)
+{
+ /* timeout in us */
+ unsigned int dead_lock_timeout = 1 * 1000 * 1000;
+ unsigned int cmd_res_timeout = 5 * 1000;
+ unsigned int current_timeout;
+ u8 count;
+
+ /*
+ * Figure out needed cycles.
+ * We do this in steps in order to fit inside a 32 bit int.
+ * The first step is the minimum timeout, which will have a
+ * minimum resolution of 6 bits:
+ * (1) 2^13*1000 > 2^22,
+ * (2) host->timeout_clk < 2^16
+ * =>
+ * (1) / (2) > 2^6
+ */
+ count = 0;
+ current_timeout = (1 << 13) * 1000 / host->timeout_clk;
+ while (current_timeout < cmd_res_timeout) {
+ count++;
+ current_timeout <<= 1;
+ if (count >= 0xF)
+ break;
+ }
+
+ if (count >= 0xF) {
+ DBG("%s: Too large timeout 0x%x requested for CMD_RES!\n",
+ mmc_hostname(host->mmc), count);
+ count = 0xE;
+ }
+ *cmd_res = count;
+
+ count = 0;
+ current_timeout = (1 << 13) * 1000 / host->timeout_clk;
+ while (current_timeout < dead_lock_timeout) {
+ count++;
+ current_timeout <<= 1;
+ if (count >= 0xF)
+ break;
+ }
+
+ if (count >= 0xF) {
+ DBG("%s: Too large timeout 0x%x requested for DEADLOCK!\n",
+ mmc_hostname(host->mmc), count);
+ count = 0xE;
+ }
+ *dead_lock = count;
+
+ return count;
+}
+
+static void __sdhci_uhs2_set_timeout(struct sdhci_host *host)
+{
+ u8 cmd_res, dead_lock;
+
+ sdhci_calc_timeout_uhs2(host, &cmd_res, &dead_lock);
+ cmd_res |= FIELD_PREP(SDHCI_UHS2_TIMER_CTRL_DEADLOCK_MASK, dead_lock);
+ sdhci_writeb(host, cmd_res, SDHCI_UHS2_TIMER_CTRL);
+}
+
+void sdhci_uhs2_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
+{
+ __sdhci_set_timeout(host, cmd);
+
+ if (mmc_card_uhs2(host->mmc))
+ __sdhci_uhs2_set_timeout(host);
+}
+EXPORT_SYMBOL_GPL(sdhci_uhs2_set_timeout);
+
/*****************************************************************************\
* *
* Driver init/exit *
diff --git a/drivers/mmc/host/sdhci-uhs2.h b/drivers/mmc/host/sdhci-uhs2.h
index 3efa8dd690bf..9bd3f610cf8c 100644
--- a/drivers/mmc/host/sdhci-uhs2.h
+++ b/drivers/mmc/host/sdhci-uhs2.h
@@ -175,9 +175,11 @@
#define SDHCI_UHS2_VENDOR_PTR 0xE8
struct sdhci_host;
+struct mmc_command;
void sdhci_uhs2_dump_regs(struct sdhci_host *host);
void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask);
void sdhci_uhs2_set_power(struct sdhci_host *host, unsigned char mode, unsigned short vdd);
+void sdhci_uhs2_set_timeout(struct sdhci_host *host, struct mmc_command *cmd);
#endif /* __SDHCI_UHS2_H */
--
2.25.1
next prev parent reply other threads:[~2024-10-18 10:54 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-18 10:53 [PATCH V23 00/16] Add support UHS-II for GL9755 and GL9767 Victor Shih
2024-10-18 10:53 ` [PATCH V23 01/16] mmc: core: Support UHS-II card control and access Victor Shih
2024-10-24 10:47 ` Adrian Hunter
2024-10-24 12:41 ` Ulf Hansson
2024-10-18 10:53 ` [PATCH V23 02/16] mmc: sdhci: add UHS-II related definitions in headers Victor Shih
2024-10-18 10:53 ` [PATCH V23 03/16] mmc: sdhci: add UHS-II module and add a kernel configuration Victor Shih
2024-10-29 13:56 ` Geert Uytterhoeven
2024-11-01 10:39 ` Victor Shih
2024-10-18 10:53 ` [PATCH V23 04/16] mmc: sdhci-uhs2: dump UHS-II registers Victor Shih
2024-10-18 10:53 ` [PATCH V23 05/16] mmc: sdhci-uhs2: add reset function Victor Shih
2024-10-18 10:53 ` [PATCH V23 06/16] mmc: sdhci-uhs2: add set_power() to support vdd2 Victor Shih
2024-10-18 10:53 ` Victor Shih [this message]
2024-10-18 10:53 ` [PATCH V23 08/16] mmc: sdhci-uhs2: add add_host() and others to set up the driver Victor Shih
2024-10-18 10:53 ` [PATCH V23 09/16] mmc: sdhci-uhs2: add set_ios() Victor Shih
2024-10-18 10:53 ` [PATCH V23 10/16] mmc: sdhci-uhs2: add related functions to initialize the interface Victor Shih
2024-10-18 10:53 ` [PATCH V23 11/16] mmc: sdhci-uhs2: add irq() and others Victor Shih
2024-10-18 10:53 ` [PATCH V23 12/16] mmc: sdhci-uhs2: add request() " Victor Shih
2024-10-18 10:53 ` [PATCH V23 13/16] mmc: sdhci-uhs2: add pre-detect_init hook Victor Shih
2024-10-18 10:53 ` [PATCH V23 14/16] mmc: sdhci-pci: add UHS-II support framework Victor Shih
2024-10-18 10:53 ` [PATCH V23 15/16] mmc: sdhci-pci-gli: enable UHS-II mode for GL9755 Victor Shih
2025-02-19 21:32 ` Janne Grunau
2025-03-05 0:56 ` Ben Chuang
2025-03-06 14:27 ` Adrian Hunter
2024-10-18 10:53 ` [PATCH V23 16/16] mmc: sdhci-pci-gli: enable UHS-II mode for GL9767 Victor Shih
2024-10-24 8:51 ` [PATCH V23 00/16] Add support UHS-II for GL9755 and GL9767 Adrian Hunter
2024-10-24 12:57 ` Ulf Hansson
2024-10-25 4:00 ` Victor Shih
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=20241018105333.4569-8-victorshihgli@gmail.com \
--to=victorshihgli@gmail.com \
--cc=Greg.tu@genesyslogic.com.tw \
--cc=HL.Liu@genesyslogic.com.tw \
--cc=Lucas.Lai@genesyslogic.com.tw \
--cc=adrian.hunter@intel.com \
--cc=ben.chuang@genesyslogic.com.tw \
--cc=benchuanggli@gmail.com \
--cc=dlunev@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=takahiro.akashi@linaro.org \
--cc=ulf.hansson@linaro.org \
--cc=victor.shih@genesyslogic.com.tw \
/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