On Mon, 2022-02-14 at 16:34 +0100, Ulf Hansson wrote:
> On Fri, 21 Jan 2022 at 08:19, Axe Yang <axe.yang@xxxxxxxxxxxx> wrote:
> >
> > If cap-sdio-async-irq flag is set in host dts node, parse EAI
> > information from SDIO CCCR interrupt externsion segment. If async
> > interrupt is supported by SDIO card then send command to card to
> > enable it and set enable_async_irq flag in sdio_cccr structure to
> > 1.
> > The parse flow is implemented in sdio_read_cccr().
> >
> > Acked-by: AngeloGioacchino Del Regno <
> > angelogioacchino.delregno@xxxxxxxxxxxxx>
> > Signed-off-by: Axe Yang <axe.yang@xxxxxxxxxxxx>
> > ---
> > drivers/mmc/core/host.c | 2 ++
> > drivers/mmc/core/sdio.c | 17 +++++++++++++++++
> > include/linux/mmc/card.h | 3 ++-
> > include/linux/mmc/host.h | 1 +
> > include/linux/mmc/sdio.h | 5 +++++
> > 5 files changed, 27 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
> > index cf140f4ec864..a972241548b4 100644
> > --- a/drivers/mmc/core/host.c
> > +++ b/drivers/mmc/core/host.c
> > @@ -410,6 +410,8 @@ int mmc_of_parse(struct mmc_host *host)
> > if (device_property_read_bool(dev, "no-mmc-hs400"))
> > host->caps2 &= ~(MMC_CAP2_HS400_1_8V |
> > MMC_CAP2_HS400_1_2V |
> > MMC_CAP2_HS400_ES);
> > + if (device_property_read_bool(dev, "cap-sdio-async-irq"))
> > + host->caps2 |= MMC_CAP2_SDIO_ASYNC_IRQ;
> >
> > /* Must be after "non-removable" check */
> > if (device_property_read_u32(dev, "fixed-emmc-driver-type",
> > &drv_type) == 0) {
> > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
> > index 41164748723d..771fb5d18585 100644
> > --- a/drivers/mmc/core/sdio.c
> > +++ b/drivers/mmc/core/sdio.c
> > @@ -225,6 +225,23 @@ static int sdio_read_cccr(struct mmc_card
> > *card, u32 ocr)
> > card->sw_caps.sd3_drv_type |=
> > SD_DRIVER_TYPE_C;
> > if (data & SDIO_DRIVE_SDTD)
> > card->sw_caps.sd3_drv_type |=
> > SD_DRIVER_TYPE_D;
> > +
> > + if (card->host->caps2 &
> > MMC_CAP2_SDIO_ASYNC_IRQ) {
>
> We can probably check host->pm_caps & MMC_PM_WAKE_SDIO_IRQ here,
> instead of MMC_CAP2_SDIO_ASYNC_IRQ.
Will update this part in next version.
>
> > + ret = mmc_io_rw_direct(card, 0, 0,
> > SDIO_CCCR_INTERRUPT_EXT, 0,
> > + &data);
> > + if (ret)
> > + goto out;
> > +
> > + if (data & SDIO_INTERRUPT_EXT_SAI)
> > {
> > + data |=
> > SDIO_INTERRUPT_EXT_EAI;
> > + ret =
> > mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_INTERRUPT_EXT,
> > + data
> > , NULL);
> > + if (ret)
> > + goto out;
> > +
> > + card->cccr.enable_async_irq
> > = 1;
>
> As you show in the next patch(3), this flag is useful to read for the
> host driver.
>
> However, rather than accessing this flag directly in the host driver,
> can you please add a helper function that takes a struct mmc_card* as
> in-parameter instead?
OK. I will do that in next version.
>
> > + }
> > + }
> > }
> >
> > /* if no uhs mode ensure we check for high speed */
> > diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
> > index 37f975875102..4df9182bc0e6 100644
> > --- a/include/linux/mmc/card.h
> > +++ b/include/linux/mmc/card.h
> > @@ -219,7 +219,8 @@ struct sdio_cccr {
> > wide_bus:1,
> > high_power:1,
> > high_speed:1,
> > - disable_cd:1;
> > + disable_cd:1,
> > + enable_async_irq:1;
> > };
> >
> > struct sdio_cis {
> > diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
> > index 7afb57cab00b..502a5418264c 100644
> > --- a/include/linux/mmc/host.h
> > +++ b/include/linux/mmc/host.h
> > @@ -402,6 +402,7 @@ struct mmc_host {
> > #define MMC_CAP2_CRYPTO 0
> > #endif
> > #define MMC_CAP2_ALT_GPT_TEGRA (1 << 28) /* Host with eMMC
> > that has GPT entry at a non-standard location */
> > +#define MMC_CAP2_SDIO_ASYNC_IRQ (1 << 29) /* SDIO
> > host supports asynchronous interrupt */
> >
> > int fixed_drv_type; /* fixed driver
> > type for non-removable media */
> >
> > diff --git a/include/linux/mmc/sdio.h b/include/linux/mmc/sdio.h
> > index 2a05d1ac4f0e..1ef400f28642 100644
> > --- a/include/linux/mmc/sdio.h
> > +++ b/include/linux/mmc/sdio.h
> > @@ -159,6 +159,11 @@
> > #define SDIO_DTSx_SET_TYPE_A (1 << SDIO_DRIVE_DTSx_SHIFT)
> > #define SDIO_DTSx_SET_TYPE_C (2 << SDIO_DRIVE_DTSx_SHIFT)
> > #define SDIO_DTSx_SET_TYPE_D (3 << SDIO_DRIVE_DTSx_SHIFT)
> > +
> > +#define SDIO_CCCR_INTERRUPT_EXT 0x16
> > +#define SDIO_INTERRUPT_EXT_SAI (1 << 0)
> > +#define SDIO_INTERRUPT_EXT_EAI (1 << 1)
> > +
> > /*
> > * Function Basic Registers (FBR)
> > */
>
Regards,
Axe Yang
