From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Chen-Yu Tsai <wens@csie.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Ulf Hansson <ulf.hansson@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org,
Andre Przywara <andre.przywara@arm.com>
Subject: [PATCH v4 7/13] mmc: sunxi: Add more debug informations
Date: Thu, 26 Jan 2017 10:06:00 +0100 [thread overview]
Message-ID: <97cb930c7287da4db2948f2da8e69484dc7cc2e9.1485421557.git-series.maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <cover.8d42a39b7bd5143e709979dc42cc47862ebe3728.1485421557.git-series.maxime.ripard@free-electrons.com>
In-Reply-To: <cover.8d42a39b7bd5143e709979dc42cc47862ebe3728.1485421557.git-series.maxime.ripard@free-electrons.com>
Add a bit more debug messages that can be helpful when debugging the clock
setup.
Also fill the actual_clock field in struct mmc_host to report properly the
current frequency in debugfs.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/mmc/host/sunxi-mmc.c | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index f0f6922bca8a..6ffcd2838272 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -661,6 +661,9 @@ static int sunxi_mmc_oclk_onoff(struct sunxi_mmc_host *host, u32 oclk_en)
unsigned long expire = jiffies + msecs_to_jiffies(750);
u32 rval;
+ dev_dbg(mmc_dev(host->mmc), "%sabling the clock\n",
+ oclk_en ? "en" : "dis");
+
rval = mmc_readl(host, REG_CLKCR);
rval &= ~(SDXC_CARD_CLOCK_ON | SDXC_LOW_POWER_ON | SDXC_MASK_DATA0);
@@ -737,6 +740,7 @@ static int sunxi_mmc_clk_set_phase(struct sunxi_mmc_host *host,
index = SDXC_CLK_50M_DDR;
}
} else {
+ dev_dbg(mmc_dev(host->mmc), "Invalid clock... returning\n");
return -EINVAL;
}
@@ -749,6 +753,7 @@ static int sunxi_mmc_clk_set_phase(struct sunxi_mmc_host *host,
static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
struct mmc_ios *ios)
{
+ struct mmc_host *mmc = host->mmc;
long rate;
u32 rval, clock = ios->clock;
int ret;
@@ -757,6 +762,9 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
if (ret)
return ret;
+ /* Our clock is gated now */
+ mmc->actual_clock = 0;
+
if (!ios->clock)
return 0;
@@ -767,17 +775,17 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
rate = clk_round_rate(host->clk_mmc, clock);
if (rate < 0) {
- dev_err(mmc_dev(host->mmc), "error rounding clk to %d: %ld\n",
+ dev_err(mmc_dev(mmc), "error rounding clk to %d: %ld\n",
clock, rate);
return rate;
}
- dev_dbg(mmc_dev(host->mmc), "setting clk to %d, rounded %ld\n",
+ dev_dbg(mmc_dev(mmc), "setting clk to %d, rounded %ld\n",
clock, rate);
/* setting clock rate */
ret = clk_set_rate(host->clk_mmc, rate);
if (ret) {
- dev_err(mmc_dev(host->mmc), "error setting clk to %ld: %d\n",
+ dev_err(mmc_dev(mmc), "error setting clk to %ld: %d\n",
rate, ret);
return ret;
}
@@ -812,7 +820,14 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
* least on the A64).
*/
- return sunxi_mmc_oclk_onoff(host, 1);
+ ret = sunxi_mmc_oclk_onoff(host, 1);
+ if (ret)
+ return ret;
+
+ /* And we just enabled our clock back */
+ mmc->actual_clock = rate;
+
+ return 0;
}
static void sunxi_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
--
git-series 0.8.11
next prev parent reply other threads:[~2017-01-26 9:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-26 9:05 [PATCH v4 0/13] arm64: allwinner: a64: Enable MMC support Maxime Ripard
2017-01-26 9:05 ` [PATCH v4 1/13] mmc: sunxi: Fix clock frequency change sequence Maxime Ripard
2017-01-26 9:05 ` [PATCH v4 2/13] mmc: sunxi: Gate the clock when rate is 0 Maxime Ripard
2017-01-26 9:05 ` [PATCH v4 3/13] mmc: sunxi: Always set signal delay to 0 for A64 Maxime Ripard
2017-01-26 9:05 ` [PATCH v4 4/13] mmc: sunxi: Enable the new timings for the A64 MMC controllers Maxime Ripard
2017-01-26 9:05 ` [PATCH v4 5/13] mmc: sunxi: Mask DATA0 when updating the clock Maxime Ripard
2017-01-26 9:05 ` [PATCH v4 6/13] mmc: sunxi: Add EMMC (MMC2) controller compatible Maxime Ripard
2017-01-26 9:06 ` Maxime Ripard [this message]
2017-01-26 9:06 ` [PATCH v4 8/13] arm64: allwinner: a64: Add MMC nodes Maxime Ripard
2017-01-26 9:06 ` [PATCH v4 9/13] arm64: allwinner: a64: Add MMC pinctrl nodes Maxime Ripard
2017-01-26 9:06 ` [PATCH v4 10/13] arm64: allwinner: a64: Increase the MMC max frequency Maxime Ripard
2017-01-27 10:29 ` Florian Vaussard
2017-01-27 21:26 ` Maxime Ripard
2017-01-26 9:06 ` [PATCH v4 11/13] arm64: allwinner: pine64: add MMC support Maxime Ripard
2017-01-26 9:06 ` [PATCH v4 12/13] arm64: allwinner: a64: add UART1 pin nodes Maxime Ripard
2017-01-26 9:06 ` [PATCH v4 13/13] arm64: allwinner: add BananaPi-M64 support Maxime Ripard
2017-01-27 10:37 ` [PATCH v4 0/13] arm64: allwinner: a64: Enable MMC support Florian Vaussard
2017-01-27 21:27 ` Maxime Ripard
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=97cb930c7287da4db2948f2da8e69484dc7cc2e9.1485421557.git-series.maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=andre.przywara@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=wens@csie.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;
as well as URLs for NNTP newsgroup(s).