mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: linux-mmc@vger.kernel.org,
	Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Ulf Magnusson <ulfalizer@gmail.com>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Simon Horman <horms+renesas@verge.net.au>,
	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
	linux-renesas-soc@vger.kernel.org,
	Masahiro Yamada <yamada.masahiro@socionext.com>,
	linux-kernel@vger.kernel.org,
	Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH v3 01/16] mmc: tmio: ioremap memory resource in tmio_mmc_host_alloc()
Date: Thu, 18 Jan 2018 01:28:01 +0900	[thread overview]
Message-ID: <1516206496-16612-2-git-send-email-yamada.masahiro@socionext.com> (raw)
In-Reply-To: <1516206496-16612-1-git-send-email-yamada.masahiro@socionext.com>

The register region is ioremap'ed in the tmio_mmc_host_probe(), i.e.
drivers cannot get access to the hardware before mmc_add_host().

Actually, renesas_sdhi_core.c reads out the CTL_VERSION register to
complete the platform-specific settings.  However, at this point,
the MMC host is already running.

Move the register ioremap to tmio_mmc_host_alloc() so that drivers
can perform platform-specific settings between tmio_mmc_host_alloc()
and tmio_mmc_host_probe().

I changed tmio_mmc_host_alloc() to return an error pointer to
propagate the return code from devm_ioremap_resource().

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---

Changes in v3: None
Changes in v2: None

 drivers/mmc/host/renesas_sdhi_core.c |  4 ++--
 drivers/mmc/host/tmio_mmc.c          |  4 +++-
 drivers/mmc/host/tmio_mmc_core.c     | 16 +++++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
index 6a2988b..ccdde27 100644
--- a/drivers/mmc/host/renesas_sdhi_core.c
+++ b/drivers/mmc/host/renesas_sdhi_core.c
@@ -512,8 +512,8 @@ int renesas_sdhi_probe(struct platform_device *pdev,
 	}
 
 	host = tmio_mmc_host_alloc(pdev);
