mmc: mediatek: add support for SDIO async IRQ
v13 cover mmc: mediatek: add support for SDIO async IRQ
Changes in v13:
- remove state_dat1 related description in mtk-sd.yaml
- move device_init_wakeup() to probe stage
- remove redundancy SDC_CFG_SDIOIDE bit control in msdc_runtime_suspend()
- replace SDC_CFG_SDIOIDE control with __msdc_enable_sdio_irq() function to disable sdio irq when sdio_irq_claimed() return true in msdc_runtime_resume()
- restore to use pm_runtime_force_resume|suspend(), to avoid go out directly in force resume, bump up runtime PM usage counter before force suspend.
Changes in v12:
- assign NULL to pins_eint directly instead of using kfree()
Changes in v11:
- remove '_irq' suffix in interrupts-names property
- fix yaml example build error
- refactor msdc_enable_sdio_irq(), free pins_eint if async irq is not supported
Changes in v10:
- add sample node for SDIO host which support wakeup interrupt in yaml
- skip MMC_PM_WAKE_SDIO_IRQ check before enable SDIO async interrupt
- add MMC_PM_KEEP_POWER check before SDIO eint pinstate parsing
- use dev_pm_set_dedicated_wake_irq_reverse() to correct irq control sequence
- set dedicated irq in msdc_enable_sdio_irq() rather than msdc_drv_probe()
- remove unnecessary wake irq control, rpm/dpm system shall manage that
- move wake irq/msdc irq control back to system suspend phase, use rpm_suspend and rpm_resume to ensure irq control sequence:
disable msdc irq -> enable wake irq -> disable wake irq -> enable msdc irq
- simplify variables, check pins_eint to know whether wakeup settings are managed
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 | 50 ++++++++++- drivers/mmc/core/sdio.c | 14 ++++ drivers/mmc/host/mtk-sd.c | 84 +++++++++++++++++-- include/linux/mmc/card.h | 8 +- include/linux/mmc/sdio.h | 5 ++ 5 files changed, 153 insertions(+), 8 deletions(-)
Signature · 1 line
2.25.1
PATCH v13 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 | 50 ++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/mtk-sd.yaml +49 -1
@@ -72,12 +72,27 @@ 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 + + interrupt-names: + items: + - const: msdc + - const: sdio_wakeup 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 is mandatory in this + scenario. + minItems: 2 items: - const: default - const: state_uhs + - const: state_eint pinctrl-0: description:
@@ -89,6 +104,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.
@@ -208,4 +228,32 @@ examples: mediatek,hs400-cmd-resp-sel-rising; }; + mmc3: mmc@11260000 { + compatible = "mediatek,mt8173-mmc"; + reg = <0x11260000 0x1000>; + clock-names = "source", "hclk"; + clocks = <&pericfg CLK_PERI_MSDC30_3>, + <&topckgen CLK_TOP_MSDC50_2_H_SEL>; + interrupt-names = "msdc", "sdio_wakeup"; + interrupts-extended = <&gic GIC_SPI 74 IRQ_TYPE_LEVEL_LOW 0>, + <&pio 23 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default", "state_uhs", "state_eint"; + pinctrl-0 = <&mmc2_pins_default>; + pinctrl-1 = <&mmc2_pins_uhs>; + pinctrl-2 = <&mmc2_pins_eint>; + bus-width = <4>; + max-frequency = <200000000>; + cap-sd-highspeed; + sd-uhs-sdr104; + keep-power-in-suspend; + wakeup-source; + cap-sdio-irq; + no-mmc; + no-sd; + non-removable; + vmmc-supply = <&sdio_fixed_3v3>; + vqmmc-supply = <&mt6397_vgp3_reg>; + mmc-pwrseq = <&wifi_pwrseq>; + }; + ...
Signature · 1 line
2.25.1
PATCH v13 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 | 14 ++++++++++++++ include/linux/mmc/card.h | 8 +++++++- include/linux/mmc/sdio.h | 5 +++++ 3 files changed, 26 insertions(+), 1 deletion(-)
drivers/mmc/core/sdio.c +14 -0
@@ -226,6 +226,20 @@ 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 ; + + 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
PATCH v13 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(the interrupt named with sdio_wakeup):
&mmcX {
...
interrupt-names = "msdc", "sdio_wakeup";
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 | 84 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-)
drivers/mmc/host/mtk-sd.c +78 -6
@@ -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,10 @@ 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 */ struct reset_control *reset;struct clk *src_clk;/* msdc source clock */
@@ -1520,17 +1523,46 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)static void msdc_enable_sdio_irq (struct mmc_host *mmc,int enb) { -unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__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_enable_async_irq (mmc->card) && host->pins_eint) { +if (enb) { +/* +* In dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to +* GPIO mode. We need to restore it to SDIO DAT1 mode after that. +* Since the current pinstate is pins_uhs, to ensure pinctrl select take +* affect successfully, we change the pinstate to pins_eint firstly. +*/ +pinctrl_select_state (host->pinctrl, host->pins_eint); + ret =dev_pm_set_dedicated_wake_irq_reverse (host->dev, host->eint_irq); + +if (ret) { +dev_err (host->dev,"Failed to register SDIO wakeup irq!\n" ); + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +dev_dbg (host->dev,"SDIO eint irq: %d!\n" , host->eint_irq); + } + +pinctrl_select_state (host->pinctrl, host->pins_uhs); + }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +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 +2663,20 @@ 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 ) && (mmc->pm_caps &MMC_PM_KEEP_POWER )) { + host->eint_irq =platform_get_irq_byname (pdev,"sdio_wakeup" ); +if (host->eint_irq >0 ) { + host->pins_eint =pinctrl_lookup_state (host->pinctrl,"state_eint" ); +if (IS_ERR (host->pins_eint)) { +dev_err (&pdev->dev,"Cannot find pinctrl eint!\n" ); + host->pins_eint =NULL ; + }else { +device_init_wakeup (&pdev->dev, true); + } + } + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;
@@ -2845,6 +2891,13 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev)struct msdc_host *host =mmc_priv (mmc);msdc_save_reg (host); + +if (host->pins_eint) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (sdio_irq_claimed (mmc)) +__msdc_enable_sdio_irq (host,0 ); + }msdc_gate_clock (host);return 0 ; }
@@ -2860,12 +2913,18 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev)return ret;msdc_restore_reg (host); + +if (host->pins_eint) { +pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; }static int __maybe_unused msdc_suspend (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,11 +2933,24 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +/* +* Bump up runtime PM usage counter otherwise dev->power.needs_force_resume will +* not be marked as 1, pm_runtime_force_resume() will go out directly. +*/ +if (host->pins_eint) +pm_runtime_get_noresume (dev); +return pm_runtime_force_suspend (dev); }static int __maybe_unused msdc_resume (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->pins_eint) +pm_runtime_put_noidle (dev); +return pm_runtime_force_resume (dev); }
Signature · 1 line
2.25.1
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Quoted 32 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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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 188 lines
--- drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++- -- 1 file changed, 78 insertions(+), 6 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,10 @@ 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 +6
-5struct reset_control *reset;struct clk *src_clk;/* msdc source clock */ @@ -1520,17 +1523,46 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)static void msdc_enable_sdio_irq (struct mmc_host *mmc,int enb) { -unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__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_enable_async_irq (mmc->card) && host->pins_eint) { +if (enb) { +/* +* In dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to
drivers/mmc/host/mtk-sd.c +1
-0+* GPIO mode. We need to restore it to SDIO DAT1 mode after that.
drivers/mmc/host/mtk-sd.c +1
-0+* Since the current pinstate is pins_uhs, to ensure pinctrl select take
drivers/mmc/host/mtk-sd.c +1
-0+* affect successfully, we change the pinstate to
pins_eintfirstly.drivers/mmc/host/mtk-sd.c +2
-0+*/ + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_eint);drivers/mmc/host/mtk-sd.c +1
-0+ ret =
dev_pm_set_dedicated_wake_irq_reverse(host->dev, host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed to registerSDIO wakeup irq!\n");
drivers/mmc/host/mtk-sd.c +4
-0+ host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { + dev_dbg(host->dev, "SDIO eint irq:%d!\n",
host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ } + + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_uhs);drivers/mmc/host/mtk-sd.c +17
-0+ }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +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 +2663,20 @@ 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 ) && (mmc->pm_caps &MMC_PM_KEEP_POWER )) { + host->eint_irq =platform_get_irq_byname (pdev,"sdio_wakeup" ); +if (host->eint_irq >0 ) { + host->pins_eint = pinctrl_lookup_state(host-Quoted 1 line
pinctrl, "
state_eint");drivers/mmc/host/mtk-sd.c +2
-0+if (IS_ERR (host->pins_eint)) { + dev_err(&pdev->dev, "Cannot findpinctrl eint!\n");
drivers/mmc/host/mtk-sd.c +14
-0+ host->pins_eint =NULL ; + }else { +device_init_wakeup (&pdev->dev, true); + } + } + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;@@ -2845,6 +2891,13 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev) struct msdc_host *host = mmc_priv(mmc);msdc_save_reg (host); + +if (host->pins_eint) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (sdio_irq_claimed (mmc)) +__msdc_enable_sdio_irq (host,0 ); + }msdc_gate_clock (host);return 0 ;}
drivers/mmc/host/mtk-sd.c +6
-0@@ -2860,12 +2913,18 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev) return ret;msdc_restore_reg (host); + +if (host->pins_eint) { +pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; }static int __maybe_unused msdc_suspend (struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc);int ret;drivers/mmc/host/mtk-sd.c +2
-0if (mmc->caps2 &MMC_CAP2_CQE ) {@@ -2874,11 +2933,24 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +/* +* Bump up runtime PM usage counter otherwise dev- Quoted 1 line
power.needs_force_resume will
drivers/mmc/host/mtk-sd.c +1
-0+* not be marked as 1, pm_runtime_force_resume() will go out directly.
drivers/mmc/host/mtk-sd.c +10
-0+*/ +if (host->pins_eint) +pm_runtime_get_noresume (dev); +return pm_runtime_force_suspend (dev); }static int __maybe_unused msdc_resume (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->pins_eint) +pm_runtime_put_noidle (dev); +return pm_runtime_force_resume (dev); }
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
In reply to Axe YangHi,
Gentle ping for this patch.
With Regards,
Axe
Quoted 223 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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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 | 84 ++++++++++++++++++++++++++++++++++++- -- 1 file changed, 78 insertions(+), 6 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,10 @@ 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 +6
-5struct reset_control *reset;struct clk *src_clk;/* msdc source clock */ @@ -1520,17 +1523,46 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)static void msdc_enable_sdio_irq (struct mmc_host *mmc,int enb) { -unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__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_enable_async_irq (mmc->card) && host->pins_eint) { +if (enb) { +/* +* In dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to
drivers/mmc/host/mtk-sd.c +1
-0+* GPIO mode. We need to restore it to SDIO DAT1 mode after that.
drivers/mmc/host/mtk-sd.c +1
-0+* Since the current pinstate is pins_uhs, to ensure pinctrl select take
drivers/mmc/host/mtk-sd.c +1
-0+* affect successfully, we change the pinstate to
pins_eintfirstly.drivers/mmc/host/mtk-sd.c +2
-0+*/ + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_eint);drivers/mmc/host/mtk-sd.c +1
-0+ ret =
dev_pm_set_dedicated_wake_irq_reverse(host->dev, host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed to registerSDIO wakeup irq!\n");
drivers/mmc/host/mtk-sd.c +4
-0+ host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { + dev_dbg(host->dev, "SDIO eint irq:%d!\n",
host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ } + + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_uhs);drivers/mmc/host/mtk-sd.c +17
-0+ }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +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 +2663,20 @@ 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 ) && (mmc->pm_caps &MMC_PM_KEEP_POWER )) { + host->eint_irq =platform_get_irq_byname (pdev,"sdio_wakeup" ); +if (host->eint_irq >0 ) { + host->pins_eint = pinctrl_lookup_state(host-Quoted 1 line
pinctrl, "
state_eint");drivers/mmc/host/mtk-sd.c +2
-0+if (IS_ERR (host->pins_eint)) { + dev_err(&pdev->dev, "Cannot findpinctrl eint!\n");
drivers/mmc/host/mtk-sd.c +14
-0+ host->pins_eint =NULL ; + }else { +device_init_wakeup (&pdev->dev, true); + } + } + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;@@ -2845,6 +2891,13 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev) struct msdc_host *host = mmc_priv(mmc);msdc_save_reg (host); + +if (host->pins_eint) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (sdio_irq_claimed (mmc)) +__msdc_enable_sdio_irq (host,0 ); + }msdc_gate_clock (host);return 0 ;}
drivers/mmc/host/mtk-sd.c +6
-0@@ -2860,12 +2913,18 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev) return ret;msdc_restore_reg (host); + +if (host->pins_eint) { +pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; }static int __maybe_unused msdc_suspend (struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc);int ret;drivers/mmc/host/mtk-sd.c +2
-0if (mmc->caps2 &MMC_CAP2_CQE ) {@@ -2874,11 +2933,24 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +/* +* Bump up runtime PM usage counter otherwise dev- Quoted 1 line
power.needs_force_resume will
drivers/mmc/host/mtk-sd.c +1
-0+* not be marked as 1, pm_runtime_force_resume() will go out directly.
drivers/mmc/host/mtk-sd.c +10
-0+*/ +if (host->pins_eint) +pm_runtime_get_noresume (dev); +return pm_runtime_force_suspend (dev); }static int __maybe_unused msdc_resume (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->pins_eint) +pm_runtime_put_noidle (dev); +return pm_runtime_force_resume (dev); }
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
In reply to Axe YangHi,
Gentle ping for this patch.
Regards,
Axe
Quoted 223 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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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 | 84 ++++++++++++++++++++++++++++++++++++- -- 1 file changed, 78 insertions(+), 6 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,10 @@ 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 +6
-5struct reset_control *reset;struct clk *src_clk;/* msdc source clock */ @@ -1520,17 +1523,46 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)static void msdc_enable_sdio_irq (struct mmc_host *mmc,int enb) { -unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__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_enable_async_irq (mmc->card) && host->pins_eint) { +if (enb) { +/* +* In dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to
drivers/mmc/host/mtk-sd.c +1
-0+* GPIO mode. We need to restore it to SDIO DAT1 mode after that.
drivers/mmc/host/mtk-sd.c +1
-0+* Since the current pinstate is pins_uhs, to ensure pinctrl select take
drivers/mmc/host/mtk-sd.c +1
-0+* affect successfully, we change the pinstate to
pins_eintfirstly.drivers/mmc/host/mtk-sd.c +2
-0+*/ + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_eint);drivers/mmc/host/mtk-sd.c +1
-0+ ret =
dev_pm_set_dedicated_wake_irq_reverse(host->dev, host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed to registerSDIO wakeup irq!\n");
drivers/mmc/host/mtk-sd.c +4
-0+ host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { + dev_dbg(host->dev, "SDIO eint irq:%d!\n",
host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ } + + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_uhs);drivers/mmc/host/mtk-sd.c +17
-0+ }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +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 +2663,20 @@ 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 ) && (mmc->pm_caps &MMC_PM_KEEP_POWER )) { + host->eint_irq =platform_get_irq_byname (pdev,"sdio_wakeup" ); +if (host->eint_irq >0 ) { + host->pins_eint = pinctrl_lookup_state(host-Quoted 1 line
pinctrl, "
state_eint");drivers/mmc/host/mtk-sd.c +2
-0+if (IS_ERR (host->pins_eint)) { + dev_err(&pdev->dev, "Cannot findpinctrl eint!\n");
drivers/mmc/host/mtk-sd.c +14
-0+ host->pins_eint =NULL ; + }else { +device_init_wakeup (&pdev->dev, true); + } + } + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;@@ -2845,6 +2891,13 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev) struct msdc_host *host = mmc_priv(mmc);msdc_save_reg (host); + +if (host->pins_eint) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (sdio_irq_claimed (mmc)) +__msdc_enable_sdio_irq (host,0 ); + }msdc_gate_clock (host);return 0 ;}
drivers/mmc/host/mtk-sd.c +6
-0@@ -2860,12 +2913,18 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev) return ret;msdc_restore_reg (host); + +if (host->pins_eint) { +pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; }static int __maybe_unused msdc_suspend (struct device *dev) {struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc);int ret;drivers/mmc/host/mtk-sd.c +2
-0if (mmc->caps2 &MMC_CAP2_CQE ) {@@ -2874,11 +2933,24 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +/* +* Bump up runtime PM usage counter otherwise dev- Quoted 1 line
power.needs_force_resume will
drivers/mmc/host/mtk-sd.c +1
-0+* not be marked as 1, pm_runtime_force_resume() will go out directly.
drivers/mmc/host/mtk-sd.c +10
-0+*/ +if (host->pins_eint) +pm_runtime_get_noresume (dev); +return pm_runtime_force_suspend (dev); }static int __maybe_unused msdc_resume (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->pins_eint) +pm_runtime_put_noidle (dev); +return pm_runtime_force_resume (dev); }
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
In reply to Axe YangIl 23/06/22 11:04, Axe Yang ha scritto:
Quoted 31 lines
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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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]>
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
In reply to Axe YangQuoted 32 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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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]>
My apologies for the delay in reviewing this.
Quoted 51 lines
--- drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-)drivers/mmc/host/mtk-sd.c +6
-5@@ -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,10 @@ 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 */ struct reset_control *reset;struct clk *src_clk;/* msdc source clock */ @@ -1520,17 +1523,46 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)static void msdc_enable_sdio_irq (struct mmc_host *mmc,int enb) { -unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__msdc_enable_sdio_irq (host, enb);spin_unlock_irqrestore (&host->lock, flags); -if (enb) -pm_runtime_get_noresume (host->dev); -else
drivers/mmc/host/mtk-sd.c static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb) · line 1542
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +9
-1-pm_runtime_put_noidle (host->dev); +if (mmc_card_enable_async_irq (mmc->card) && host->pins_eint) { +if (enb) { +/* +* In dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to +* GPIO mode. We need to restore it to SDIO DAT1 mode after that. +* Since the current pinstate is pins_uhs, to ensure pinctrl select take +* affect successfully, we change the pinstate to pins_eint firstly. +*/ +pinctrl_select_state (host->pinctrl, host->pins_eint);
I am sorry, but I don't understand what goes on here. Why do you need to change the pinctrl setting to "pins_eint" here?
The bellow call to dev_pm_set_dedicated_wake_irq_reverse() doesn't change the pinctrl setting as the comment suggests above.
dev_pm_set_dedicated_wake_irq_reverse() will register the wakeirq, but more importantly, it should also leave the wakeirq disabled, right?
drivers/mmc/host/mtk-sd.c static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb) · line 1553
Quoted 11 lines
drivers/mmc/host/mtk-sd.c +11
-0+ ret =dev_pm_set_dedicated_wake_irq_reverse (host->dev, host->eint_irq); + +if (ret) { +dev_err (host->dev,"Failed to register SDIO wakeup irq!\n" ); + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +dev_dbg (host->dev,"SDIO eint irq: %d!\n" , host->eint_irq); + } + +pinctrl_select_state (host->pinctrl, host->pins_uhs);
According to my comment above, I also don't understand why you need this. Why can't you just leave the pinctrl in the "pins_uhs" state?
Quoted 37 lines
drivers/mmc/host/mtk-sd.c +26
-0+ }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +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 +2663,20 @@ 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 ) && (mmc->pm_caps &MMC_PM_KEEP_POWER )) { + host->eint_irq =platform_get_irq_byname (pdev,"sdio_wakeup" ); +if (host->eint_irq >0 ) { + host->pins_eint =pinctrl_lookup_state (host->pinctrl,"state_eint" ); +if (IS_ERR (host->pins_eint)) { +dev_err (&pdev->dev,"Cannot find pinctrl eint!\n" ); + host->pins_eint =NULL ; + }else { +device_init_wakeup (&pdev->dev, true); + } + } + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_suspend(struct device *dev) · line 2900
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +7
-0@@ -2845,6 +2891,13 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev)struct msdc_host *host =mmc_priv (mmc);msdc_save_reg (host); + +if (host->pins_eint) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host->pins_eint); +if (sdio_irq_claimed (mmc)) +__msdc_enable_sdio_irq (host,0 ); + }
This above code isn't entirely correct. Just because you have "pins_eint", doesn't mean that you have a wakeirq being registered, as that also depends on whether there is an SDIO irq claimed.
So, I think this should rather be:
if (sdio_irq_claimed(mmc)) {
if (host->pins_eint) {
disable_irq(host->irq);
pinctrl_select_state(host->pinctrl, host->pins_eint);
}
__msdc_enable_sdio_irq(host, 0);
}drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_resume(struct device *dev) · line 2917
Quoted 9 lines
drivers/mmc/host/mtk-sd.c +2
-0msdc_gate_clock (host);return 0 ; }@@ -2860,12 +2913,18 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev)return ret;msdc_restore_reg (host); + +if (host->pins_eint) {
Similar comment as above. You need to check sdio_irq_claimed() here too.
Quoted 14 lines
drivers/mmc/host/mtk-sd.c +4
-0+pinctrl_select_state (host->pinctrl, host->pins_uhs); +enable_irq (host->irq); + }return 0 ; }static int __maybe_unused msdc_suspend (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 2940
Quoted 8 lines
drivers/mmc/host/mtk-sd.c +5
-0@@ -2874,11 +2933,24 @@ static int __maybe_unused msdc_suspend(struct device *dev)return ret; } +/* +* Bump up runtime PM usage counter otherwise dev->power.needs_force_resume will +* not be marked as 1, pm_runtime_force_resume() will go out directly. +*/ +if (host->pins_eint)
This works, but can be improved by checking sdio_irq_claimed() too.
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_suspend(struct device *dev) · line 2952
Quoted 12 lines
drivers/mmc/host/mtk-sd.c +7
-0+pm_runtime_get_noresume (dev); +return pm_runtime_force_suspend (dev); }static int __maybe_unused msdc_resume (struct device *dev) { +struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->pins_eint) +pm_runtime_put_noidle (dev);
Ditto.
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_suspend(struct device *dev) · line 2956
Quoted 4 lines
drivers/mmc/host/mtk-sd.c +1
-0+return pm_runtime_force_resume (dev); }
Kind regards
Uffe
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Quoted 35 lines · Ulf Hansson
Quoted 34 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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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 5 lines
Quoted 3 lines
Co-developed-by Yong Mao <[email protected]>Signed-off-by Yong Mao <[email protected]>Signed-off-by Axe Yang <[email protected]>My apologies for the delay in reviewing this.
It is okay. Glad to receive your reply.
Quoted 70 lines
Quoted 70 lines
--- drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 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,10 @@ 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 */
structreset_control*reset;struct clk
*src_clk; /* msdc source clock */drivers/mmc/host/mtk-sd.c +6
-5@@ -1520,17 +1523,46 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)static void msdc_enable_sdio_irq (struct mmc_host *mmc,int enb) { -unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__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_enable_async_irq (mmc->card) && host- >pins_eint) { +if (enb) { +/* +* In
dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to
+ * GPIO mode. We need to restore it to SDIO
DAT1 mode after that.
+ * Since the current pinstate ispins_uhs,
to ensure pinctrl select take
+ * affect successfully, we change the
pinstate topins_eintfirstly.drivers/mmc/host/mtk-sd.c +2
-0+*/ + pinctrl_select_state(host->pinctrl, host-
Quoted 8 lines
Quoted 1 line
Quoted 1 line
pins_eint);I am sorry, but I don't understand what goes on here. Why do you need to change the pinctrl setting to "
pins_eint" here?The bellow call to
dev_pm_set_dedicated_wake_irq_reverse()doesn't change the pinctrl setting as the comment suggests above.
Actually, the pinctrl setting is changed:
In dev_pm_set_dedicated_wake_irq_reverse() -> ... -> request_threaded_irq() -> __setup_irq() -> irq_request_resources() -> mtk_eint_irq_request_resources()-> mtk_xt_set_gpio_as_eint(), the SDIO DAT1 pin will be force reset to GPIO mode:
https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c#L339
So, I have to call pinctrl_select_state() to restore SDIO DAT1 pin mode(pins_uhs). But pinctrl_select_state() return directly because MSDC driver still wrongly thinks current DAT1 state is SDIO DAT1 mode:
https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/core.c#L1344
, which means I have to call pinctrl_select_state() in pairs: Change pinctrl to another state(pins_eint), then change it back to pins_uhs mode.
Quoted 3 lines
dev_pm_set_dedicated_wake_irq_reverse()will register the wakeirq, but
more importantly, it should also leave the wakeirq disabled, right?
Yes. wakeirq will be registered, and disabled. But SDIO DAT1 pin mode will be changed too.
Quoted 15 lines
Quoted 15 lines
+ ret =
dev_pm_set_dedicated_wake_irq_reverse(host->dev, host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed toregister SDIO wakeup irq!\n");
drivers/mmc/host/mtk-sd.c +4
-0+ host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { + dev_dbg(host->dev, "SDIO eint irq:%d!\n",
host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ } + + pinctrl_select_state(host->pinctrl, host-
Quoted 5 lines
Quoted 1 line
Quoted 1 line
pins_uhs);According to my comment above, I also don't understand why you need this. Why can't you just leave the pinctrl in the "
pins_uhs" state?
I have to call pinctrl_select_state() in pairs.
Quoted 64 lines
Quoted 46 lines
drivers/mmc/host/mtk-sd.c +12
-0+ }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +pm_runtime_put_noidle (host->dev); + } + } } static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32intsts)
drivers/mmc/host/mtk-sd.c +5
-0@@ -2631,6 +2663,20 @@ 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 ) && (mmc->pm_caps &MMC_PM_KEEP_POWER )) { + host->eint_irq =platform_get_irq_byname (pdev,"sdio_wakeup" ); +if (host->eint_irq >0 ) { + host->pins_eint =
pinctrl_lookup_state(host->pinctrl, "state_eint");drivers/mmc/host/mtk-sd.c +2
-0+if (IS_ERR (host->pins_eint)) { + dev_err(&pdev->dev, "Cannot findpinctrl eint!\n");
drivers/mmc/host/mtk-sd.c +3
-0+ host->pins_eint =NULL ; + }else { + device_init_wakeup(&pdev->dev,true);
drivers/mmc/host/mtk-sd.c +4
-0+ } + } + } +msdc_of_property_parse (pdev, host); host->dev = &pdev->dev;@@ -2845,6 +2891,13 @@ static int __maybe_unused msdc_runtime_suspend(struct device *dev) struct msdc_host *host = mmc_priv(mmc);drivers/mmc/host/mtk-sd.c static int __maybe_unused · line 2902
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +7
-0msdc_save_reg (host); + +if (host->pins_eint) { +disable_irq (host->irq); +pinctrl_select_state (host->pinctrl, host- >pins_eint); +if (sdio_irq_claimed (mmc)) +__msdc_enable_sdio_irq (host,0 ); + }This above code isn't entirely correct. Just because you have "
pins_eint", doesn't mean that you have a wakeirq being registered, as
that also depends on whether there is an SDIO irq claimed.So, I think this should rather be:
Quoted 9 lines
if (sdio_irq_claimed(mmc)) {
if (host->pins_eint) {
disable_irq(host->irq);
pinctrl_select_state(host->pinctrl, host->pins_eint);
}
__msdc_enable_sdio_irq(host, 0);
}Agree, will adjust the logic in next version. Thanks.
Quoted 7 lines
Quoted 7 lines
drivers/mmc/host/mtk-sd.c +0
-0msdc_gate_clock (host);return 0;}
drivers/mmc/host/mtk-sd.c +0
-0@@ -2860,12 +2913,18 @@ static int __maybe_unused msdc_runtime_resume(struct device *dev) return ret;
Quoted 6 lines
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_runtime_resume(struct device *dev) · line 2917
Quoted 3 lines
drivers/mmc/host/mtk-sd.c +2
-0msdc_restore_reg (host); + +if (host->pins_eint) {Similar comment as above. You need to check
sdio_irq_claimed()here too.
Okay.
Quoted 22 lines
Quoted 22 lines
drivers/mmc/host/mtk-sd.c +4
-0+pinctrl_select_state (host->pinctrl, host- >pins_uhs); +enable_irq (host->irq); + }return 0 ; }static int __maybe_unused msdc_suspend (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 +2
-0@@ -2874,11 +2933,24 @@ static int __maybe_unused msdc_suspend(struct device *dev) return ret; } +/* +* Bump up runtime PM usage counter otherwise dev-
Quoted 7 lines
drivers/mmc/host/mtk-sd.c
Quoted 5 lines
Quoted 1 line
power.needs_force_resume will
+ * not be marked as 1,
pm_runtime_force_resume()will go
out directly.drivers/mmc/host/mtk-sd.c +2
-0+*/ +if (host->pins_eint)This works, but can be improved by checking
sdio_irq_claimed()too.
Sure. Will update it in next version.
Quoted 6 lines
Quoted 6 lines
drivers/mmc/host/mtk-sd.c +2
-0+pm_runtime_get_noresume (dev); +return pm_runtime_force_suspend (dev); }
Quoted 9 lines
drivers/mmc/host/mtk-sd.c static int __maybe_unused msdc_suspend(struct device *dev) · line 2952
Quoted 7 lines
static int
__maybe_unusedmsdc_resume(struct device *dev){drivers/mmc/host/mtk-sd.c +5
-0+struct mmc_host *mmc =dev_get_drvdata (dev); +struct msdc_host *host =mmc_priv (mmc); + +if (host->pins_eint) +pm_runtime_put_noidle (dev);Ditto.
Will update it in next version.
Quoted 8 lines
Quoted 5 lines
+
return pm_runtime_force_resume(dev);}
Kind regards
Uffe
Regards,
Axe
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
+ Linus Walleij
Quoted 124 lines · Axe Yang
Quoted 35 lines · Ulf Hansson
Quoted 34 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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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 5 lines
Quoted 3 lines
Co-developed-by Yong Mao <[email protected]>Signed-off-by Yong Mao <[email protected]>Signed-off-by Axe Yang <[email protected]>My apologies for the delay in reviewing this.
It is okay. Glad to receive your reply.
Quoted 70 lines
Quoted 70 lines
--- drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 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,10 @@ 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 */
structreset_control*reset;struct clk
*src_clk; /* msdc source clock */drivers/mmc/host/mtk-sd.c +6
-5@@ -1520,17 +1523,46 @@ static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb)static void msdc_enable_sdio_irq (struct mmc_host *mmc,int enb) { -unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__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_enable_async_irq (mmc->card) && host- >pins_eint) { +if (enb) { +/* +* In
dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to
+ * GPIO mode. We need to restore it to SDIO
DAT1 mode after that.
+ * Since the current pinstate ispins_uhs,
to ensure pinctrl select take
+ * affect successfully, we change the
pinstate topins_eintfirstly.drivers/mmc/host/mtk-sd.c +2
-0+*/ + pinctrl_select_state(host->pinctrl, host-Quoted 8 lines
Quoted 1 line
Quoted 1 line
pins_eint);I am sorry, but I don't understand what goes on here. Why do you need to change the pinctrl setting to "
pins_eint" here?The bellow call to
dev_pm_set_dedicated_wake_irq_reverse()doesn't change the pinctrl setting as the comment suggests above.
Quoted 5 lines
Actually, the pinctrl setting is changed:
Indev_pm_set_dedicated_wake_irq_reverse()-> ... ->request_threaded_irq()->__setup_irq()->irq_request_resources()-> mtk_eint_irq_request_resources()->mtk_xt_set_gpio_as_eint(), the SDIO DAT1 pin will be force reset to GPIO mode:
Aha. That looks a bit weird, but I get the problem now.
I have looped in Linus (the pintctrl maintainer) to get his opinion on this.
Quoted 11 lines
https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c#L339
So, I have to call
pinctrl_select_state()to restore SDIO DAT1 pinmode(pins_uhs). Butpinctrl_select_state()return directly because MSDC driver still wrongly thinks current DAT1 state is SDIO DAT1 mode:https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/core.c#L1344
, which means I have to callpinctrl_select_state()in pairs: Change pinctrl to anotherstate(pins_eint), then change it back topins_uhsmode.
I see. So a call to pinctrl_select_state("pins_uhs") would not take effect, unless we call pinctrl_select_state("pins_eint") first. That sounds like the internal state of the pinctrl isn't maintained properly.
Let's see what Linus thinks about this.
Note that, I am happy to pick the patch as is around this, but I am worried we might be doing something at the mmc driver level, which should really be managed at the pinctrl layer.
Quoted 24 lines
Quoted 5 lines
dev_pm_set_dedicated_wake_irq_reverse()will register the wakeirq, but
more importantly, it should also leave the wakeirq disabled, right?Yes. wakeirq will be registered, and disabled. But SDIO DAT1 pin mode will be changed too.
Quoted 15 lines
Quoted 15 lines
+ ret =
dev_pm_set_dedicated_wake_irq_reverse(host->dev, host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed toregister SDIO wakeup irq!\n");
drivers/mmc/host/mtk-sd.c +4
-0+ host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { + dev_dbg(host->dev, "SDIO eint irq:%d!\n",
host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ } + + pinctrl_select_state(host->pinctrl, host-
Quoted 21 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
pins_uhs);According to my comment above, I also don't understand why you need this. Why can't you just leave the pinctrl in the "
pins_uhs" state?I have to call
pinctrl_select_state()in pairs.Quoted 13 lines
Quoted 13 lines
drivers/mmc/host/mtk-sd.c +12
-0+ }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +pm_runtime_put_noidle (host->dev); + } + } }
[...]
Kind regards
Uffe
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Quoted 157 lines · Ulf Hansson
+ Linus Walleij
Quoted 146 lines · Axe Yang
Quoted 46 lines · Ulf Hansson
Quoted 44 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 beextended(the interrupt named with sdio_wakeup):&mmcX { ... interrupt-names = "msdc", "sdio_wakeup"; 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 5 lines
Quoted 3 lines
Co-developed-by Yong Mao <[email protected]>Signed-off-by Yong Mao <[email protected]>Signed-off-by Axe Yang <[email protected]>My apologies for the delay in reviewing this.
It is okay. Glad to receive your reply.
Quoted 81 lines
Quoted 78 lines
--- drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-)drivers/mmc/host/mtk- renamed from drivers/mmc/host/mtk-sd.c +0
-0
sd.c
index195dc897188b..f907b96cfd87100644drivers/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,10 @@ 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 */
structreset_control*reset;struct clk
*src_clk; /* msdc source clock */drivers/mmc/host/mtk-sd.c +0
-0@@ -1520,17 +1523,46 @@ static void__msdc_enable_sdio_irq(struct
msdc_host*host, int enb)static void msdc_enable_sdio_irq(struct
mmc_host*mmc, int
enb)
{drivers/mmc/host/mtk-sd.c +3
-5-unsigned long flags;struct msdc_host *host =mmc_priv (mmc); +unsigned long flags; +int ret;spin_lock_irqsave (&host->lock, flags);__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_enable_async_irq(mmc->card) && host-Quoted 1 line
pins_eint) {drivers/mmc/host/mtk-sd.c +3
-0+if (enb) { +/* +* In
dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to
+ * GPIO mode. We need to restore it to
SDIO
DAT1 mode after that.
+ * Since the current pinstate ispins_uhs,
to ensure pinctrl select take
+ * affect successfully, we change the
pinstate topins_eintfirstly.drivers/mmc/host/mtk-sd.c +2
-0+*/ + pinctrl_select_state(host->pinctrl,Quoted 2 lines
host-
Quoted 1 line
pins_eint);Quoted 8 lines
I am sorry, but I don't understand what goes on here. Why do you need
to change the pinctrl setting to "pins_eint" here?The bellow call to
dev_pm_set_dedicated_wake_irq_reverse()doesn't
change the pinctrl setting as the comment suggests above.Quoted 7 lines
Actually, the pinctrl setting is changed:
Indev_pm_set_dedicated_wake_irq_reverse()-> ... ->request_threaded_irq()->__setup_irq()->irq_request_resources()->
mtk_eint_irq_request_resources()->mtk_xt_set_gpio_as_eint(), the SDIO
DAT1 pin will be force reset to GPIO mode:
Quoted 5 lines
Aha. That looks a bit weird, but I get the problem now.
I have looped in Linus (the pintctrl maintainer) to get his opinion on this.
Okay.
Quoted 2 lines
Quoted 2 lines
Quoted 8 lines
Quoted 8 lines
So, I have to call
pinctrl_select_state()to restore SDIO DAT1 pinmode(pins_uhs). Butpinctrl_select_state()return directly because MSDC
driver still wrongly thinks current DAT1 state is SDIO DAT1 mode:
Quoted 7 lines
Quoted 6 lines
, which means I have to call
pinctrl_select_state()in pairs:
Change
pinctrl to anotherstate(pins_eint), then change it back topins_uhs
mode.
Quoted 5 lines
I see. So a call to
pinctrl_select_state("pins_uhs")would not take effect, unless we callpinctrl_select_state("pins_eint")first. That sounds like the internal state of the pinctrl isn't maintained properly.
That is correct. The GPIO mode is modified in a very hidden way, by pass pinctrl mechanism.
Quoted 6 lines
Let's see what Linus thinks about this.
Note that, I am happy to pick the patch as is around this, but I am worried we might be doing something at the mmc driver level, which should really be managed at the pinctrl layer.
Okay. I will release patch V14 after Linus replies.
Quoted 56 lines
Quoted 33 lines
Quoted 7 lines
dev_pm_set_dedicated_wake_irq_reverse()will register the wakeirq,
but
more importantly, it should also leave the wakeirq disabled, right?Yes. wakeirq will be registered, and disabled. But SDIO DAT1 pin mode
will be changed too.Quoted 21 lines
Quoted 20 lines
+ ret =
dev_pm_set_dedicated_wake_irq_reverse(host->dev, host-Quoted 1 line
eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed toregister SDIO wakeup irq!\n");
drivers/mmc/host/mtk-sd.c +2
-0+ host->pins_eint =NULL ; + pm_runtime_get_noresume(host-Quoted 1 line
dev);
drivers/mmc/host/mtk-sd.c +2
-0+ }else { + dev_dbg(host->dev, "SDIO eintirq:
%d!\n",host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ } + + pinctrl_select_state(host->pinctrl,host-
Quoted 1 line
pins_uhs);Quoted 22 lines
Quoted 5 lines
According to my comment above, I also don't understand why you need
this. Why can't you just leave the pinctrl in the "pins_uhs" state?I have to call
pinctrl_select_state()in pairs.Quoted 13 lines
Quoted 13 lines
drivers/mmc/host/mtk-sd.c +12
-0+ }else { +dev_pm_clear_wake_irq (host->dev); + } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +pm_runtime_put_noidle (host->dev); + } + } }
Quoted 3 lines
[...]
Regards,
Axe
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
In reply to Axe YangQuoted 3 lines · Axe Yang
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.
So what I see is that you have what the electronics chip people call an armed pad ring, such that an asynchronous event detector is connected to the pin when it is in GPIO mode, and in this mode the system can enter a lower sleep state (like powering off the MMC block silicon...)
That seems fine, this is definitely how the chip people expected it to work.
Quoted 22 lines
drivers/mmc/host/mtk-sd.c +22
-0+if (mmc_card_enable_async_irq (mmc->card) && host->pins_eint) { +if (enb) { +/* +* In dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to +* GPIO mode. We need to restore it to SDIO DAT1 mode after that. +* Since the current pinstate is pins_uhs, to ensure pinctrl select take +* affect successfully, we change the pinstate to pins_eint firstly. +*/ +pinctrl_select_state (host->pinctrl, host->pins_eint); + ret =dev_pm_set_dedicated_wake_irq_reverse (host->dev, host->eint_irq); + +if (ret) { +dev_err (host->dev,"Failed to register SDIO wakeup irq!\n" ); + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +dev_dbg (host->dev,"SDIO eint irq: %d!\n" , host->eint_irq); + } + +pinctrl_select_state (host->pinctrl, host->pins_uhs); + }else { +dev_pm_clear_wake_irq (host->dev);
drivers/mmc/host/mtk-sd.c static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb) · line 1565
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +10
-0+ } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +pm_runtime_put_noidle (host->dev); + } + }
This looks right.
drivers/mmc/host/mtk-sd.c static int msdc_drv_probe(struct platform_device *pdev) · line 2670
Quoted 5 lines
drivers/mmc/host/mtk-sd.c +5
-0+/* Support for SDIO eint irq ? */ +if ((mmc->pm_caps &MMC_PM_WAKE_SDIO_IRQ ) && (mmc->pm_caps &MMC_PM_KEEP_POWER )) { + host->eint_irq =platform_get_irq_byname (pdev,"sdio_wakeup" ); +if (host->eint_irq >0 ) { + host->pins_eint =pinctrl_lookup_state (host->pinctrl,"state_eint" );
I guess one of the other patches adds this to the DT binding?
With that:
Yours,
Linus Walleij
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Hi Linus,
Thanks for the comments, but Ulf and I have some question on pinctrl.
Quoted 60 lines · Linus Walleij
Quoted 3 lines · Axe Yang
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.
So what I see is that you have what the electronics chip people call an armed pad ring, such that an asynchronous event detector is connected
to the pin when it is in GPIO mode, and in this mode the system can enter a lower sleep state (like powering off the MMC block silicon...)That seems fine, this is definitely how the chip people expected it to work.
Quoted 32 lines
+ if (
mmc_card_enable_async_irq(mmc->card)&& host-Quoted 1 line
pins_eint) {drivers/mmc/host/mtk-sd.c +3
-0+if (enb) { +/* +* In
dev_pm_set_dedicated_wake_irq_reverse(), eint pin will be set to
+ * GPIO mode. We need to restore it to SDIO
DAT1 mode after that.
+ * Since the current pinstate ispins_uhs,
to ensure pinctrl select take
+ * affect successfully, we change the
pinstate topins_eintfirstly.(quoted diff) +2
-0+ */ + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_eint);+ ret =
dev_pm_set_dedicated_wake_irq_reverse(host->dev, host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ +if (ret) { + dev_err(host->dev, "Failed toregister SDIO wakeup irq!\n");
drivers/mmc/host/mtk-sd.c +4
-0+ host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { + dev_dbg(host->dev, "SDIO eint irq:%d!\n",
host->eint_irq);drivers/mmc/host/mtk-sd.c +3
-0+ } + + pinctrl_select_state(host->pinctrl, host-Quoted 1 line
pins_uhs);drivers/mmc/host/mtk-sd.c +2
-0+ }else { +dev_pm_clear_wake_irq (host->dev);drivers/mmc/host/mtk-sd.c static void __msdc_enable_sdio_irq(struct msdc_host *host, int enb) · line 1565
Quoted 10 lines
drivers/mmc/host/mtk-sd.c +10
-0+ } + }else { +if (enb) { +/* Ensure host->pins_eint is NULL */ + host->pins_eint =NULL ; +pm_runtime_get_noresume (host->dev); + }else { +pm_runtime_put_noidle (host->dev); + } + }
Quoted 1 line
This looks right.
SDIO DAT1 pin mode is changed to GPIO mode indev_pm_set_dedicated_wake_irq_reverse():
https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c#L339
dev_pm_set_dedicated_wake_irq_reverse() -> ... ->request_threaded_irq() -> __setup_irq() -> irq_request_resources() -> mtk_eint_irq_request_resources()-> mtk_xt_set_gpio_as_eint()
To restore SDIO DAT1 pin to uhs mode. I have to call pinctrl_select_state() twice(change pinctrl to another state, then change back to uhs mode). Ulf worried we might be doing something at the mmc driver level, which should really be managed at the pinctrl layer.
Do you have any comment or suggestion on this?
Quoted 11 lines
Quoted 9 lines
(quoted diff) +2
-0+ /* Support for SDIO eint irq ? */ + if ((mmc->pm_caps & MMC_PM_WAKE_SDIO_IRQ) && (mmc->pm_caps&
MMC_PM_KEEP_POWER)) {
+host->eint_irq= platform_get_irq_byname(pdev,
"sdio_wakeup");(quoted diff) +2
-0+ if (host->eint_irq > 0) { + host->pins_eint =
pinctrl_lookup_state(host->pinctrl, "state_eint");I guess one of the other patches adds this to the DT binding?
Yes. The property related change is in patch 1/3
Quoted 6 lines
With that:
Reviewed-by Linus Walleij <[email protected]>Yours,
Linus Walleij
Regards,
Axe
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Quoted 4 lines · Axe Yang
Quoted 2 lines · Linus Walleij
On Thu, Jun 23, 2022 at 11:10 AM Axe Yang <[email protected]> wrote:
Quoted 8 lines
SDIO DAT1 pin mode is changed to GPIO mode in
dev_pm_set_dedicated_wake_irq_reverse():https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c#L339
dev_pm_set_dedicated_wake_irq_reverse()-> ... ->request_threaded_irq() ->__setup_irq()->irq_request_resources()-> mtk_eint_irq_request_resources()->mtk_xt_set_gpio_as_eint()
This doesn't seem to have much to do with pin control? No pin control functions are called on this execution path, no pin control state is changed, right?
If what you mean is that
it happens to poke into the same hardware registers that is mainly a matter of concurrency in the driver, sometimes two abstractions happen to have to poke into the same hardware registers and then it is up to the driver to maintain state for the hardware, this is not a question for the framework.
How is Mediatek developers thinking about this thing in general? You are a few people who developed the driver so certainly you must have some design idea to why irq_request_resources() poke around in these registers? Does it even perform pin control behind the back of the pin control framework?
Quoted 7 lines
To restore SDIO DAT1 pin to uhs mode. I have to call
pinctrl_select_state()twice(change pinctrl to another state, then change back to uhs mode). Ulf worried we might be doing something at the mmc driver level, which should really be managed at the pinctrl layer.Do you have any comment or suggestion on this?
The pin control state transitions are really just finite automata.
Your pin control needs to be different when using wakeup from when being used for SDIO and this is perfectly fine, it's no different from the fact that the regulator and clock might need to be in different states, so I don't quite understand the question?
Yours,
Linus Walleij
Re: [PATCH v13 3/3] mmc: mediatek: add support for SDIO eint wakup IRQ
Quoted 9 lines · Linus Walleij
Quoted 7 lines · Axe Yang
Quoted 2 lines · Linus Walleij
On Thu, Jun 23, 2022 at 11:10 AM Axe Yang <[email protected]> wrote:
SDIO DAT1 pin mode is changed to GPIO mode in
dev_pm_set_dedicated_wake_irq_reverse():
Quoted 10 lines
Quoted 6 lines
dev_pm_set_dedicated_wake_irq_reverse()-> ... ->request_threaded_irq()
->__setup_irq()->irq_request_resources()-> mtk_eint_irq_request_resources()->mtk_xt_set_gpio_as_eint()This doesn't seem to have much to do with pin control? No pin control functions are called on this execution path, no pin control state is changed, right?
That's right, no pin control state is changed.
Quoted 8 lines
If what you mean is that
it happens to poke into the same hardware registers that is mainly a matter of concurrency in the driver, sometimes two abstractions happen to have to poke into the same hardware registers and then it is up to the driver to maintain state for the hardware, this is not a question for the framework.
Quoted 5 lines
How is Mediatek developers thinking about this thing in general? You are a few people who developed the driver so certainly you must have some design idea to why
irq_request_resources()poke around in these registers? Does it even perform pin control behind the back of the pin control framework?
I see. It is sensible to reset pin function to GPIO mode when trying to register the pin to eint mode, and the operation is out of pinctrl framework.
Seems like maintain the pin state in driver is the only way to fix the pin function conflict.
Quoted 10 lines
Quoted 9 lines
To restore SDIO DAT1 pin to uhs mode. I have to call
pinctrl_select_state()twice(change pinctrl to another state, then change back to uhs mode). Ulf worried we might be doing something at
the mmc driver level, which should really be managed at the pinctrl layer.Do you have any comment or suggestion on this?
Quoted 7 lines
The pin control state transitions are really just finite automata.
Your pin control needs to be different when using wakeup from when being used for SDIO and this is perfectly fine, it's no different from the fact that the regulator and clock might need to be in different states, so I don't quite understand the question?
I see. At first I thought that pinctrl framework should be aware of the hidden modification of pin function. But as you said, it is just a finite automata. Driver should correct GPIO settings by itself if pin state be changed outside pin control state mechanical.
Sorry for the noise, and thanks for your comment again.
Quoted 2 lines
Regards,
Axe