From: Ulf Hansson <ulf.hansson@linaro.org> To: Ludovic Barre <ludovic.barre@st.com> Cc: Rob Herring <robh+dt@kernel.org>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Alexandre Torgue <alexandre.torgue@st.com>, Linux ARM <linux-arm-kernel@lists.infradead.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, DTML <devicetree@vger.kernel.org>, "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>, linux-stm32@st-md-mailman.stormreply.com Subject: Re: [PATCH 8/9] mmc: mmci: sdmmc: add voltage switch functions Date: Fri, 24 Jan 2020 14:16:34 +0100 [thread overview] Message-ID: <CAPDyKFp1Qsb3yCoTJevHF+SEt5thVVriLfL-4UZSYsNTc0rdMQ@mail.gmail.com> (raw) In-Reply-To: <20200110134823.14882-9-ludovic.barre@st.com> On Fri, 10 Jan 2020 at 14:49, Ludovic Barre <ludovic.barre@st.com> 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 <ludovic.barre@st.com> > --- > 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
WARNING: multiple messages have this Message-ID (diff)
From: Ulf Hansson <ulf.hansson@linaro.org> To: Ludovic Barre <ludovic.barre@st.com> Cc: DTML <devicetree@vger.kernel.org>, Alexandre Torgue <alexandre.torgue@st.com>, "linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Rob Herring <robh+dt@kernel.org>, Srinivas Kandagatla <srinivas.kandagatla@linaro.org>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, linux-stm32@st-md-mailman.stormreply.com, Linux ARM <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH 8/9] mmc: mmci: sdmmc: add voltage switch functions Date: Fri, 24 Jan 2020 14:16:34 +0100 [thread overview] Message-ID: <CAPDyKFp1Qsb3yCoTJevHF+SEt5thVVriLfL-4UZSYsNTc0rdMQ@mail.gmail.com> (raw) In-Reply-To: <20200110134823.14882-9-ludovic.barre@st.com> On Fri, 10 Jan 2020 at 14:49, Ludovic Barre <ludovic.barre@st.com> 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 <ludovic.barre@st.com> > --- > 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-01-24 13:17 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-10 13:48 [PATCH 0/9] mmc: mmci: sdmmc: add sdr104 support Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-10 13:48 ` [PATCH 1/9] mmc: mmci: sdmmc: replace sg_dma_xxx macros Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-10 13:48 ` [PATCH 2/9] mmc: mmci: sdmmc: rename sdmmc_priv struct to sdmmc_idma Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-10 13:48 ` [PATCH 3/9] mmc: mmci: add a reference at mmc_host_ops in mmci struct Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-24 13:09 ` Ulf Hansson 2020-01-24 13:09 ` Ulf Hansson 2020-01-27 10:57 ` Ludovic BARRE 2020-01-27 10:57 ` Ludovic BARRE 2020-01-10 13:48 ` [PATCH 4/9] mmc: mmci: add private pointer for variant Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-10 13:48 ` [PATCH 5/9] dt-bindings: mmc: mmci: add delay block base register for sdmmc Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-15 14:56 ` Rob Herring 2020-01-15 14:56 ` Rob Herring 2020-01-16 9:20 ` Ludovic BARRE 2020-01-16 9:20 ` Ludovic BARRE 2020-01-16 14:33 ` Rob Herring 2020-01-16 14:33 ` Rob Herring 2020-01-16 14:52 ` Ludovic BARRE 2020-01-16 14:52 ` Ludovic BARRE 2020-01-10 13:48 ` [PATCH 6/9] mmc: mmci: sdmmc: add execute tuning with delay block Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-24 13:10 ` Ulf Hansson 2020-01-24 13:10 ` Ulf Hansson 2020-01-27 13:19 ` Ludovic BARRE 2020-01-27 13:19 ` Ludovic BARRE 2020-01-10 13:48 ` [PATCH 7/9] mmc: mmci: add volt_switch callbacks Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-24 13:12 ` Ulf Hansson 2020-01-24 13:12 ` Ulf Hansson 2020-01-27 13:21 ` Ludovic BARRE 2020-01-27 13:21 ` Ludovic BARRE 2020-01-10 13:48 ` [PATCH 8/9] mmc: mmci: sdmmc: add voltage switch functions Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-24 13:16 ` Ulf Hansson [this message] 2020-01-24 13:16 ` Ulf Hansson 2020-01-27 13:50 ` Ludovic BARRE 2020-01-27 13:50 ` Ludovic BARRE 2020-01-10 13:48 ` [PATCH 9/9] mmc: mmci: add sdmmc variant revision 2.0 Ludovic Barre 2020-01-10 13:48 ` Ludovic Barre 2020-01-24 12:55 ` [PATCH 0/9] mmc: mmci: sdmmc: add sdr104 support Ludovic BARRE 2020-01-24 12:55 ` Ludovic BARRE 2020-01-24 13:19 ` Ulf Hansson 2020-01-24 13:19 ` Ulf Hansson 2020-01-27 13:52 ` Ludovic BARRE 2020-01-27 13:52 ` Ludovic BARRE
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=CAPDyKFp1Qsb3yCoTJevHF+SEt5thVVriLfL-4UZSYsNTc0rdMQ@mail.gmail.com \ --to=ulf.hansson@linaro.org \ --cc=alexandre.torgue@st.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=linux-stm32@st-md-mailman.stormreply.com \ --cc=ludovic.barre@st.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=robh+dt@kernel.org \ --cc=srinivas.kandagatla@linaro.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.