-	if (!host)
-		return -ENOMEM;
+	if (IS_ERR(host))
+		return PTR_ERR(host);
 
 	if (of_data) {
 		mmc_data->flags |= of_data->tmio_flags;
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index ccfbc15..d660816 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -93,8 +93,10 @@ static int tmio_mmc_probe(struct platform_device *pdev)
 	pdata->flags |= TMIO_MMC_HAVE_HIGH_REG;
 
 	host = tmio_mmc_host_alloc(pdev);
-	if (!host)
+	if (IS_ERR(host)) {
+		ret = PTR_ERR(host);
 		goto cell_disable;
+	}
 
 	/* SD control register space size is 0x200, 0x400 for bus_shift=1 */
 	host->bus_shift = resource_size(res) >> 10;
diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
index 610f26f..5f0f12a 100644
--- a/drivers/mmc/host/tmio_mmc_core.c
+++ b/drivers/mmc/host/tmio_mmc_core.c
@@ -1150,12 +1150,20 @@ tmio_mmc_host_alloc(struct platform_device *pdev)
 {
 	struct tmio_mmc_host *host;
 	struct mmc_host *mmc;
+	struct resource *res;
+	void __iomem *ctl;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	ctl = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(ctl))
+		return ERR_CAST(ctl);
 
 	mmc = mmc_alloc_host(sizeof(struct tmio_mmc_host), &pdev->dev);
 	if (!mmc)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	host = mmc_priv(mmc);
+	host->ctl = ctl;
 	host->mmc = mmc;
 	host->pdev = pdev;
 	host->ops = tmio_mmc_ops;
@@ -1177,7 +1185,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
 {
 	struct platform_device *pdev = _host->pdev;
 	struct mmc_host *mmc = _host->mmc;
-	struct resource *res_ctl;
 	int ret;
 	u32 irq_mask = TMIO_MASK_CMD;
 
@@ -1186,11 +1193,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
 	if (!(pdata->flags & TMIO_MMC_HAS_IDLE_WAIT))
 		_host->write16_hook = NULL;
 
-	res_ctl = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	_host->ctl = devm_ioremap_resource(&pdev->dev, res_ctl);
-	if (IS_ERR(_host->ctl))
-		return PTR_ERR(_host->ctl);
-
 	ret = mmc_of_parse(mmc);
 	if (ret < 0)
 		return ret;
-- 
2.7.4

  reply	other threads:[~2018-01-17 16:42 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-17 16:28 [PATCH v3 00/16] mmc: tmio: another batch of TMIO MMC fixes and cleanups Masahiro Yamada
2018-01-17 16:28 ` Masahiro Yamada [this message]
2018-01-17 16:28 ` [PATCH v3 02/16] mmc: tmio: move clk_enable/disable out of tmio_mmc_host_probe() Masahiro Yamada
2018-01-17 16:28 ` [PATCH v3 03/16] mmc: tmio: move {tmio_}mmc_of_parse() to tmio_mmc_host_alloc() Masahiro Yamada
2018-01-17 16:28 ` [PATCH v3 04/16] mmc: tmio: remove dma_ops from tmio_mmc_host_probe() argument Masahiro Yamada
2018-01-17 16:28 ` [PATCH v3 05/16] mmc: slot-gpio: add a helper to check capability of GPIO WP detection Masahiro Yamada
2018-02-07 19:06   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 06/16] mmc: tmio: refactor .get_ro hook Masahiro Yamada
2018-02-07 19:09   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 07/16] mmc: renesas_sdhi: use MMC_CAP2_NO_WRITE_PROTECT instead of TMIO own flag Masahiro Yamada
2018-02-07 19:28   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 08/16] sh: kfr2r09: " Masahiro Yamada
2018-02-07 19:28   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 09/16] mmc: tmio: " Masahiro Yamada
2018-02-07 19:31   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 10/16] mmc: tmio: remove TMIO_MMC_WRPROTECT_DISABLE Masahiro Yamada
2018-01-18  8:27   ` Lee Jones
2018-02-07 19:31   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 11/16] mmc: tmio: deprecate "toshiba,mmc-wrprotect-disable" DT property Masahiro Yamada
2018-01-18  1:58   ` Masahiro Yamada
2018-01-29 17:18     ` Rob Herring
2018-02-07 19:32     ` Wolfram Sang
2018-03-18  2:46       ` Masahiro Yamada
2018-01-17 16:28 ` [PATCH v3 12/16] mmc: tmio: support IP-builtin card detection logic Masahiro Yamada
2018-02-07 19:34   ` Wolfram Sang
2018-02-08  1:02     ` Masahiro Yamada
2018-01-17 16:28 ` [PATCH v3 13/16] mmc: tmio: fix never-detected card insertion bug Masahiro Yamada
2018-02-07 19:38   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 14/16] mmc: tmio: move TMIO_MASK_{READOP,WRITEOP} handling to correct place Masahiro Yamada
2018-02-07 21:47   ` Wolfram Sang
2018-02-08  1:11     ` Masahiro Yamada
2018-03-04 22:34   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 15/16] mmc: tmio: clear force_pio flag before starting data transfer Masahiro Yamada
2018-03-04 22:39   ` Wolfram Sang
2018-01-17 16:28 ` [PATCH v3 16/16] mmc: tmio: remove useless TMIO_MASK_CMD handling in tmio_mmc_host_probe() Masahiro Yamada
2018-03-04 22:39   ` Wolfram Sang
2018-01-18  8:13 ` [PATCH v3 00/16] mmc: tmio: another batch of TMIO MMC fixes and cleanups Ulf Hansson
2018-02-07 19:11   ` Wolfram Sang
2018-02-14  9:36     ` Ulf Hansson
2018-02-14  9:43       ` Masahiro Yamada
2018-02-14  9:46         ` Ulf Hansson
2018-02-14 10:23       ` Wolfram Sang
2018-02-14 10:39         ` Ulf Hansson
2018-03-04 22:42 ` Wolfram Sang
2018-03-05  8:45   ` Ulf Hansson
2018-03-05  9:22     ` Wolfram Sang
2018-03-05  9:34       ` Masahiro Yamada
2018-03-05  9:39         ` Wolfram Sang
2018-03-05 12:06         ` Ulf Hansson

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=1516206496-16612-2-git-send-email-yamada.masahiro@socionext.com \
    --to=yamada.masahiro@socionext.com \
    --cc=geert@linux-m68k.org \
    --cc=horms+renesas@verge.net.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    --cc=ulfalizer@gmail.com \
    --cc=wsa+renesas@sang-engineering.com \
    --cc=yoshihiro.shimoda.uh@renesas.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

all inboxes | Powered by JetHome®