Re: [PATCH V3 1/2] mmc: mmci: add variant property to set command stop bit

[Ludovic BARRE]

hi Ulf

happy new years.

Just a gentleman ping about patch2 of this series
"mmc: mmci: send stop command to clear the dpsm."

Regards
Ludo

On 12/11/18 10:53 AM, Ludovic BARRE wrote:
> On 12/11/18 10:47 AM, Ulf Hansson wrote:
> > On Thu, 6 Dec 2018 at 16:13, Ludovic Barre <ludovic.Barre@xxxxxx> wrote:
> > > From: Ludovic Barre <ludovic.barre@xxxxxx>
> > >
> > > On cmd12 (STOP_TRANSMISSION), STM32 sdmmc variant needs to set
> > > cmdstop bit in command register. The CPSM ("Command Path State Machine")
> > > treats the command as a Stop Transmission command and signals
> > > abort to the DPSM ("Data Path State Machine").
> > >
> > > Signed-off-by: Ludovic Barre <ludovic.barre@xxxxxx>
> >
> > Applied for next, thanks!
>
> thanks
>
> > Withholding patch2 for a while, as I need some more time to review it.
>
> No problem,
>
> Regards
> Ludo
>
> > Kind regards
> > Uffe
> >
> > > ---
> > > Â drivers/mmc/host/mmci.c | 6 ++++++
> > > Â drivers/mmc/host/mmci.h | 2 ++
> > > Â 2 files changed, 8 insertions(+)
> > >
> > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
> > > index 13fa640..e352f5a 100644
> > > --- a/drivers/mmc/host/mmci.c
> > > +++ b/drivers/mmc/host/mmci.c
> > > @@ -21,6 +21,7 @@
> > > Â #include <linux/err.h>
> > > Â #include <linux/highmem.h>
> > > Â #include <linux/log2.h>
> > > +#include <linux/mmc/mmc.h>
> > > Â #include <linux/mmc/pm.h>
> > > Â #include <linux/mmc/host.h>
> > > Â #include <linux/mmc/card.h>
> > > @@ -274,6 +275,7 @@ static struct variant_data variant_stm32_sdmmc = {
> > > ÂÂÂÂÂÂÂÂ .cmdreg_lrsp_crcÂÂÂÂÂÂÂ = MCI_CPSM_STM32_LRSP_CRC,
> > > ÂÂÂÂÂÂÂÂ .cmdreg_srsp_crcÂÂÂÂÂÂÂ = MCI_CPSM_STM32_SRSP_CRC,
> > > ÂÂÂÂÂÂÂÂ .cmdreg_srspÂÂÂÂÂÂÂÂÂÂÂ = MCI_CPSM_STM32_SRSP,
> > > +ÂÂÂÂÂÂ .cmdreg_stopÂÂÂÂÂÂÂÂÂÂÂ = MCI_CPSM_STM32_CMDSTOP,
> > > ÂÂÂÂÂÂÂÂ .data_cmd_enableÂÂÂÂÂÂÂ = MCI_CPSM_STM32_CMDTRANS,
> > > ÂÂÂÂÂÂÂÂ .irq_pio_maskÂÂÂÂÂÂÂÂÂÂ = MCI_IRQ_PIO_STM32_MASK,
> > > ÂÂÂÂÂÂÂÂ .datactrl_firstÂÂÂÂÂÂÂÂ = true,
> > > @@ -1100,6 +1102,10 @@ mmci_start_command(struct mmci_host *host, 
> > > struct mmc_command *cmd, u32 c)
> > > ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ mmci_reg_delay(host);
> > > ÂÂÂÂÂÂÂÂ }
> > >
> > > +ÂÂÂÂÂÂ if (host->variant->cmdreg_stop &&
> > > +ÂÂÂÂÂÂÂÂÂÂ cmd->opcode == MMC_STOP_TRANSMISSION)
> > > +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂ c |= host->variant->cmdreg_stop;
> > > +
> > > ÂÂÂÂÂÂÂÂ c |= cmd->opcode | host->variant->cmdreg_cpsm_enable;
> > > ÂÂÂÂÂÂÂÂ if (cmd->flags & MMC_RSP_PRESENT) {
> > > ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ if (cmd->flags & MMC_RSP_136)
> > > diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
> > > index 550dd39..2422909 100644
> > > --- a/drivers/mmc/host/mmci.h
> > > +++ b/drivers/mmc/host/mmci.h
> > > @@ -264,6 +264,7 @@ struct mmci_host;
> > > ÂÂ * @cmdreg_lrsp_crc: enable value for long response with crc
> > > ÂÂ * @cmdreg_srsp_crc: enable value for short response with crc
> > > ÂÂ * @cmdreg_srsp: enable value for short response without crc
> > > + * @cmdreg_stop: enable value for stop and abort transmission
> > > ÂÂ * @datalength_bits: number of bits in the MMCIDATALENGTH register
> > > ÂÂ * @fifosize: number of bytes that can be written when 
> > > MMCI_TXFIFOEMPTY
> > > ÂÂ *ÂÂÂÂÂÂÂÂÂÂ is asserted (likewise for RX)
> > > @@ -316,6 +317,7 @@ struct variant_data {
> > > ÂÂÂÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ cmdreg_lrsp_crc;
> > > ÂÂÂÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ cmdreg_srsp_crc;
> > > ÂÂÂÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ cmdreg_srsp;
> > > +ÂÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ cmdreg_stop;
> > > ÂÂÂÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ datalength_bits;
> > > ÂÂÂÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ fifosize;
> > > ÂÂÂÂÂÂÂÂ unsigned intÂÂÂÂÂÂÂÂÂÂÂ fifohalfsize;
> > > --
> > > 2.7.4