From: Detlev Casanova <detlev.casanova@collabora.com>
To: linux-kernel@vger.kernel.org
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Heiko Stuebner <heiko@sntech.de>,
Jaehoon Chung <jh80.chung@samsung.com>,
linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, kernel@collabora.com,
Shawn Lin <shawn.lin@rock-chips.com>,
Detlev Casanova <detlev.casanova@collabora.com>
Subject: [PATCH v3 2/3] mmc: dw_mmc-rockchip: Add v2 tuning support
Date: Wed, 14 Aug 2024 18:34:01 -0400 [thread overview]
Message-ID: <20240814223555.3695-3-detlev.casanova@collabora.com> (raw)
In-Reply-To: <20240814223555.3695-1-detlev.casanova@collabora.com>
From: Shawn Lin <shawn.lin@rock-chips.com>
v2 tuning will inherit pre-stage loader's phase settings for the first
time, and do re-tune if necessary.
Re-tune will still try the rough degrees, for instance, 90, 180, 270,
360 but continue to do the fine tuning if sample window isn't good
enough.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Detlev Casanova <detlev.casanova@collabora.com>
---
drivers/mmc/host/dw_mmc-rockchip.c | 49 ++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index b07190ba4b7ac..367633f4e8892 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -24,6 +24,8 @@ struct dw_mci_rockchip_priv_data {
struct clk *sample_clk;
int default_sample_phase;
int num_phases;
+ bool use_v2_tuning;
+ int last_degree;
};
static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios)
@@ -134,6 +136,42 @@ static void dw_mci_rk3288_set_ios(struct dw_mci *host, struct mmc_ios *ios)
#define TUNING_ITERATION_TO_PHASE(i, num_phases) \
(DIV_ROUND_UP((i) * 360, num_phases))
+static int dw_mci_v2_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
+{
+ struct dw_mci *host = slot->host;
+ struct dw_mci_rockchip_priv_data *priv = host->priv;
+ struct mmc_host *mmc = slot->mmc;
+ u32 degrees[4] = {90, 180, 270, 360};
+ int i;
+ static bool inherit = true;
+
+ if (inherit) {
+ inherit = false;
+ i = clk_get_phase(priv->sample_clk) / 90 - 1;
+ goto done;
+ }
+
+ /* v2 only support 4 degrees in theory */
+ for (i = 0; i < ARRAY_SIZE(degrees); i++) {
+ if (degrees[i] == priv->last_degree)
+ continue;
+
+ clk_set_phase(priv->sample_clk, degrees[i]);
+ if (!mmc_send_tuning(mmc, opcode, NULL))
+ break;
+ }
+
+ if (i == ARRAY_SIZE(degrees)) {
+ dev_warn(host->dev, "All phases bad!");
+ return -EIO;
+ }
+
+done:
+ dev_info(host->dev, "Successfully tuned phase to %d\n", degrees[i]);
+ priv->last_degree = degrees[i];
+ return 0;
+}
+
static int dw_mci_rk3288_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
{
struct dw_mci *host = slot->host;
@@ -157,6 +195,13 @@ static int dw_mci_rk3288_execute_tuning(struct dw_mci_slot *slot, u32 opcode)
return -EIO;
}
+ if (priv->use_v2_tuning) {
+ ret = dw_mci_v2_execute_tuning(slot, opcode);
+ if (!ret)
+ return 0;
+ /* Otherwise we continue using fine tuning */
+ }
+
ranges = kmalloc_array(priv->num_phases / 2 + 1,
sizeof(*ranges), GFP_KERNEL);
if (!ranges)
@@ -277,6 +322,10 @@ static int dw_mci_rk3288_parse_dt(struct dw_mci *host)
&priv->default_sample_phase))
priv->default_sample_phase = 0;
+ priv->use_v2_tuning =
+ of_device_is_compatible(host->dev->of_node,
+ "rockchip,rk3576-dw-mshc");
+
priv->drv_clk = devm_clk_get(host->dev, "ciu-drive");
if (IS_ERR(priv->drv_clk))
dev_dbg(host->dev, "ciu-drive not available\n");
--
2.46.0
next prev parent reply other threads:[~2024-08-14 22:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 22:33 [PATCH v3 0/3] Add dw_mmc support for rk3576 Detlev Casanova
2024-08-14 22:34 ` [PATCH v3 1/3] dt-bindings: mmc: Add support for rk3576 dw-mshc Detlev Casanova
2024-08-15 13:49 ` Heiko Stübner
2024-08-16 6:52 ` Krzysztof Kozlowski
2024-08-16 7:45 ` Heiko Stübner
2024-08-16 8:23 ` Krzysztof Kozlowski
2024-08-14 22:34 ` Detlev Casanova [this message]
2024-08-15 0:55 ` [PATCH v3 2/3] mmc: dw_mmc-rockchip: Add v2 tuning support Shawn Lin
2024-08-15 13:17 ` Heiko Stübner
2024-08-16 0:41 ` Shawn Lin
2024-08-15 13:23 ` Detlev Casanova
2024-08-15 14:09 ` Heiko Stübner
2024-08-16 0:43 ` Shawn Lin
2024-08-14 22:34 ` [PATCH v3 3/3] mmc: dw_mmc-rockchip: Add internal phase support Detlev Casanova
2024-08-15 0:57 ` Shawn Lin
2024-08-15 13:52 ` Heiko Stübner
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=20240814223555.3695-3-detlev.casanova@collabora.com \
--to=detlev.casanova@collabora.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=jh80.chung@samsung.com \
--cc=kernel@collabora.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robh@kernel.org \
--cc=shawn.lin@rock-chips.com \
--cc=ulf.hansson@linaro.org \
/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