mmc: mediatek: add support for SDIO async IRQ
v8 cover mmc: mediatek: add support for SDIO async IRQ
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 | 23 +++- drivers/mmc/core/sdio.c | 17 +++ drivers/mmc/host/mtk-sd.c | 100 ++++++++++++++++-- include/linux/mmc/card.h | 8 +- include/linux/mmc/sdio.h | 5 + 5 files changed, 143 insertions(+), 10 deletions(-)
Signature · 8 lines
2.25.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v8 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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +22 -1
@@ -69,12 +69,23 @@ 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 + - const: state_dat1 pinctrl-0: description:
@@ -86,6 +97,16 @@ properties: should contain uhs mode pin ctrl. maxItems: 1 + pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + + pinctrl-3: + description: + should switch SDIO dat1 pin from GPIO mode back to SDIO mode. + maxItems: 1 + assigned-clocks: description: PLL of the source clock.
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH v8 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Quoted 42 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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +12
-1@@ -69,12 +69,23 @@ 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 + - const: state_dat1 pinctrl-0: description:@@ -86,6 +97,16 @@ properties: should contain uhs mode pin ctrl.
Documentation/devicetree/bindings/mmc/mtk-sd.yaml properties: · line 107
Quoted 10 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +8
-0maxItems: 1 + pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + + pinctrl-3: + description: + should switch SDIO dat1 pin from GPIO mode back to SDIO mode.
How is this different than pinctrl-0?
Quoted 9 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +2
-0+ maxItems: 1 + assigned-clocks: description: PLL of the source clock.Signature · 1 line
2.25.1
Re: [PATCH v8 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Quoted 52 lines · Rob Herring
Quoted 51 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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +2
-1@@ -69,12 +69,23 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To support SDIOin-band wakeup, an extended
+ interrupt is required and be configured as wakeup source
irq.Documentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ minItems: 1 + maxItems: 2 pinctrl-names: + description: + Should at least contain default and state_uhs. To supportSDIO in-band wakeup, dat1 pin
+ will be switched between GPIO mode and SDIO DAT1 mode,state_eintandstate_dat1areDocumentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ mandatory in this scenarios. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint + - const: state_dat1 pinctrl-0: description:@@ -86,6 +97,16 @@ properties: should contain uhs mode pin ctrl. maxItems: 1
Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +8
-0+ pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + + pinctrl-3: + description: + should switch SDIO dat1 pin from GPIO mode back to SDIOmode.
How is this different than pinctrl-0?
pinctrl-0 contains default settings for all IO pins(CLK/CMD/DAT). pinctrl-1 contains settings for all IO pins(CLK/CMD/DAT) in UHS mode. pinctrl-3 is lightweight pinctrl-1, only keep SDIO DAT1 pin function switch part.
...
Regards,
Axe
AngeloGioacchino Del Regno
maintainerRe: [PATCH v8 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Il 22/03/22 02:35, Axe Yang ha scritto:
Quoted 65 lines · Rob Herring
Quoted 52 lines · Axe Yang
Quoted 51 lines
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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +2
-1@@ -69,12 +69,23 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To support SDIOin-band wakeup, an extended
+ interrupt is required and be configured as wakeup source
irq.Documentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ minItems: 1 + maxItems: 2 pinctrl-names: + description: + Should at least contain default and state_uhs. To supportSDIO in-band wakeup, dat1 pin
+ will be switched between GPIO mode and SDIO DAT1 mode,state_eintandstate_dat1areDocumentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ mandatory in this scenarios. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint + - const: state_dat1 pinctrl-0: description:@@ -86,6 +97,16 @@ properties: should contain uhs mode pin ctrl. maxItems: 1Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +8
-0+ pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + + pinctrl-3: + description: + should switch SDIO dat1 pin from GPIO mode back to SDIOmode.
How is this different than pinctrl-0?
Quoted 5 lines
pinctrl-0 contains default settings for all IO pins(CLK/CMD/DAT). pinctrl-1 contains settings for all IO pins(CLK/CMD/DAT) in UHS mode. pinctrl-3 is lightweight pinctrl-1, only keep SDIO DAT1 pin function switch part.
Is there any particular reason why we cannot simply select pinctrl-1 again instead of pinctrl-3, apart from the virtually not existent overhead of one more mmio write?
Quoted 5 lines
...
Regards,
Axe
Re: [PATCH v8 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Hello AngeloGioacchino,
Quoted 79 lines · AngeloGioacchino Del Regno
Il 22/03/22 02:35, Axe Yang ha scritto:
Quoted 70 lines · Rob Herring
Quoted 57 lines · Axe Yang
Quoted 56 lines
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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +2
-1@@ -69,12 +69,23 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To supportSDIO
in-band wakeup, an extended
+ interrupt is required and be configured as wakeup source
irq.Documentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ minItems: 1 + maxItems: 2 pinctrl-names: + description: + Should at least contain default and state_uhs. Tosupport
SDIO in-band wakeup, dat1 pin
+ will be switched between GPIO mode and SDIO DAT1 mode,state_eintandstate_dat1areDocumentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ mandatory in this scenarios. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint + - const: state_dat1 pinctrl-0: description:@@ -86,6 +97,16 @@ properties: should contain uhs mode pin ctrl. maxItems: 1Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +8
-0+ pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + + pinctrl-3: + description: + should switch SDIO dat1 pin from GPIO mode back to SDIOmode.
How is this different than pinctrl-0?
Quoted 7 lines
pinctrl-0 contains default settings for all IO pins(CLK/CMD/DAT). pinctrl-1 contains settings for all IO pins(CLK/CMD/DAT) in UHS mode.
pinctrl-3 is lightweight pinctrl-1, only keep SDIO DAT1 pin function
switch part.
Quoted 4 lines
Is there any particular reason why we cannot simply select pinctrl-1 again
instead of pinctrl-3, apart from the virtually not existent overhead of one more mmio write?
No, there is no particular reason.
I just want to do the pin function switch quick and clean.
The intention of pinctrl-1 is to set the most initial state of IO pins in UHS mode. If I don't need to adjust IO settings any longer, it is okay to select pinctrl-1 state instead of pinctrl-3.
But think about this scenarios: after initial SDIO IO pins to UHS mode, I want to adjust some IO related properties, such as driving strength. And I want to keep these settings because with new driving strength, the signal is better. I'd rather to choose pinctrl-3 but not pinctrl-1, because I do not want the change be restored after next runtime resume.
Regards,
Axe
Rob Herring
maintainerRe: [PATCH v8 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Quoted 90 lines · Axe Yang
Hello AngeloGioacchino,
Quoted 79 lines · AngeloGioacchino Del Regno
Il 22/03/22 02:35, Axe Yang ha scritto:
Quoted 70 lines · Rob Herring
Quoted 57 lines · Axe Yang
Quoted 56 lines
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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)Documentation/devicetree/bindings/mmc/mtk-sd.yaml +2
-1@@ -69,12 +69,23 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. To supportSDIO
in-band wakeup, an extended
+ interrupt is required and be configured as wakeup source
irq.Documentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ minItems: 1 + maxItems: 2 pinctrl-names: + description: + Should at least contain default and state_uhs. Tosupport
SDIO in-band wakeup, dat1 pin
+ will be switched between GPIO mode and SDIO DAT1 mode,state_eintandstate_dat1areDocumentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ mandatory in this scenarios. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint + - const: state_dat1 pinctrl-0: description:@@ -86,6 +97,16 @@ properties: should contain uhs mode pin ctrl. maxItems: 1Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +8
-0+ pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + + pinctrl-3: + description: + should switch SDIO dat1 pin from GPIO mode back to SDIOmode.
How is this different than pinctrl-0?
Quoted 7 lines
pinctrl-0 contains default settings for all IO pins(CLK/CMD/DAT). pinctrl-1 contains settings for all IO pins(CLK/CMD/DAT) in UHS mode.
pinctrl-3 is lightweight pinctrl-1, only keep SDIO DAT1 pin function
switch part.Quoted 4 lines
Is there any particular reason why we cannot simply select pinctrl-1 again
instead of pinctrl-3, apart from the virtually not existent overhead of one more mmio write?No, there is no particular reason.
I just want to do the pin function switch quick and clean.
Quoted 8 lines
The intention of pinctrl-1 is to set the most initial state of IO pins in UHS mode. If I don't need to adjust IO settings any longer, it is okay to select pinctrl-1 state instead of pinctrl-3.
But think about this scenarios: after initial SDIO IO pins to UHS mode, I want to adjust some IO related properties, such as driving strength. And I want to keep these settings because with new driving strength, the signal is better. I'd rather to choose pinctrl-3 but not pinctrl-1, because I do not want the change be restored after next runtime resume.
The pinctrl-X properties set modes, they aren't supposed to be a state machine.
Rob
Re: [PATCH v8 1/3] dt-bindings: mmc: mtk-sd: extend interrupts and pinctrls properties
Hi Rob,
Sorry, my last mail may mislead your understanding. Let me explain more about this.
Quoted 118 lines · Rob Herring
Quoted 101 lines · Axe Yang
Hello AngeloGioacchino,
Quoted 87 lines · AngeloGioacchino Del Regno
Il 22/03/22 02:35, Axe Yang ha scritto:
Quoted 77 lines · Rob Herring
Quoted 63 lines · Axe Yang
Quoted 62 lines
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 | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)(quoted diff) +0
-0
sd.yamlb/Documentation/devicetree/bindings/mmc/mtk-sd.yamlindex297ada03e3de..f57774535a1d100644Documentation/devicetree/bindings/mmc/mtk-sd.yaml +2
-1@@ -69,12 +69,23 @@ properties: - const: ahb_cg interrupts: - maxItems: 1 + description: + Should at least contain MSDC GIC interrupt. Tosupport
SDIO
in-band wakeup, an extended
+ interrupt is required and be configured as wakeup
source
irq.Documentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ minItems: 1 + maxItems: 2 pinctrl-names: + description: + Should at least contain default and state_uhs. Tosupport
SDIO in-band wakeup, dat1 pin
+ will be switched between GPIO mode and SDIO DAT1
mode,state_eintandstate_dat1areDocumentation/devicetree/bindings/mmc/mtk-sd.yaml +4
-0+ mandatory in this scenarios. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint + - const: state_dat1 pinctrl-0: description:@@ -86,6 +97,16 @@ properties: should contain uhs mode pin ctrl. maxItems: 1Quoted 12 lines
Quoted 10 lines
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +8
-0+ pinctrl-2: + description: + should switch dat1 pin to GPIO mode. + maxItems: 1 + + pinctrl-3: + description: + should switch SDIO dat1 pin from GPIO mode back toSDIO
mode.How is this different than pinctrl-0?
Quoted 8 lines
pinctrl-0 contains default settings for all IO pins(CLK/CMD/DAT).
pinctrl-1 contains settings for all IO pins(CLK/CMD/DAT) in UHS mode.
pinctrl-3 is lightweight pinctrl-1, only keep SDIO DAT1 pin function
switch part.Quoted 6 lines
Is there any particular reason why we cannot simply select pinctrl-1
again
instead of pinctrl-3, apart from the virtually not existent overhead
of one more mmio write?No, there is no particular reason.
I just want to do the pin function switch quick and clean.Quoted 15 lines
The intention of pinctrl-1 is to set the most initial state of IO pins
in UHS mode. If I don't need to adjust IO settings any longer, it is
okay to select pinctrl-1 state instead of pinctrl-3. But think about this scenarios: after initial SDIO IO pins to UHS mode,
I want to adjust some IO related properties, such as driving strength.
And I want to keep these settings because with new driving strength,
the signal is better. I'd rather to choose pinctrl-3 but not pinctrl-1,
because I do not want the change be restored after next runtime resume.
Quoted 3 lines
The pinctrl-X properties set modes, they aren't supposed to be a state
machine
I do use the pinctl-x properties to set modes, but not judge state from pin state.
I need to time-multiplex SDIO DAT1 pin, shift it between GPIO mode and SDIO IO mode, for example:
mmc2_pins_default {
...
};mmc2_pins_uhs {
pins_clk {
pinmux = <PINMUX_GPIO170__FUNC_B1_MSDC2_CLK>;
drive-strength = <MTK_DRIVE_4mA>;
bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
};
pins_cmd_dat {
pinmux = <PINMUX_GPIO169__FUNC_B1_MSDC2_CMD>,
<PINMUX_GPIO171__FUNC_B1_MSDC2_DAT0>,
<PINMUX_GPIO172__FUNC_B1_MSDC2_DAT1>,
<PINMUX_GPIO173__FUNC_B1_MSDC2_DAT2>,
<PINMUX_GPIO174__FUNC_B1_MSDC2_DAT3>;
input-enable;
drive-strength = <MTK_DRIVE_6mA>;
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
};
};mmc2_pins_eint {
pins_dat1 {
pinmux = <PINMUX_GPIO172__FUNC_B_GPIO172>;
input-enable;
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
};
};mmc2_pins_dat1 {
pins_dat1 {
pinmux = <PINMUX_GPIO172__FUNC_B1_MSDC2_DAT1>;
input-enable;
bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
};
};The pinctrl-1(mmc2_pin_uhs) here contain all SDIO IO pins, for the most early initialize. I SELECT pinctrl-1 when I change SDIO to SDR104 mode, before calibration.
And when SDIO bus is idle, I SELECT pinctrl-2(mmc2_pins_eint), use DAT1 as a interrupt line when steping into runtime suspend.
After resume, I SELECT pinctrl-3(mmc2_pins_dat1) to set DAT1 pin back to SDIO IO mode.
I need all the pinctrl-x properties, and take the initiative to set pin mode according to needs.
Best Regard,
Axe
PATCH v8 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 · 7 lines
2.25.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v8 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 named "state_dat1" and "state_eint" are 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",
"state_dat1";
...
pinctrl-2 = <&mmc2_pins_eint>;
pinctrl-3 = <&mmc2_pins_dat1>;
...
cap-sdio-irq;
keep-power-in-suspend;
wakeup-source;
...
};--- drivers/mmc/host/mtk-sd.c | 100 +++++++++++++++++++++++++++++++++++--- 1 file changed, 92 insertions(+), 8 deletions(-)
drivers/mmc/host/mtk-sd.c +92 -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,12 @@ struct msdc_host {struct pinctrl *pinctrl;struct pinctrl_state *pins_default;struct pinctrl_state *pins_uhs; +struct pinctrl_state *pins_eint; +struct pinctrl_state *pins_dat1;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 +470,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 +1533,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 +2639,23 @@ 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)) { +dev_dbg (&pdev->dev,"Cannot find pinctrl eint!\n" ); + }else { + host->pins_dat1 =pinctrl_lookup_state (host->pinctrl,"state_dat1" ); +if (IS_ERR (host->pins_dat1)) { + ret =dev_err_probe (&pdev->dev,PTR_ERR (host->pins_dat1), +"Cannot find pinctrl dat1!\n" ); + goto host_free; + } + + host->sdio_eint_ready = true; + } + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;
@@ -2722,6 +2747,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_dat1); + } + +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 +2774,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 +2886,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 +2911,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_dat1); +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 +2938,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