| Message ID | 20220329032913.8750-3-axe.yang@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: mediatek: add support for SDIO async IRQ | expand |
Il 29/03/22 05:29, Axe Yang ha scritto: > If wakeup-source flag is set in host dts node, parse EAI information > from SDIO CCCR interrupt externsion segment for in-band wakeup. If > async interrupt is supported by SDIO card then 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@collabora.com> > Signed-off-by: Axe Yang <axe.yang@mediatek.com> Hello Axe, there was a mistake about my tag (my fault, sorry), can you please change it from Acked-by to Reviewed-by? Thanks, Angelo
On Tue, 2022-03-29 at 12:33 +0200, AngeloGioacchino Del Regno wrote: > Il 29/03/22 05:29, Axe Yang ha scritto: > > If wakeup-source flag is set in host dts node, parse EAI > > information > > from SDIO CCCR interrupt externsion segment for in-band wakeup. If > > async interrupt is supported by SDIO card then 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@collabora.com> > > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > > Hello Axe, > there was a mistake about my tag (my fault, sorry), can you please > change it from > Acked-by to Reviewed-by? > Sure, will update that in next version. Regards, Axe Yang
On Tue, 29 Mar 2022 at 05:29, Axe Yang <axe.yang@mediatek.com> wrote: > > If wakeup-source flag is set in host dts node, parse EAI information > from SDIO CCCR interrupt externsion segment for in-band wakeup. If > async interrupt is supported by SDIO card then 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@collabora.com> > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > --- > drivers/mmc/core/sdio.c | 17 +++++++++++++++++ > include/linux/mmc/card.h | 8 +++++++- > include/linux/mmc/sdio.h | 5 +++++ > 3 files changed, 29 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c > index 25799accf8a0..4898c5e9a299 100644 > --- a/drivers/mmc/core/sdio.c > +++ b/drivers/mmc/core/sdio.c > @@ -226,6 +226,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->pm_caps & MMC_PM_WAKE_SDIO_IRQ) { After a second thought, I think we can just skip this check. The MMC_PM_WAKE_SDIO_IRQ indicates that the host supports SDIO IRQs as *system wakeups*. But, in fact, I think we want this feature to be enabled to allow waking up for runtime_suspend (RPM_SUSPENDED) too. > + 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; > + } > + } > } [...] Other than the above, this looks good to me! Kind regards Uffe
On Fri, 2022-04-01 at 14:42 +0200, Ulf Hansson wrote: > On Tue, 29 Mar 2022 at 05:29, Axe Yang <axe.yang@mediatek.com> wrote: > > > > If wakeup-source flag is set in host dts node, parse EAI > > information > > from SDIO CCCR interrupt externsion segment for in-band wakeup. If > > async interrupt is supported by SDIO card then 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@collabora.com> > > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > > --- > > drivers/mmc/core/sdio.c | 17 +++++++++++++++++ > > include/linux/mmc/card.h | 8 +++++++- > > include/linux/mmc/sdio.h | 5 +++++ > > 3 files changed, 29 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c > > index 25799accf8a0..4898c5e9a299 100644 > > --- a/drivers/mmc/core/sdio.c > > +++ b/drivers/mmc/core/sdio.c > > @@ -226,6 +226,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->pm_caps & > > MMC_PM_WAKE_SDIO_IRQ) { > > After a second thought, I think we can just skip this check. The > MMC_PM_WAKE_SDIO_IRQ indicates that the host supports SDIO IRQs as > *system wakeups*. > > But, in fact, I think we want this feature to be enabled to allow > waking up for runtime_suspend (RPM_SUSPENDED) too. > > > + 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; > > + } > > + } > > } > > Will skip this check in next version. Thanks. Regards, Axe
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 25799accf8a0..4898c5e9a299 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -226,6 +226,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->pm_caps & MMC_PM_WAKE_SDIO_IRQ) { + 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; + } + } } /* 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..968650c0b345 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 { @@ -343,6 +344,11 @@ static inline bool mmc_large_sector(struct mmc_card *card) return card->ext_csd.data_sector_size == 4096; } +static inline int mmc_card_enable_async_irq(struct mmc_card *card) +{ + return card->cccr.enable_async_irq; +} + bool mmc_card_is_blockaddr(struct mmc_card *card); #define mmc_card_mmc(c) ((c)->type == MMC_TYPE_MMC) 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) */