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=-6.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 14F7BC35242 for ; Fri, 24 Jan 2020 13:17:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E093920718 for ; Fri, 24 Jan 2020 13:17:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="e9RWc7TA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389409AbgAXNRM (ORCPT ); Fri, 24 Jan 2020 08:17:12 -0500 Received: from mail-vs1-f68.google.com ([209.85.217.68]:43992 "EHLO mail-vs1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387736AbgAXNRL (ORCPT ); Fri, 24 Jan 2020 08:17:11 -0500 Received: by mail-vs1-f68.google.com with SMTP id f26so1151362vsk.10 for ; Fri, 24 Jan 2020 05:17:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=CY7ltUl+oKffieFB5UMThEtSPwanbFsXqyW/QH4Ukh0=; b=e9RWc7TAC74AHptTQcr8hXxfjxpt3Z0iET5zEidjYPqHYng8MtDugSWQvHKeBShScB l6F6DVcE6itNBO5dTXEyCYIfAVhN1GUphQxrbM+HQQ1AZM9Ux6fIPYPoEm8cno+PCdHM ywFYIdhzHaHkJb1RvQ21xmiMRinXHLswPI1c5LPyYNEEeq9qdLhEjGE2VnozomaoTw4w /N+NeLRtuOvmaAAWa2oqq5efgDFjwsh7yeAgIFg3BF/bfUF9AkwLqx1s/b9ao84vQphT H3SzbTiol/MbELYfxNcjJx5ZBft9+XrklMQ07BCznmvRb2ufC1wZSC8dY9hurMidqeZ+ p6Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=CY7ltUl+oKffieFB5UMThEtSPwanbFsXqyW/QH4Ukh0=; b=jFGowIAHdUYUFYCzSotIReOgkIrguTPPQA3u1M1fHqgbb8FirqmI+nH5kWDfCC4Ca3 YxAOI6Du6EghwkgikAQ16pZRNYySy1vs/P+qsnAZSRZbGZRR5Q8DZrdkxlhk+BnByjKs lbJpvF+ZmGbZdo4FMMHbnYLD+DkKvkRBbtda3kRSdhg8xnD5x8P7raZmPEyCM8QT1RuU 10Tlxcq+ONmZuzAhTh5wsxvb7yyH8asI1p+OexfWfZuAuny9aiXXV9rScAUDh9Lm8Shh PSoAkTCL8Whb16FPHhGtFW5Hl3OQH/RVbaCEKecNbFaWf76MRlXat5uN04S5LWZA+xU+ Uayg== X-Gm-Message-State: APjAAAXZ0zX/qWVZA6RONQLPan/PiN9vMeXnSfBdUd2grQgnClSQpB2x 9hqoofZR8gEDN9huVIyEImR8KJnQ1RglDgRI/fr7yQ== X-Google-Smtp-Source: APXvYqxuazxpyOLmT7wp2Bb5Qs3z0UkG3lAUPzIzMHC3yzutOc4zmH0KV20Nsdhmyiq1SYfbmAs1J3r1bPtSYgQDFEE= X-Received: by 2002:a67:314e:: with SMTP id x75mr1897330vsx.35.1579871830131; Fri, 24 Jan 2020 05:17:10 -0800 (PST) MIME-Version: 1.0 References: <20200110134823.14882-1-ludovic.barre@st.com> <20200110134823.14882-9-ludovic.barre@st.com> In-Reply-To: <20200110134823.14882-9-ludovic.barre@st.com> From: Ulf Hansson Date: Fri, 24 Jan 2020 14:16:34 +0100 Message-ID: Subject: Re: [PATCH 8/9] mmc: mmci: sdmmc: add voltage switch functions To: Ludovic Barre Cc: Rob Herring , Srinivas Kandagatla , Maxime Coquelin , Alexandre Torgue , Linux ARM , Linux Kernel Mailing List , DTML , "linux-mmc@vger.kernel.org" , linux-stm32@st-md-mailman.stormreply.com Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 10 Jan 2020 at 14:49, Ludovic Barre wrote: > > To prepare the voltage switch procedure, the VSWITCHEN bit must be > set before sending the cmd11. > To confirm completion of voltage switch, the VSWEND flag must be > checked. > > Signed-off-by: Ludovic Barre > --- > drivers/mmc/host/mmci.h | 4 +++ > drivers/mmc/host/mmci_stm32_sdmmc.c | 40 ++++++++++++++++++++++++++++- > 2 files changed, 43 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h > index c04a144259a2..3634f98ad2d8 100644 > --- a/drivers/mmc/host/mmci.h > +++ b/drivers/mmc/host/mmci.h > @@ -165,6 +165,7 @@ > /* Extended status bits for the STM32 variants */ > #define MCI_STM32_BUSYD0 BIT(20) > #define MCI_STM32_BUSYD0END BIT(21) > +#define MCI_STM32_VSWEND BIT(25) > > #define MMCICLEAR 0x038 > #define MCI_CMDCRCFAILCLR (1 << 0) > @@ -182,6 +183,9 @@ > #define MCI_ST_SDIOITC (1 << 22) > #define MCI_ST_CEATAENDC (1 << 23) > #define MCI_ST_BUSYENDC (1 << 24) > +/* Extended clear bits for the STM32 variants */ > +#define MCI_STM32_VSWENDC BIT(25) > +#define MCI_STM32_CKSTOPC BIT(26) > > #define MMCIMASK0 0x03c > #define MCI_CMDCRCFAILMASK (1 << 0) > diff --git a/drivers/mmc/host/mmci_stm32_sdmmc.c b/drivers/mmc/host/mmci_stm32_sdmmc.c > index 10059fa19f4a..9f43cf947c5f 100644 > --- a/drivers/mmc/host/mmci_stm32_sdmmc.c > +++ b/drivers/mmc/host/mmci_stm32_sdmmc.c > @@ -263,7 +263,9 @@ static void mmci_sdmmc_set_pwrreg(struct mmci_host *host, unsigned int pwr) > struct mmc_ios ios = host->mmc->ios; > struct sdmmc_dlyb *dlyb = host->variant_priv; > > - pwr = host->pwr_reg_add; > + /* adds OF options and preserves voltage switch bits */ > + pwr = host->pwr_reg_add | > + (host->pwr_reg & (MCI_STM32_VSWITCHEN | MCI_STM32_VSWITCH)); > > sdmmc_dlyb_input_ck(dlyb); > > @@ -454,6 +456,40 @@ static int sdmmc_execute_tuning(struct mmc_host *mmc, u32 opcode) > return sdmmc_dlyb_phase_tuning(host, opcode); > } > > +static void sdmmc_prep_vswitch(struct mmci_host *host) > +{ > + /* clear the voltage switch completion flag */ > + writel_relaxed(MCI_STM32_VSWENDC, host->base + MMCICLEAR); > + /* enable Voltage switch procedure */ > + mmci_write_pwrreg(host, host->pwr_reg | MCI_STM32_VSWITCHEN); > +} > + > +static int sdmmc_vswitch(struct mmci_host *host, struct mmc_ios *ios) > +{ > + unsigned long flags; > + u32 status; > + int ret = 0; > + > + if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) { > + spin_lock_irqsave(&host->lock, flags); > + mmci_write_pwrreg(host, host->pwr_reg | MCI_STM32_VSWITCH); > + spin_unlock_irqrestore(&host->lock, flags); > + > + /* wait voltage switch completion while 10ms */ > + ret = readl_relaxed_poll_timeout(host->base + MMCISTATUS, > + status, > + (status & MCI_STM32_VSWEND), > + 10, 10000); > + > + writel_relaxed(MCI_STM32_VSWENDC | MCI_STM32_CKSTOPC, > + host->base + MMCICLEAR); > + mmci_write_pwrreg(host, host->pwr_reg & > + ~(MCI_STM32_VSWITCHEN | MCI_STM32_VSWITCH)); > + } Don't you need to manage things when resetting to MMC_SIGNAL_VOLTAGE_330, which for example happens during a card removal or at system suspend/resume? > + > + return ret; > +} > + > static struct mmci_host_ops sdmmc_variant_ops = { > .validate_data = sdmmc_idma_validate_data, > .prep_data = sdmmc_idma_prep_data, > @@ -465,6 +501,8 @@ static struct mmci_host_ops sdmmc_variant_ops = { > .set_clkreg = mmci_sdmmc_set_clkreg, > .set_pwrreg = mmci_sdmmc_set_pwrreg, > .busy_complete = sdmmc_busy_complete, > + .prep_volt_switch = sdmmc_prep_vswitch, > + .volt_switch = sdmmc_vswitch, > }; > > void sdmmc_variant_init(struct mmci_host *host) > -- > 2.17.1 > Kind regards Uffe