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 V20 11/22] mmc: sdhci-uhs2: add reset function
Date: Thu, 5 Sep 2024 18:19:49 +0800 [thread overview]
Message-ID: <20240905102000.5020-12-victorshihgli@gmail.com> (raw)
In-Reply-To: <20240905102000.5020-1-victorshihgli@gmail.com>
From: Victor Shih <victor.shih@genesyslogic.com.tw>
Sdhci_uhs2_reset() does a UHS-II specific reset operation.
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 V17:
- Move the sdhci_uhs2_reset_cmd_data() to the other patch it was used
for the first time.
Updates in V16:
- Add sdhci_uhs2_reset_cmd_data() function.
Updates in V15:
- Refer the SD Host Controller Standard Specification Section 3.10
to add reset command data mechanism.
Updates in V14:
- Since mmc_card_uhs2() is the same as sdhci_uhs2_mode(), so drop
sdhci_uhs2_mode() and use mmc_card_uhs2() instead of sdhci_uhs2_mode().
Updates in V13:
- Use ios timing to stead MMC_UHS2_SUPPORT for indicate the UHS2 mode.
Updates in V8:
- Adjust the position of matching brackets.
Updates in V6:
- Remove unnecessary functions and simplify code.
---
drivers/mmc/host/sdhci-uhs2.c | 37 +++++++++++++++++++++++++++++++++++
drivers/mmc/host/sdhci-uhs2.h | 1 +
2 files changed, 38 insertions(+)
diff --git a/drivers/mmc/host/sdhci-uhs2.c b/drivers/mmc/host/sdhci-uhs2.c
index 9cb0f1b2a37d..3d16f1ef9344 100644
--- a/drivers/mmc/host/sdhci-uhs2.c
+++ b/drivers/mmc/host/sdhci-uhs2.c
@@ -10,7 +10,9 @@
* Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
*/
+#include <linux/delay.h>
#include <linux/module.h>
+#include <linux/iopoll.h>
#include "sdhci.h"
#include "sdhci-uhs2.h"
@@ -21,6 +23,8 @@
#define SDHCI_UHS2_DUMP(f, x...) \
pr_err("%s: " DRIVER_NAME ": " f, mmc_hostname(host->mmc), ## x)
+#define UHS2_RESET_TIMEOUT_100MS 100000
+
void sdhci_uhs2_dump_regs(struct sdhci_host *host)
{
if (!(mmc_card_uhs2(host->mmc)))
@@ -49,6 +53,39 @@ void sdhci_uhs2_dump_regs(struct sdhci_host *host)
}
EXPORT_SYMBOL_GPL(sdhci_uhs2_dump_regs);
+/*****************************************************************************\
+ * *
+ * Low level functions *
+ * *
+\*****************************************************************************/
+
+/**
+ * sdhci_uhs2_reset - invoke SW reset
+ * @host: SDHCI host
+ * @mask: Control mask
+ *
+ * Invoke SW reset, depending on a bit in @mask and wait for completion.
+ */
+void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask)
+{
+ u32 val;
+
+ sdhci_writew(host, mask, SDHCI_UHS2_SW_RESET);
+
+ if (mask & SDHCI_UHS2_SW_RESET_FULL)
+ host->clock = 0;
+
+ /* hw clears the bit when it's done */
+ if (read_poll_timeout_atomic(sdhci_readw, val, !(val & mask), 10,
+ UHS2_RESET_TIMEOUT_100MS, true, host, SDHCI_UHS2_SW_RESET)) {
+ pr_warn("%s: %s: Reset 0x%x never completed. %s: clean reset bit.\n", __func__,
+ mmc_hostname(host->mmc), (int)mask, mmc_hostname(host->mmc));
+ sdhci_writeb(host, 0, SDHCI_UHS2_SW_RESET);
+ return;
+ }
+}
+EXPORT_SYMBOL_GPL(sdhci_uhs2_reset);
+
/*****************************************************************************\
* *
* Driver init/exit *
diff --git a/drivers/mmc/host/sdhci-uhs2.h b/drivers/mmc/host/sdhci-uhs2.h
index 2bfe18d29bca..caaf9fba4975 100644
--- a/drivers/mmc/host/sdhci-uhs2.h
+++ b/drivers/mmc/host/sdhci-uhs2.h
@@ -177,5 +177,6 @@
struct sdhci_host;
void sdhci_uhs2_dump_regs(struct sdhci_host *host);
+void sdhci_uhs2_reset(struct sdhci_host *host, u16 mask);
#endif /* __SDHCI_UHS2_H */
--
2.25.1
next prev parent reply other threads:[~2024-09-05 10:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-05 10:19 [PATCH V20 00/22] Add support UHS-II for GL9755 and GL9767 Victor Shih
2024-09-05 10:19 ` [PATCH V20 01/22] mmc: core: Cleanup printing of speed mode at card insertion Victor Shih
2024-09-05 10:19 ` [PATCH V20 02/22] mmc: core: Prepare to support SD UHS-II cards Victor Shih
2024-09-05 10:19 ` [PATCH V20 03/22] mmc: core: Announce successful insertion of an SD UHS-II card Victor Shih
2024-09-05 10:19 ` [PATCH V20 04/22] mmc: core: Extend support for mmc regulators with a vqmmc2 Victor Shih
2024-09-05 10:19 ` [PATCH V20 05/22] mmc: core: Add definitions for SD UHS-II cards Victor Shih
2024-09-05 10:19 ` [PATCH V20 06/22] mmc: core: Add New function to re-factoring the code Victor Shih
2024-09-05 10:19 ` [PATCH V20 07/22] mmc: core: Support UHS-II card control and access Victor Shih
2024-09-05 10:19 ` [PATCH V20 08/22] mmc: sdhci: add UHS-II related definitions in headers Victor Shih
2024-09-05 10:19 ` [PATCH V20 09/22] mmc: sdhci: add UHS-II module and add a kernel configuration Victor Shih
2024-09-05 10:19 ` [PATCH V20 10/22] mmc: sdhci-uhs2: dump UHS-II registers Victor Shih
2024-09-05 10:19 ` Victor Shih [this message]
2024-09-05 10:19 ` [PATCH V20 12/22] mmc: sdhci-uhs2: add set_power() to support vdd2 Victor Shih
2024-09-05 10:19 ` [PATCH V20 13/22] mmc: sdhci-uhs2: add set_timeout() Victor Shih
2024-09-05 10:19 ` [PATCH V20 14/22] mmc: sdhci-uhs2: add set_ios() Victor Shih
2024-09-05 10:19 ` [PATCH V20 15/22] mmc: sdhci-uhs2: add uhs2_control() to initialise the interface Victor Shih
2024-09-05 10:19 ` [PATCH V20 16/22] mmc: sdhci-uhs2: add request() and others Victor Shih
2024-09-05 10:19 ` [PATCH V20 17/22] mmc: sdhci-uhs2: add irq() " Victor Shih
2024-09-05 10:19 ` [PATCH V20 18/22] mmc: sdhci-uhs2: add add_host() and others to set up the driver Victor Shih
2024-09-05 10:19 ` [PATCH V20 19/22] mmc: sdhci-uhs2: add pre-detect_init hook Victor Shih
2024-09-05 10:19 ` [PATCH V20 20/22] mmc: sdhci-pci: add UHS-II support framework Victor Shih
2024-09-05 10:19 ` [PATCH V20 21/22] mmc: sdhci-pci-gli: enable UHS-II mode for GL9755 Victor Shih
2024-09-05 13:55 ` Adrian Hunter
2024-09-06 9:58 ` Victor Shih
2024-09-05 10:20 ` [PATCH V20 22/22] mmc: sdhci-pci-gli: enable UHS-II mode for GL9767 Victor Shih
2024-09-05 13:58 ` [PATCH V20 00/22] Add support UHS-II for GL9755 and GL9767 Adrian Hunter
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=20240905102000.5020-12-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