mmc: mediatek: add support for SDIO async IRQ
v9 cover mmc: mediatek: add support for SDIO async IRQ
Changes in v9:
- remove pinctrl "state_dat1"
Changes in v8:
- remove maxItems property under pinctrl-names property
Changes in v7:
- add device_init_wakeup() to register SDIO host as wakeup source
Changes in v6:
- abandon cap-sdio-async-irq flag, use wakeup-source flag instead
- extend interrupts and pinctrls in mediatek mmc host controller DT documents
- add mmc_card_enable_async_irq() to access enable_async_irq flag
- simplify wakeup irq implementation with dedicate wake up irq related interface
Changes in v5:
- resort variables to reversed xmas tree order
- restore old copyright year range and add current year back
Changes in v4:
- add MMC_CAP2_SDIO_ASYNC_IRQ judge before lookup eint pinctrl
- replace spin_lock_irqsave() variant with spin_lock() in eint irq handler
Changes in v3:
- correct abbreviations with capital letters in commit message
- replace copyright year with 2022 in mtk-sd.c
- remove unnessary pointer casting
- adjust variable order to reversed xmas tree
- remove a redundant blank line
- refine if statement, following standard pattern
Changes in v2:
- change flag name from 'cap-sdio-async-int' to 'cap-sdio-async-irq'
- change corresponding macro names from xxx_INT to xxx_IRQ
- resort new member in msdc_host structure
- refine function msdc_request_dat1_eint_irq()
- rename msdc_{suspend,resume} function names, add suffix '_noirq'
- add MMC_CAP2_NO_SDIO judgement before parse eint related pin setting
Axe Yang (3):
dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
mmc: core: Add support for SDIO wakeup interrupt
mmc: mediatek: add support for SDIO eint wakup IRQ
.../devicetree/bindings/mmc/mtk-sd.yaml | 17 +++- drivers/mmc/core/sdio.c | 17 ++++ drivers/mmc/host/mtk-sd.c | 94 +++++++++++++++++-- include/linux/mmc/card.h | 8 +- include/linux/mmc/sdio.h | 5 + 5 files changed, 131 insertions(+), 10 deletions(-)
Signature · 1 line
2.25.1
PATCH v9 1/3 dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Extend interrupts and pinctrls for SDIO wakeup interrupt feature. This feature allow SDIO devices alarm asynchronous interrupt to host even when host stop providing clock to SDIO card. An extra wakeup interrupt and pinctrl states for SDIO DAT1 pin state switching are required in this scenario.
--- .../devicetree/bindings/mmc/mtk-sd.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +16 -1
@@ -69,12 +69,22 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To support SDIO in-band wakeup, an extended + interrupt is required and be configured as wakeup source irq. + minItems: 1 + maxItems: 2 pinctrl-names: + description: + Should at least contain default and state_uhs. To support SDIO in-band wakeup, dat1 pin + will be switched between GPIO mode and SDIO DAT1 mode, state_eint and state_dat1 are + mandatory in this scenarios. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint pinctrl-0: description:
@@ -86,6 +96,11 @@ properties: should contain uhs mode pin ctrl. maxItems: 1 + pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + assigned-clocks: description: PLL of the source clock.
Signature · 1 line
2.25.1
Re: [PATCH v9 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Quoted 11 lines · Axe Yang
Extend interrupts and pinctrls for SDIO wakeup interrupt feature. This feature allow SDIO devices alarm asynchronous interrupt to host even when host stop providing clock to SDIO card. An extra wakeup interrupt and pinctrl states for SDIO DAT1 pin state switching are required in this scenario.
Signed-off-by Axe Yang <[email protected]>--- .../devicetree/bindings/mmc/mtk-sd.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
Re: [PATCH v9 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
In reply to Axe YangQuoted 17 lines · Axe Yang
Extend interrupts and pinctrls for SDIO wakeup interrupt feature. This feature allow SDIO devices alarm asynchronous interrupt to host even when host stop providing clock to SDIO card. An extra wakeup interrupt and pinctrl states for SDIO DAT1 pin state switching are required in this scenario.
Signed-off-by Axe Yang <[email protected]>--- .../devicetree/bindings/mmc/mtk-sd.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +0
-0
Documentation/devicetree/bindings/mmc/mtk-sd.yaml properties: · line 74
Quoted 7 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +3
-1@@ -69,12 +69,22 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To support SDIO in-band wakeup, an extended + interrupt is required and be configured as wakeup source irq.
If I understand correctly, the extended interrupt (a GPIO irq) may not necessarily share the same interrupt parent as the primary device interrupt.
Perhaps it's then better to extend this with "interrupts-extended" instead. See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.
Quoted 29 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +13
-1+ minItems: 1 + maxItems: 2 pinctrl-names: + description: + Should at least contain default and state_uhs. To support SDIO in-band wakeup, dat1 pin + will be switched between GPIO mode and SDIO DAT1 mode, state_eint and state_dat1 are + mandatory in this scenarios. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint pinctrl-0: description:@@ -86,6 +96,11 @@ properties: should contain uhs mode pin ctrl. maxItems: 1 + pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + assigned-clocks: description: PLL of the source clock. --
Quoted 2 lines
2.25.1
Kind regards
Uffe
Re: [PATCH v9 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Quoted 31 lines · Ulf Hansson
Quoted 17 lines · Axe Yang
Extend interrupts and pinctrls for SDIO wakeup interrupt feature. This feature allow SDIO devices alarm asynchronous interrupt to host even when host stop providing clock to SDIO card. An extra wakeup interrupt and pinctrl states for SDIO DAT1 pin state switching are required in this scenario.
Signed-off-by Axe Yang <[email protected]>--- .../devicetree/bindings/mmc/mtk-sd.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +0
-0Documentation/devicetree/bindings/mmc/mtk-sd.yaml properties: · line 74
Quoted 7 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +3
-1@@ -69,12 +69,22 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To support SDIO in-band wakeup, an extended + interrupt is required and be configured as wakeup source irq.If I understand correctly, the extended interrupt (a GPIO irq) may not necessarily share the same interrupt parent as the primary device interrupt.
Quoted 2 lines
Perhaps it's then better to extend this with "interrupts-extended" instead. See
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.
One more thing, looks like using the "interrupt-names" property would be good to use too. To easier distinguish the different irqs.
[...]
Kind regards
Uffe
Rob Herring
maintainerRe: [PATCH v9 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
In reply to Ulf HanssonQuoted 30 lines · Ulf Hansson
Quoted 17 lines · Axe Yang
Extend interrupts and pinctrls for SDIO wakeup interrupt feature. This feature allow SDIO devices alarm asynchronous interrupt to host even when host stop providing clock to SDIO card. An extra wakeup interrupt and pinctrl states for SDIO DAT1 pin state switching are required in this scenario.
Signed-off-by Axe Yang <[email protected]>--- .../devicetree/bindings/mmc/mtk-sd.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +0
-0Documentation/devicetree/bindings/mmc/mtk-sd.yaml properties: · line 74
Quoted 7 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +3
-1@@ -69,12 +69,22 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To support SDIO in-band wakeup, an extended + interrupt is required and be configured as wakeup source irq.If I understand correctly, the extended interrupt (a GPIO irq) may not necessarily share the same interrupt parent as the primary device interrupt.
Quoted 2 lines
Perhaps it's then better to extend this with "interrupts-extended" instead. See
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.
'interrupts-extended' is interchangeable with 'interrupts'. For schemas, use 'interrupts' and the tools take care of supporting both forms.
Rob
Re: [PATCH v9 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Quoted 39 lines · Rob Herring
Quoted 38 lines · Ulf Hansson
Quoted 27 lines · Axe Yang
Extend interrupts and pinctrls for SDIO wakeup interrupt feature. This feature allow SDIO devices alarm asynchronous interrupt to host
even when host stop providing clock to SDIO card. An extra wakeup interrupt and pinctrl states for SDIO DAT1 pin state switching are
required in this scenario.Signed-off-by Axe Yang <[email protected]>--- .../devicetree/bindings/mmc/mtk-sd.yaml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +2
-1@@ -69,12 +69,22 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To supportQuoted 3 lines
SDIO in-band wakeup, an extended
+ interrupt is required and be configured as wakeup source
irq.If I understand correctly, the extended interrupt (a GPIO irq) may not
necessarily share the same interrupt parent as the primary device interrupt.
Quoted 8 lines
Quoted 3 lines
Perhaps it's then better to extend this with "interrupts-extended" instead. See
Documentation/devicetree/bindings/interrupt-controller/interrupts.txt.'interrupts-extended' is interchangeable with 'interrupts'. For schemas,
use 'interrupts' and the tools take care of supporting both forms.
hello Ulf, you are right, the wakeup interrupt(parent is &pio) do not share same parent as primary interrupt(parent is &gic). And as you said, I am using "interrupts-extended" to declare the wakeup irq, see commit message in patch 3/3:
&mmcX {
...
interrupts-extended = <...>,
<&pio xxx IRQ_TYPE_LEVEL_LOW>;
...
pinctrl-names = "default", "state_uhs", "state_eint";
...
pinctrl-2 = <&mmc2_pins_eint>;
...
cap-sdio-irq;
keep-power-in-suspend;
wakeup-source;
...
};But the wakup interrupt is for SDIO only, in most instances, MSDC is been used as eMMC/SD card host, they do not need this interrupt. So as Rob suggested, I think we'd better keep using 'interrupts'. And I will update the description for 'interrupts', suggest to use 'interrupts- extended' to declare SDIO wakeup interrupt.
And 'interrupt-names' is a good idea, I will add this property to document too. Thank you for the advice.
Regards,
Axe
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v9 2/3 mmc: core: Add support for SDIO wakeup interrupt
In reply to Axe YangIf 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().
--- 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(-)
drivers/mmc/core/sdio.c +17 -0
@@ -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 */
include/linux/mmc/card.h +7 -1
@@ -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)
include/linux/mmc/sdio.h +5 -0
@@ -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) */
Signature · 1 line
2.25.1
AngeloGioacchino Del Regno
maintainerRe: [PATCH v9 2/3] mmc: core: Add support for SDIO wakeup interrupt
Il 29/03/22 05:29, Axe Yang ha scritto:
Quoted 8 lines
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_irqflag insdio_cccrstructure to 1. The parse flow is implemented insdio_read_cccr().Signed-off-by Axe Yang <[email protected]>
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
Re: [PATCH v9 2/3] mmc: core: Add support for SDIO wakeup interrupt
Quoted 9 lines · AngeloGioacchino Del Regno
Il 29/03/22 05:29, Axe Yang ha scritto:
Quoted 8 lines
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 setenable_async_irqflag insdio_cccrstructure to 1. The parse flow is
implemented insdio_read_cccr().
Quoted 9 lines
Quoted 3 lines
Acked-by: AngeloGioacchino Del Regno <
[email protected]>Signed-off-by Axe Yang <[email protected]>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
Re: [PATCH v9 2/3] mmc: core: Add support for SDIO wakeup interrupt
In reply to Axe YangQuoted 20 lines · Axe Yang
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_irqflag insdio_cccrstructure to 1. The parse flow is implemented insdio_read_cccr().Signed-off-by Axe Yang <[email protected]>--- 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(-)drivers/mmc/core/sdio.c +0
-0
drivers/mmc/core/sdio.c static int sdio_read_cccr(struct mmc_card *card, u32 ocr) · line 230
Quoted 5 lines
drivers/mmc/core/sdio.c +2
-0@@ -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.
Quoted 6 lines
drivers/mmc/core/sdio.c +6
-0+ ret =mmc_io_rw_direct (card,0 ,0 ,SDIO_CCCR_INTERRUPT_EXT ,0 , + &data); +if (ret) + goto out; + +if (data &SDIO_INTERRUPT_EXT_SAI ) {
drivers/mmc/core/sdio.c static int sdio_read_cccr(struct mmc_card *card, u32 ocr) · line 246
Quoted 10 lines
drivers/mmc/core/sdio.c +9
-0+ 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
Re: [PATCH v9 2/3] mmc: core: Add support for SDIO wakeup interrupt
Quoted 55 lines · Ulf Hansson
Quoted 31 lines · Axe Yang
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 setenable_async_irqflag insdio_cccrstructure to 1. The parse flow is
implemented insdio_read_cccr().Acked-by: AngeloGioacchino Del Regno <
[email protected]>Signed-off-by Axe Yang <[email protected]>--- 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(-)drivers/mmc/core/sdio.c +2
-0@@ -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 &Quoted 1 line
MMC_PM_WAKE_SDIO_IRQ) {After a second thought, I think we can just skip this check. The
MMC_PM_WAKE_SDIO_IRQindicates 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.Quoted 14 lines
+ ret = mmc_io_rw_direct(card, 0, 0,
SDIO_CCCR_INTERRUPT_EXT, 0,drivers/mmc/core/sdio.c +5
-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);
Quoted 10 lines
drivers/mmc/core/sdio.c static int sdio_read_cccr(struct mmc_card *card, u32 ocr) · line 246
Quoted 8 lines
drivers/mmc/core/sdio.c +4
-0+if (ret) + goto out; + + card->cccr.enable_async_irq= 1;
drivers/mmc/core/sdio.c +2
-0+ } + } }
Will skip this check in next version. Thanks.
Regards,
Axe
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v9 3/3 mmc: mediatek: add support for SDIO eint wakup IRQ
In reply to Axe YangAdd support for eint IRQ when MSDC is used as an SDIO host. This feature requires SDIO device support async IRQ function. With this feature, SDIO host can be awakened by SDIO card in suspend state, without additional pin.
MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC turn off clock and switch SDIO DAT1 pin to GPIO mode. And during resume, switch GPIO function back to DAT1 mode then turn on clock.
Some device tree property should be added or modified in MSDC node to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since this feature depends on asynchronous interrupts, "wakeup-source", "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and the interrupts list should be extended:
&mmcX {
...
interrupts-extended = <...>,
<&pio xxx IRQ_TYPE_LEVEL_LOW>;
...
pinctrl-names = "default", "state_uhs", "state_eint";
...
pinctrl-2 = <&mmc2_pins_eint>;
...
cap-sdio-irq;
keep-power-in-suspend;
wakeup-source;
...
};--- drivers/mmc/host/mtk-sd.c | 94 +++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 8 deletions(-)
drivers/mmc/host/mtk-sd.c +86 -8
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2014-2015 MediaTek Inc. +* Copyright (c) 2014-2015, 2022 MediaTek Inc. * Author: Chaotian.Jing <[email protected]> */
@@ -20,6 +20,7 @@#include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/pm_wakeirq.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/spinlock.h>
@@ -440,8 +441,11 @@ struct msdc_host {struct pinctrl *pinctrl;struct pinctrl_state *pins_default;struct pinctrl_state *pins_uhs; +struct pinctrl_state *pins_eint;struct delayed_work req_timeout;int irq;/* host interrupt */ +int eint_irq;/* interrupt from sdio device for waking up system */ +int sdio_wake_irq_depth;struct reset_control *reset;struct clk *src_clk;/* msdc source clock */
@@ -465,6 +469,7 @@ struct msdc_host {bool hs400_tuning;/* hs400 mode online tuning */ bool internal_cd;/* Use internal card-detect logic */ bool cqhci;/* support eMMC hw cmdq */ +bool sdio_eint_ready;/* Ready to support SDIO eint interrupt */ struct msdc_save_para save_para;/* used when gate HCLK */ struct msdc_tune_para def_tune_para;/* default tune setting */ struct msdc_tune_para saved_tune_para;/* tune result of CMD21/CMD19 */
@@ -1527,10 +1532,12 @@ static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb)__msdc_enable_sdio_irq (host, enb);spin_unlock_irqrestore (&host->lock, flags); -if (enb) -pm_runtime_get_noresume (host->dev); -else -pm_runtime_put_noidle (host->dev); +if (mmc->card && !mmc_card_enable_async_irq (mmc->card)) { +if (enb) +pm_runtime_get_noresume (host->dev); +else +pm_runtime_put_noidle (host->dev); + } }static irqreturn_t msdc_cmdq_irq (struct msdc_host *host,u32 intsts)
@@ -2631,6 +2638,18 @@ static int msdc_drv_probe(struct platform_device *pdev) goto host_free; } +/* Support for SDIO eint irq ? */ +if (mmc->pm_caps &MMC_PM_WAKE_SDIO_IRQ ) { + host->pins_eint =pinctrl_lookup_state (host->pinctrl,"state_eint" ); +if (IS_ERR (host->pins_eint)) { + ret =dev_err_probe (&pdev->dev,PTR_ERR (host->pins_eint), +"Cannot find pinctrl eint!\n" ); + goto host_free; + } + + host->sdio_eint_ready = true; + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;
@@ -2722,6 +2741,21 @@ static int msdc_drv_probe(struct platform_device *pdev)if (ret) goto release; +if (host->sdio_eint_ready) { + host->eint_irq =irq_of_parse_and_map (host->dev->of_node,1 ); + ret = host->eint_irq ?dev_pm_set_dedicated_wake_irq (host->dev, host->eint_irq) : + -ENODEV ; + +if (ret) { +dev_err (host->dev,"Failed to register data1 eint irq!\n" ); + goto release; + } + +dev_pm_disable_wake_irq (host->dev); +pinctrl_select_state (host->pinctrl, host->pins_uhs); + } + +device_init_wakeup (host->dev, true);pm_runtime_set_active (host->dev);pm_runtime_set_autosuspend_delay (host->dev,MTK_MMC_AUTOSUSPEND_DELAY );pm_runtime_use_autosuspend (host->dev);
@@ -2734,6 +2768,7 @@ static int msdc_drv_probe(struct platform_device *pdev)return 0 ; end:pm_runtime_disable (host->dev); +dev_pm_clear_wake_irq (host->dev); release:platform_set_drvdata (pdev,NULL );msdc_deinit_hw (host);
@@ -2845,6 +2880,16 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev)struct msdc_host *host =mmc_priv (mmc);msdc_save_reg (host); + +if (host->sdio_eint_ready) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (host->sdio_wake_irq_depth ==0 ) { +dev_pm_enable_wake_irq (dev); + host->sdio_wake_irq_depth++; + } +sdr_clr_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }msdc_gate_clock (host);return 0 ; }
@@ -2860,12 +2905,25 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev)return ret;msdc_restore_reg (host); + +if (host->sdio_eint_ready) { +if (host->sdio_wake_irq_depth >0 ) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; +sdr_set_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }else { +sdr_clr_bits (host->base +MSDC_INTEN ,MSDC_INTEN_SDIOIRQ ); + } +pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; } -static int __maybe_unused msdc_suspend (struct device *dev) +static int __maybe_unused msdc_suspend_noirq (struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc);int ret;if (mmc->caps2 &MMC_CAP2_CQE ) {
@@ -2874,16 +2932,36 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +if (host->sdio_eint_ready) +enable_irq_wake (host->eint_irq); +return pm_runtime_force_suspend (dev); } -static int __maybe_unused msdc_resume (struct device *dev) +static int __maybe_unused msdc_resume_noirq (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->sdio_eint_ready) { +disable_irq_wake (host->eint_irq); + +/* +* In noirq resume stage, msdc_runtime_resume() +* won't be called, so disalbe wake irq here +* to block dedicated wake irq handler callback. +*/ +if (likely (host->sdio_wake_irq_depth >0 )) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; + } + } +return pm_runtime_force_resume (dev); }static const struct dev_pm_ops msdc_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msdc_suspend_noirq, msdc_resume_noirq)SET_RUNTIME_PM_OPS (msdc_runtime_suspend, msdc_runtime_resume,NULL ) };
Signature · 1 line
2.25.1
Re: [PATCH v9 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Quoted 30 lines · Axe Yang
Add support for eint IRQ when MSDC is used as an SDIO host. This feature requires SDIO device support async IRQ function. With this feature, SDIO host can be awakened by SDIO card in suspend state, without additional pin.
MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC turn off clock and switch SDIO DAT1 pin to GPIO mode. And during resume, switch GPIO function back to DAT1 mode then turn on clock.
Some device tree property should be added or modified in MSDC node to support SDIO eint IRQ. Pinctrls "
state_eint" is mandatory. Since this feature depends on asynchronous interrupts, "wakeup-source", "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and the interrupts list should be extended:&mmcX { ... interrupts-extended = <...>, <&pio xxx IRQ_TYPE_LEVEL_LOW>; ... pinctrl-names = "default", "state_uhs", "state_eint"; ... pinctrl-2 = <&mmc2_pins_eint>; ... cap-sdio-irq; keep-power-in-suspend; wakeup-source; ... };
Quoted 3 lines
Co-developed-by Yong Mao <[email protected]>Signed-off-by Yong Mao <[email protected]>Signed-off-by Axe Yang <[email protected]>
Quoted 215 lines
--- drivers/mmc/host/mtk-sd.c | 94 +++++++++++++++++++++++++++++++++++ ---- 1 file changed, 86 insertions(+), 8 deletions(-)drivers/mmc/host/mtk-sd.c +4
-1@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2014-2015 MediaTek Inc. +* Copyright (c) 2014-2015, 2022 MediaTek Inc. * Author: Chaotian.Jing <[email protected]> */ @@ -20,6 +20,7 @@#include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/pm_wakeirq.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -440,8 +441,11 @@ struct msdc_host {struct pinctrl *pinctrl;struct pinctrl_state *pins_default;struct pinctrl_state *pins_uhs; +struct pinctrl_state *pins_eint;struct delayed_work req_timeout;int irq;/* host interrupt */ +int eint_irq;/* interrupt from sdio device for waking up system */
drivers/mmc/host/mtk-sd.c +2
-0+int sdio_wake_irq_depth;struct reset_control *reset;struct clk *src_clk;/* msdc source clock */ @@ -465,6 +469,7 @@ struct msdc_host {bool hs400_tuning;/* hs400 mode online tuning */ bool internal_cd;/* Use internal card-detect logic */ bool cqhci;/* support eMMC hw cmdq */ +bool sdio_eint_ready;/* Ready to support SDIO eint interrupt */
drivers/mmc/host/mtk-sd.c +0
-0struct msdc_save_para save_para;/* used when gate HCLK */ struct msdc_tune_para def_tune_para;/* default tune setting */ struct msdc_tune_para saved_tune_para;/* tune result of CMD21/CMD19 */
drivers/mmc/host/mtk-sd.c +6
-4@@ -1527,10 +1532,12 @@ static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb)__msdc_enable_sdio_irq (host ,enb );spin_unlock_irqrestore (&host->lock, flags); -if (enb) -pm_runtime_get_noresume (host->dev); -else -pm_runtime_put_noidle (host->dev); +if (mmc->card && !mmc_card_enable_async_irq (mmc->card)) { +if (enb) +pm_runtime_get_noresume (host->dev); +else +pm_runtime_put_noidle (host->dev); + } }static
irqreturn_tmsdc_cmdq_irq(struct msdc_host *host, u32 intsts)drivers/mmc/host/mtk-sd.c +6
-0@@ -2631,6 +2638,18 @@ static int msdc_drv_probe(struct platform_device *pdev) goto host_free; } +/* Support for SDIO eint irq ? */ +if (mmc->pm_caps &MMC_PM_WAKE_SDIO_IRQ ) { + host->pins_eint =pinctrl_lookup_state (host->pinctrl,"state_eint" ); +if (IS_ERR (host->pins_eint)) { + ret = dev_err_probe(&pdev->dev, PTR_ERR(host- >pins_eint), + "Cannot find pinctrleint!\n");
drivers/mmc/host/mtk-sd.c +9
-0+ goto host_free; + } + + host->sdio_eint_ready = true; + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;@@ -2722,6 +2741,21 @@ static int msdc_drv_probe(struct platform_device *pdev)if (ret) goto release; +if (host->sdio_eint_ready) { + host->eint_irq =irq_of_parse_and_map (host->dev- >of_node, 1); + ret = host->eint_irq ?
dev_pm_set_dedicated_wake_irq(host->dev, host->eint_irq):drivers/mmc/host/mtk-sd.c +4
-0+ -ENODEV ; + +if (ret) { + dev_err(host->dev, "Failed to register data1eint irq!\n");
drivers/mmc/host/mtk-sd.c +8
-0+ goto release; + } + +dev_pm_disable_wake_irq (host->dev); +pinctrl_select_state (host->pinctrl, host->pins_uhs); + } + +device_init_wakeup (host->dev, true);pm_runtime_set_active (host->dev); pm_runtime_set_autosuspend_delay(host->dev,
MTK_MMC_AUTOSUSPEND_DELAY);drivers/mmc/host/mtk-sd.c +1
-0pm_runtime_use_autosuspend (host->dev);@@ -2734,6 +2768,7 @@ static int msdc_drv_probe(struct platform_device *pdev)return 0 ; end:pm_runtime_disable (host->dev); +dev_pm_clear_wake_irq (host->dev); release:platform_set_drvdata (pdev,NULL );drivers/mmc/host/mtk-sd.c +10
-0msdc_deinit_hw (host);@@ -2845,6 +2880,16 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev) struct msdc_host *host = mmc_priv(mmc);msdc_save_reg (host); + +if (host->sdio_eint_ready) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (host->sdio_wake_irq_depth ==0 ) { +dev_pm_enable_wake_irq (dev); + host->sdio_wake_irq_depth++; + } +sdr_clr_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }msdc_gate_clock (host);return 0 ;}
drivers/mmc/host/mtk-sd.c +14
-1@@ -2860,12 +2905,25 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev) return ret;msdc_restore_reg (host); + +if (host->sdio_eint_ready) { +if (host->sdio_wake_irq_depth >0 ) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; +sdr_set_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }else { +sdr_clr_bits (host->base +MSDC_INTEN ,MSDC_INTEN_SDIOIRQ ); + } +pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; } -static int __maybe_unused msdc_suspend (struct device *dev) +static int __maybe_unused msdc_suspend_noirq (struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc);drivers/mmc/host/mtk-sd.c +22
-2int ret;if (mmc->caps2 &MMC_CAP2_CQE ) {@@ -2874,16 +2932,36 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +if (host->sdio_eint_ready) +enable_irq_wake (host->eint_irq); +return pm_runtime_force_suspend (dev); } -static int __maybe_unused msdc_resume (struct device *dev) +static int __maybe_unused msdc_resume_noirq (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->sdio_eint_ready) { +disable_irq_wake (host->eint_irq); + +/* +* In noirq resume stage, msdc_runtime_resume() +* won't be called, so disalbe wake irq here +* to block dedicated wake irq handler callback. +*/ +if (likely (host->sdio_wake_irq_depth >0 )) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; + } + } +return pm_runtime_force_resume (dev); }static const struct dev_pm_ops msdc_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msdc_suspend_noirq, msdc_resume_noirq) SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume,NULL)
};
Re: [PATCH v9 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
In reply to Axe YangQuoted 78 lines · Axe Yang
Add support for eint IRQ when MSDC is used as an SDIO host. This feature requires SDIO device support async IRQ function. With this feature, SDIO host can be awakened by SDIO card in suspend state, without additional pin.
MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC turn off clock and switch SDIO DAT1 pin to GPIO mode. And during resume, switch GPIO function back to DAT1 mode then turn on clock.
Some device tree property should be added or modified in MSDC node to support SDIO eint IRQ. Pinctrls "
state_eint" is mandatory. Since this feature depends on asynchronous interrupts, "wakeup-source", "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and the interrupts list should be extended:&mmcX { ... interrupts-extended = <...>, <&pio xxx IRQ_TYPE_LEVEL_LOW>; ... pinctrl-names = "default", "state_uhs", "state_eint"; ... pinctrl-2 = <&mmc2_pins_eint>; ... cap-sdio-irq; keep-power-in-suspend; wakeup-source; ... };Co-developed-by Yong Mao <[email protected]>Signed-off-by Yong Mao <[email protected]>Signed-off-by Axe Yang <[email protected]>--- drivers/mmc/host/mtk-sd.c | 94 +++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 8 deletions(-)drivers/mmc/host/mtk-sd.c +6
-1@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2014-2015 MediaTek Inc. +* Copyright (c) 2014-2015, 2022 MediaTek Inc. * Author: Chaotian.Jing <[email protected]> */ @@ -20,6 +20,7 @@#include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/pm_wakeirq.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -440,8 +441,11 @@ struct msdc_host {struct pinctrl *pinctrl;struct pinctrl_state *pins_default;struct pinctrl_state *pins_uhs; +struct pinctrl_state *pins_eint;struct delayed_work req_timeout;int irq;/* host interrupt */ +int eint_irq;/* interrupt from sdio device for waking up system */ +int sdio_wake_irq_depth;struct reset_control *reset;struct clk *src_clk;/* msdc source clock */ @@ -465,6 +469,7 @@ struct msdc_host {bool hs400_tuning;/* hs400 mode online tuning */ bool internal_cd;/* Use internal card-detect logic */ bool cqhci;/* support eMMC hw cmdq */ +bool sdio_eint_ready;/* Ready to support SDIO eint interrupt */ struct msdc_save_para save_para;/* used when gate HCLK */ struct msdc_tune_para def_tune_para;/* default tune setting */ struct msdc_tune_para saved_tune_para;/* tune result of CMD21/CMD19 */
drivers/mmc/host/mtk-sd.c static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb) · line 1535
Quoted 8 lines
drivers/mmc/host/mtk-sd.c +1
-4@@ -1527,10 +1532,12 @@ static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb)__msdc_enable_sdio_irq (host, enb);spin_unlock_irqrestore (&host->lock, flags); -if (enb) -pm_runtime_get_noresume (host->dev); -else -pm_runtime_put_noidle (host->dev); +if (mmc->card && !mmc_card_enable_async_irq (mmc->card)) {
It might not be obvious, but in fact mmc->card always exists in this case, hence there is no need to check the pointer before using it.
Quoted 12 lines
drivers/mmc/host/mtk-sd.c +5
-0+if (enb) +pm_runtime_get_noresume (host->dev); +else +pm_runtime_put_noidle (host->dev); + } }static irqreturn_t msdc_cmdq_irq (struct msdc_host *host,u32 intsts)@@ -2631,6 +2638,18 @@ static int msdc_drv_probe(struct platform_device *pdev) goto host_free; }
drivers/mmc/host/mtk-sd.c static int msdc_drv_probe(struct platform_device *pdev) · line 2650
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +10
-0+/* Support for SDIO eint irq ? */ +if (mmc->pm_caps &MMC_PM_WAKE_SDIO_IRQ ) { + host->pins_eint =pinctrl_lookup_state (host->pinctrl,"state_eint" ); +if (IS_ERR (host->pins_eint)) { + ret =dev_err_probe (&pdev->dev,PTR_ERR (host->pins_eint), +"Cannot find pinctrl eint!\n" ); + goto host_free; + } + + host->sdio_eint_ready = true;
Rather than using a separate variable, couldn't we just check "if (host->pins_eint)" to know whether wakeup settings shall be managed?
drivers/mmc/host/mtk-sd.c static int msdc_drv_probe(struct platform_device *pdev) · line 2747
Quoted 13 lines
drivers/mmc/host/mtk-sd.c +6
-0+ } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;@@ -2722,6 +2741,21 @@ static int msdc_drv_probe(struct platform_device *pdev)if (ret) goto release; +if (host->sdio_eint_ready) { + host->eint_irq =irq_of_parse_and_map (host->dev->of_node,1 ); + ret = host->eint_irq ?dev_pm_set_dedicated_wake_irq (host->dev, host->eint_irq) : + -ENODEV ;
I think it would make better sense to call dev_pm_set_dedicated_wake_irq() from msdc_enable_sdio_irq(). In this way, you can still support SDIO irqs, even if there are no GPIO irq for available for re-routing.
In other words, if the GPIO irq is available, then that's the best option and we should use that - otherwise we need to keep preventing runtime-suspend by bumping the runtime PM usage count.
drivers/mmc/host/mtk-sd.c static int msdc_drv_probe(struct platform_device *pdev) · line 2758
Quoted 11 lines
drivers/mmc/host/mtk-sd.c +11
-0+ +if (ret) { +dev_err (host->dev,"Failed to register data1 eint irq!\n" ); + goto release; + } + +dev_pm_disable_wake_irq (host->dev); +pinctrl_select_state (host->pinctrl, host->pins_uhs); + } + +device_init_wakeup (host->dev, true);
I think this better belongs under the condition of whether MMC_PM_WAKE_SDIO_IRQ and MMC_PM_KEEP_POWER caps are set.
Quoted 12 lines
drivers/mmc/host/mtk-sd.c +1
-0pm_runtime_set_active (host->dev);pm_runtime_set_autosuspend_delay (host->dev,MTK_MMC_AUTOSUSPEND_DELAY );pm_runtime_use_autosuspend (host->dev);@@ -2734,6 +2768,7 @@ static int msdc_drv_probe(struct platform_device *pdev)return 0 ; end:pm_runtime_disable (host->dev); +dev_pm_clear_wake_irq (host->dev); release:platform_set_drvdata (pdev,NULL );msdc_deinit_hw (host);
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_suspend(struct device *dev) · line 2884
Quoted 5 lines
drivers/mmc/host/mtk-sd.c +2
-0@@ -2845,6 +2880,16 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev)struct msdc_host *host =mmc_priv (mmc);msdc_save_reg (host); + +if (host->sdio_eint_ready) {
The core provides a helper function, sdio_irq_claimed(), that can be used to know whether there is an SDIO irq registered. It looks like that certainly can be useful here.
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_suspend(struct device *dev) · line 2888
Quoted 4 lines
drivers/mmc/host/mtk-sd.c +4
-0+disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (host->sdio_wake_irq_depth ==0 ) { +dev_pm_enable_wake_irq (dev);
This should be managed from the runtime PM core. See rpm_suspend().
Or perhaps there is a reason that doesn't work for you?
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_suspend(struct device *dev) · line 2889
Quoted 1 line
drivers/mmc/host/mtk-sd.c +1
-0+ host->sdio_wake_irq_depth++;
Again, sdio_irq_claimed() is probably better to use.
Quoted 34 lines
drivers/mmc/host/mtk-sd.c +17
-1+ } +sdr_clr_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }msdc_gate_clock (host);return 0 ; }@@ -2860,12 +2905,25 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev)return ret;msdc_restore_reg (host); + +if (host->sdio_eint_ready) { +if (host->sdio_wake_irq_depth >0 ) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; +sdr_set_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }else { +sdr_clr_bits (host->base +MSDC_INTEN ,MSDC_INTEN_SDIOIRQ ); + } +pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; } -static int __maybe_unused msdc_suspend (struct device *dev) +static int __maybe_unused msdc_suspend_noirq (struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc);int ret;if (mmc->caps2 &MMC_CAP2_CQE ) {
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_suspend(struct device *dev) · line 2936
Quoted 5 lines
drivers/mmc/host/mtk-sd.c +2
-0@@ -2874,16 +2932,36 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +if (host->sdio_eint_ready) +enable_irq_wake (host->eint_irq);
The PM core should manage this for us through dpm_suspend_noirq(), I think. We just need to make sure that the runtime PM status of the device has been set to RPM_SUSPENDED before dpm_suspend_noirq() gets called. Have a look at dpm_suspend_noirq() -> device_wakeup_arm_wake_irqs() -> dev_pm_arm_wake_irq().
In other words (and unless I am missing something), if we continue to call pm_runtime_force_suspend() from a ->suspend() callback this should work just fine.
Quoted 12 lines
drivers/mmc/host/mtk-sd.c +7
-1+return pm_runtime_force_suspend (dev); } -static int __maybe_unused msdc_resume (struct device *dev) +static int __maybe_unused msdc_resume_noirq (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->sdio_eint_ready) { +disable_irq_wake (host->eint_irq);
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_suspend(struct device *dev) · line 2957
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +10
-0+ +/* +* In noirq resume stage, msdc_runtime_resume() +* won't be called, so disalbe wake irq here +* to block dedicated wake irq handler callback. +*/ +if (likely (host->sdio_wake_irq_depth >0 )) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; + }
Similar comment as from the system suspend case. I don't think we need to move to the noirq phase.
Or maybe I am missing something here?
Quoted 12 lines
drivers/mmc/host/mtk-sd.c +3
-2+ } +return pm_runtime_force_resume (dev); }static const struct dev_pm_ops msdc_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msdc_suspend_noirq, msdc_resume_noirq)SET_RUNTIME_PM_OPS (msdc_runtime_suspend, msdc_runtime_resume,NULL ) }; --
Quoted 2 lines
2.25.1
Kind regards
Uffe
Re: [PATCH v9 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Quoted 91 lines · Ulf Hansson
Quoted 90 lines · Axe Yang
Add support for eint IRQ when MSDC is used as an SDIO host. This feature requires SDIO device support async IRQ function. With this feature, SDIO host can be awakened by SDIO card in suspend state, without additional pin.
MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC turn off clock and switch SDIO DAT1 pin to GPIO mode. And during resume, switch GPIO function back to DAT1 mode then turn on clock.
Some device tree property should be added or modified in MSDC node to support SDIO eint IRQ. Pinctrls "
state_eint" is mandatory. Since this feature depends on asynchronous interrupts, "wakeup-source", "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and the interrupts list should be extended:&mmcX { ... interrupts-extended = <...>, <&pio xxx IRQ_TYPE_LEVEL_LOW>; ... pinctrl-names = "default", "state_uhs", "state_eint"; ... pinctrl-2 = <&mmc2_pins_eint>; ... cap-sdio-irq; keep-power-in-suspend; wakeup-source; ... };Co-developed-by Yong Mao <[email protected]>Signed-off-by Yong Mao <[email protected]>Signed-off-by Axe Yang <[email protected]>--- drivers/mmc/host/mtk-sd.c | 94 +++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 8 deletions(-)drivers/mmc/host/mtk-sd.c +4
-1@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2014-2015 MediaTek Inc. +* Copyright (c) 2014-2015, 2022 MediaTek Inc. * Author: Chaotian.Jing <[email protected]> */ @@ -20,6 +20,7 @@#include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_runtime.h> +#include <linux/pm_wakeirq.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -440,8 +441,11 @@ struct msdc_host {struct pinctrl *pinctrl;struct pinctrl_state *pins_default;struct pinctrl_state *pins_uhs; +struct pinctrl_state *pins_eint;struct delayed_work req_timeout;int irq;/* host interrupt */ +int eint_irq;/* interrupt from sdio device for waking up system */
drivers/mmc/host/mtk-sd.c +2
-0+int sdio_wake_irq_depth;struct reset_control *reset;struct clk *src_clk;/* msdc source clock */ @@ -465,6 +469,7 @@ struct msdc_host {bool hs400_tuning;/* hs400 mode online tuning */ bool internal_cd;/* Use internal card-detect logic */ bool cqhci;/* support eMMC hw cmdq */ +bool sdio_eint_ready;/* Ready to support SDIO eint interrupt */
structmsdc_save_parasave_para; /* used when gate HCLK */ structmsdc_tune_paradef_tune_para; /* default tune
setting */
structmsdc_tune_parasaved_tune_para; /* tune result of
CMD21/CMD19 */drivers/mmc/host/mtk-sd.c +0
-0@@ -1527,10 +1532,12 @@ static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb)__msdc_enable_sdio_irq (host ,enb );spin_unlock_irqrestore (&host->lock, flags);
Quoted 8 lines
drivers/mmc/host/mtk-sd.c static void msdc_enable_sdio_irq(struct mmc_host *mmc, int enb) · line 1535
Quoted 5 lines
drivers/mmc/host/mtk-sd.c +1
-4-if (enb) -pm_runtime_get_noresume (host->dev); -else -pm_runtime_put_noidle (host->dev); +if (mmc->card && !mmc_card_enable_async_irq (mmc->card)) {It might not be obvious, but in fact
mmc->cardalways exists in this case, hence there is no need to check the pointer before using it.
this check is removed in v10.
Quoted 29 lines
Quoted 24 lines
drivers/mmc/host/mtk-sd.c +5
-0+if (enb) +pm_runtime_get_noresume (host->dev); +else +pm_runtime_put_noidle (host->dev); + } }static
irqreturn_tmsdc_cmdq_irq(structmsdc_host*host, u32
intsts)drivers/mmc/host/mtk-sd.c +6
-0@@ -2631,6 +2638,18 @@ static int msdc_drv_probe(struct platform_device *pdev) goto host_free; } +/* Support for SDIO eint irq ? */ +if (mmc->pm_caps &MMC_PM_WAKE_SDIO_IRQ ) { + host->pins_eint =pinctrl_lookup_state (host- >pinctrl, "state_eint"); +if (IS_ERR (host->pins_eint)) { + ret = dev_err_probe(&pdev->dev, PTR_ERR(host->pins_eint), + "Cannot find pinctrleint!\n");
drivers/mmc/host/mtk-sd.c static int msdc_drv_probe(struct platform_device *pdev) · line 2650
Quoted 4 lines
drivers/mmc/host/mtk-sd.c +4
-0+ goto host_free; + } + + host->sdio_eint_ready = true;
Quoted 2 lines
Rather than using a separate variable, couldn't we just check "if (
host->pins_eint)" to know whether wakeup settings shall be managed?
This variable is removed in v10, use host->pins_eint instead.
Quoted 18 lines
Quoted 15 lines
drivers/mmc/host/mtk-sd.c +5
-0+ } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;@@ -2722,6 +2741,21 @@ static int msdc_drv_probe(struct platform_device *pdev)if (ret) goto release; +if (host->sdio_eint_ready) { + host->eint_irq =irq_of_parse_and_map (host->dev- >of_node, 1); + ret = host->eint_irq ?Quoted 2 lines
dev_pm_set_dedicated_wake_irq(host->dev, host->eint_irq):
+-ENODEV;
Quoted 8 lines
I think it would make better sense to call
dev_pm_set_dedicated_wake_irq()frommsdc_enable_sdio_irq(). In this way, you can still support SDIO irqs, even if there are no GPIO irq for available for re-routing.In other words, if the GPIO irq is available, then that's the best option and we should use that - otherwise we need to keep preventing runtime-suspend by bumping the runtime PM usage count.
dev_pm_set_dedicated_wake_irq() is replaced with dev_pm_set_dedicated_wake_irq_reverse() to assure msdc irq is disabled earlier than enable wake irq in rpm_suspend(), and it is moved to msdc_enable_sdio_irq() phase.
Quoted 10 lines
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed to registerdata1 eint irq!\n");
drivers/mmc/host/mtk-sd.c +5
-0+ goto release; + } + +dev_pm_disable_wake_irq (host->dev); + pinctrl_select_state(host->pinctrl, host-
Quoted 7 lines
drivers/mmc/host/mtk-sd.c static int msdc_drv_probe(struct platform_device *pdev) · line 2758
Quoted 4 lines
Quoted 1 line
pins_uhs);drivers/mmc/host/mtk-sd.c +3
-0+ } + +device_init_wakeup (host->dev, true);I think this better belongs under the condition of whether
MMC_PM_WAKE_SDIO_IRQandMMC_PM_KEEP_POWERcaps are set.
Both of them are checked before parsing eint pinstate in v10.
Quoted 18 lines
Quoted 18 lines
pm_runtime_set_active(host->dev); pm_runtime_set_autosuspend_delay(host->dev, MTK_MMC_AUTOSUSPEND_DELAY); pm_runtime_use_autosuspend(host->dev);drivers/mmc/host/mtk-sd.c +1
-0@@ -2734,6 +2768,7 @@ static int msdc_drv_probe(struct platform_device *pdev)return 0 ; end:pm_runtime_disable (host->dev); +dev_pm_clear_wake_irq (host->dev); release:platform_set_drvdata (pdev,NULL );msdc_deinit_hw(host);drivers/mmc/host/mtk-sd.c +0
-0@@ -2845,6 +2880,16 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev) struct msdc_host *host = mmc_priv(mmc);
Quoted 7 lines
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_suspend(struct device *dev) · line 2884
Quoted 3 lines
drivers/mmc/host/mtk-sd.c +2
-0msdc_save_reg (host); + +if (host->sdio_eint_ready) {The core provides a helper function,
sdio_irq_claimed(), that can be used to know whether there is an SDIO irq registered. It looks like that certainly can be useful here.
Yes. We need sdio_irq_claimed() check since set dedicated wake irq is been moved to claim irq stage.
Quoted 67 lines
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_suspend(struct device *dev) · line 2888
Quoted 6 lines
drivers/mmc/host/mtk-sd.c +4
-0+disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host- >pins_eint); +if (host->sdio_wake_irq_depth ==0 ) { +dev_pm_enable_wake_irq (dev);This should be managed from the runtime PM core. See
rpm_suspend().Or perhaps there is a reason that doesn't work for you?
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_suspend(struct device *dev) · line 2889
Quoted 1 line
drivers/mmc/host/mtk-sd.c +1
-0+ host->sdio_wake_irq_depth++;Again,
sdio_irq_claimed()is probably better to use.Quoted 39 lines
drivers/mmc/host/mtk-sd.c +3
-0+ } +sdr_clr_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }msdc_gate_clock(host); return 0;}
drivers/mmc/host/mtk-sd.c +14
-1@@ -2860,12 +2905,25 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev) return ret;msdc_restore_reg (host); + +if (host->sdio_eint_ready) { +if (host->sdio_wake_irq_depth >0 ) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; +sdr_set_bits (host->base +SDC_CFG ,SDC_CFG_SDIOIDE ); + }else { +sdr_clr_bits (host->base +MSDC_INTEN ,MSDC_INTEN_SDIOIRQ ); + } +pinctrl_select_state (host->pinctrl, host- >pins_uhs); +enable_irq (host->irq); + }return 0 ; } -static int __maybe_unused msdc_suspend (struct device *dev) +static int __maybe_unused msdc_suspend_noirq (struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc);int ret;if (mmc->caps2 &MMC_CAP2_CQE ) {drivers/mmc/host/mtk-sd.c static int __maybe_unused · line 2937
Quoted 6 lines
drivers/mmc/host/mtk-sd.c +2
-0@@ -2874,16 +2932,36 @@ static int __maybe_unused msdc_suspend(struct device *dev) return ret; } +if (host->sdio_eint_ready) +enable_irq_wake (host->eint_irq);The PM core should manage this for us through
dpm_suspend_noirq(), I think. We just need to make sure that the runtime PM status of the device has been set toRPM_SUSPENDEDbeforedpm_suspend_noirq()gets called. Have a look atdpm_suspend_noirq()->device_wakeup_arm_wake_irqs()->dev_pm_arm_wake_irq().
Quoted 3 lines
In other words (and unless I am missing something), if we continue to call
pm_runtime_force_suspend()from a ->suspend() callback this should work just fine.
This part is simplified in v10. dpm/rpm system can manage wake irq well.
Quoted 28 lines
Quoted 13 lines
drivers/mmc/host/mtk-sd.c +7
-1+return pm_runtime_force_suspend (dev); } -static int __maybe_unused msdc_resume (struct device *dev) +static int __maybe_unused msdc_resume_noirq (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->sdio_eint_ready) { +disable_irq_wake (host->eint_irq);drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_suspend(struct device *dev) · line 2957
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +10
-0+ +/* +* In noirq resume stage, msdc_runtime_resume() +* won't be called, so disalbe wake irq here +* to block dedicated wake irq handler callback. +*/ +if (likely (host->sdio_wake_irq_depth >0 )) { +dev_pm_disable_wake_irq (dev); + host->sdio_wake_irq_depth--; + }Similar comment as from the system suspend case. I don't think we need
to move to the noirq phase.
Quoted 1 line
Or maybe I am missing something here?
They are restored to system suspend stage in V10.
But I have to use rpm_suspend()/rpm_resueme() instead of pm_runtime_force_suspend()/pm_runtime_force_resmue(). pm_runtime_force_resume() will go out directly because rpm state is RPM_SUSPENDED in system resume stage.
Quoted 14 lines
Quoted 14 lines
drivers/mmc/host/mtk-sd.c +3
-1+ } +return pm_runtime_force_resume (dev); }static const struct dev_pm_ops msdc_dev_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msdc_suspend_noirq, msdc_resume_noirq) SET_RUNTIME_PM_OPS(msdc_runtime_suspend,
msdc_runtime_resume, NULL)
};
Quoted 4 lines
Quoted 3 lines
--
2.25.1
Regards,
Axe