From patchwork Tue Apr 23 07:29:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2475951 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id BBF34DFB79 for ; Tue, 23 Apr 2013 07:29:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755741Ab3DWH3v (ORCPT ); Tue, 23 Apr 2013 03:29:51 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:51153 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755730Ab3DWH3t (ORCPT ); Tue, 23 Apr 2013 03:29:49 -0400 Received: from axis700.grange (dslb-088-076-031-246.pools.arcor-ip.net [88.76.31.246]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M4Tee-1Uj1gj0WYW-00yi6l; Tue, 23 Apr 2013 09:29:45 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 919A140BB4; Tue, 23 Apr 2013 09:29:44 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 8A9E740BB3; Tue, 23 Apr 2013 09:29:44 +0200 (CEST) Date: Tue, 23 Apr 2013 09:29:44 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: linux-mmc@vger.kernel.org cc: linux-sh@vger.kernel.org, Chris Ball , Laurent Pinchart Subject: [PATCH v2] MMC: tmio: fix unbalanced power-on calls with clock-gating enabled Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:XVGXW1c7MWe6HdFWlcmiutrOgMBKBCQ2ovTt7YAwkgw RWDGYp/+TX77Bqur6vpI3WyCH9O0rdnvrd0aT42y1pfXStp7eB w69hTT02o6BuS+u9pPQhU8HgVKMBnHSfef8mz2hJVvlxMy1Nx/ QgQ+Qi2W0FRRhA27YFrAtc04m7qb1+P5yMVJnosgFmORG8vOV3 tsMGWhWf23HC1scmY0IY05DQD0vNeX7iF7pzUp/N296b1tEpBt HKsDV0v6OxZ0fwmIHDixs52reIRP+DjccsPLjrQufX9BR6f/yY XNcKcc3Ao6o8MkrmtjAYmhK7yAUtqVRv69Ba/dhtqSNWRNRK/1 sbBNsTHA9bCp4dgLT8KKKH52jXUyJeZhQiG8mxhFD9GRQPBK0J 0KHVRQTXma2sw== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org With MMC clock gating enabled the MMC core currently calls MMC host driver's .set_ios() method with .power_mode == MMC_POWER_ON and the clock value set either to 0 or to the target rate. The tmio MMC driver then wrongly translates the latter calls to card slot power-on requests, even when the slot already was on. This patch fixes the driver to avoid needlessly incrementing power-supplying regulator's use count. Signed-off-by: Guennadi Liakhovetski Tested-by: Laurent Pinchart --- v2: Also make runtime PM handling safer and more resistant to possible MMC core changes. V1 worked fine too, but theoretically if the core decided to issue a sequence like .set_ios(ios->power_mode == MMC_POWER_ON, ios->clock != 0); .set_ios(ios->power_mode == MMC_POWER_ON, ios->clock == 0); .set_ios(ios->power_mode == MMC_POWER_OFF, ios->clock == 0); we would end up calling pm_runtime_put() twice in a row, which is wrong. V2 only toggles the controller runtime PM status only when entering or leaving the TMIO_MMC_ON_RUN state. drivers/mmc/host/tmio_mmc.h | 20 ++++++++++++++++++-- drivers/mmc/host/tmio_mmc_pio.c | 27 +++++++++++++++++---------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index d857f5c..3cc589a 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -40,6 +40,22 @@ struct tmio_mmc_data; +/* + * We differentiate between the following 3 power states: + * 1. card slot powered off, controller stopped. This is used, when either there + * is no card in the slot, or the card really has to be powered down. + * 2. card slot powered on, controller stopped. This is used, when a card is in + * the slot, but no activity is currently taking place. This is a power- + * saving mode with card-state preserved. This state can be entered, e.g. + * when MMC clock-gating is used. + * 3. card slot powered on, controller running. This is the actual active state. + */ +enum tmio_mmc_power { + TMIO_MMC_OFF_STOP, /* card power off, controller stopped */ + TMIO_MMC_ON_STOP, /* card power on, controller stopped */ + TMIO_MMC_ON_RUN, /* card power on, controller running */ +}; + struct tmio_mmc_host { void __iomem *ctl; unsigned long bus_shift; @@ -48,8 +64,8 @@ struct tmio_mmc_host { struct mmc_data *data; struct mmc_host *mmc; - /* Controller power state */ - bool power; + /* Controller and card power state */ + enum tmio_mmc_power power; /* Callbacks for clock / power control */ void (*set_pwr)(struct platform_device *host, int state); diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index f508ecb..1d5ef64 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -859,32 +859,39 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) * is kept positive, so no suspending actually takes place. */ if (ios->power_mode == MMC_POWER_ON && ios->clock) { - if (!host->power) { + if (host->power != TMIO_MMC_ON_RUN) { tmio_mmc_clk_update(mmc); pm_runtime_get_sync(dev); } tmio_mmc_set_clock(host, ios->clock); - if (!host->power) { + if (host->power == TMIO_MMC_OFF_STOP) /* power up SD card and the bus */ tmio_mmc_power_on(host, ios->vdd); - host->power = true; - } + host->power = TMIO_MMC_ON_RUN; /* start bus clock */ tmio_mmc_clk_start(host); } else if (ios->power_mode != MMC_POWER_UP) { - if (host->power) { - struct tmio_mmc_data *pdata = host->pdata; - if (ios->power_mode == MMC_POWER_OFF) + struct tmio_mmc_data *pdata = host->pdata; + unsigned int old_power = host->power; + + if (old_power != TMIO_MMC_OFF_STOP) { + if (ios->power_mode == MMC_POWER_OFF) { tmio_mmc_power_off(host); + host->power = TMIO_MMC_OFF_STOP; + } else { + host->power = TMIO_MMC_ON_STOP; + } + } + + if (old_power == TMIO_MMC_ON_RUN) { tmio_mmc_clk_stop(host); - host->power = false; pm_runtime_put(dev); if (pdata->clk_disable) pdata->clk_disable(host->pdev); } } - if (host->power) { + if (host->power != TMIO_MMC_OFF_STOP) { switch (ios->bus_width) { case MMC_BUS_WIDTH_1: sd_ctrl_write16(host, CTL_SD_MEM_CARD_OPT, 0x80e0); @@ -1025,7 +1032,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host **host, mmc->caps & MMC_CAP_NONREMOVABLE || mmc->slot.cd_irq >= 0); - _host->power = false; + _host->power = TMIO_MMC_OFF_STOP; pm_runtime_enable(&pdev->dev); ret = pm_runtime_resume(&pdev->dev); if (ret < 0)