From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B238C67790 for ; Wed, 25 Jul 2018 11:55:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6BDE20843 for ; Wed, 25 Jul 2018 11:55:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E6BDE20843 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728958AbeGYNHI (ORCPT ); Wed, 25 Jul 2018 09:07:08 -0400 Received: from mga03.intel.com ([134.134.136.65]:12651 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728390AbeGYNHI (ORCPT ); Wed, 25 Jul 2018 09:07:08 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jul 2018 04:55:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,401,1526367600"; d="scan'208";a="57760364" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.168]) ([10.237.72.168]) by fmsmga008.fm.intel.com with ESMTP; 25 Jul 2018 04:55:38 -0700 Subject: Re: [PATCH V1 1/3] mmc: sdhci: Allow platform controlled voltage switching To: Vijay Viswanath , ulf.hansson@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, shawn.lin@rock-chips.com, linux-arm-msm@vger.kernel.org, georgi.djakov@linaro.org, devicetree@vger.kernel.org, asutoshd@codeaurora.org, stummala@codeaurora.org, venkatg@codeaurora.org, jeremymc@redhat.com, bjorn.andersson@linaro.org, riteshh@codeaurora.org, vbadigan@codeaurora.org, evgreen@chromium.org, dianders@google.com, sayalil@codeaurora.org References: <1532083566-43215-1-git-send-email-vviswana@codeaurora.org> <1532083566-43215-2-git-send-email-vviswana@codeaurora.org> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <33e12e51-4b96-032f-845f-7910d654018c@intel.com> Date: Wed, 25 Jul 2018 14:53:59 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.0 MIME-Version: 1.0 In-Reply-To: <1532083566-43215-2-git-send-email-vviswana@codeaurora.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/07/18 13:46, Vijay Viswanath wrote: > Some controllers can have internal mechanism to inform the SW that it > is ready for voltage switching. For such controllers, changing voltage > before the HW is ready can result in various issues. > > During setup/cleanup of host, check whether regulator enable/disable > was already done by platform driver. > > Signed-off-by: Vijay Viswanath > --- > drivers/mmc/host/sdhci.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 1c828e0..494a1e2 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -3472,6 +3472,7 @@ int sdhci_setup_host(struct sdhci_host *host) > unsigned int override_timeout_clk; > u32 max_clk; > int ret; > + bool enable_vqmmc = false; > > WARN_ON(host == NULL); > if (host == NULL) > @@ -3485,7 +3486,12 @@ int sdhci_setup_host(struct sdhci_host *host) > * the host can take the appropriate action if regulators are not > * available. > */ > - ret = mmc_regulator_get_supply(mmc); > + if (!mmc->supply.vmmc) { > + ret = mmc_regulator_get_supply(mmc); > + enable_vqmmc = true; > + } else { > + ret = 0; > + } > if (ret) > return ret; Why not if (!mmc->supply.vmmc) { ret = mmc_regulator_get_supply(mmc); if (ret) return ret; enable_vqmmc = true; } > > @@ -3736,7 +3742,10 @@ int sdhci_setup_host(struct sdhci_host *host) > > /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */ > if (!IS_ERR(mmc->supply.vqmmc)) { > - ret = regulator_enable(mmc->supply.vqmmc); > + if (enable_vqmmc) > + ret = regulator_enable(mmc->supply.vqmmc); Please introduce host->vqmmc_enabled = !ret; > + else > + ret = 0; > if (!regulator_is_supported_voltage(mmc->supply.vqmmc, 1700000, > 1950000)) > host->caps1 &= ~(SDHCI_SUPPORT_SDR104 | > @@ -3984,7 +3993,7 @@ int sdhci_setup_host(struct sdhci_host *host) > return 0; > > unreg: > - if (!IS_ERR(mmc->supply.vqmmc)) > + if (!IS_ERR(mmc->supply.vqmmc) && enable_vqmmc) And just make this if (host->vqmmc_enabled) > regulator_disable(mmc->supply.vqmmc); > undma: > if (host->align_buffer) > @@ -4002,7 +4011,8 @@ void sdhci_cleanup_host(struct sdhci_host *host) > { > struct mmc_host *mmc = host->mmc; > > - if (!IS_ERR(mmc->supply.vqmmc)) > + if (!IS_ERR(mmc->supply.vqmmc) && > + (regulator_is_enabled(mmc->supply.vqmmc) > 0)) if (host->vqmmc_enabled) > regulator_disable(mmc->supply.vqmmc); > > if (host->align_buffer) > @@ -4135,7 +4145,8 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) > > tasklet_kill(&host->finish_tasklet); > > - if (!IS_ERR(mmc->supply.vqmmc)) > + if (!IS_ERR(mmc->supply.vqmmc) && > + (regulator_is_enabled(mmc->supply.vqmmc) > 0)) if (host->vqmmc_enabled) > regulator_disable(mmc->supply.vqmmc); > > if (host->align_buffer) >