| Message ID | 20220623090445.1401-4-axe.yang@mediatek.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mmc: mediatek: add support for SDIO async IRQ | expand |
On Thu, 2022-06-23 at 17:04 +0800, Axe Yang wrote: > Add support for eint IRQ when MSDC is used as an SDIO host. This > feature requires SDIO device support async IRQ function. With this > feature, SDIO host can be awakened by SDIO card in suspend state, > without additional pin. > > MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC > turn off clock and switch SDIO DAT1 pin to GPIO mode. And during > resume, switch GPIO function back to DAT1 mode then turn on clock. > > Some device tree property should be added or modified in MSDC node > to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since > this feature depends on asynchronous interrupts, "wakeup-source", > "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and > the interrupts list should be extended(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 <yong.mao@mediatek.com> > Signed-off-by: Yong Mao <yong.mao@mediatek.com> > Signed-off-by: Axe Yang <axe.yang@mediatek.com> Reviewed-by: Chaotian Jing <chaotian.jing@mediatek.com> > --- > drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++- > -- > 1 file changed, 78 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index 195dc897188b..f907b96cfd87 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -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 <chaotian.jing@mediatek.com> > */ > > @@ -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); > } >
Hi, Gentle ping for this patch. With Regards, Axe On Thu, 2022-06-23 at 17:04 +0800, Axe Yang wrote: > Add support for eint IRQ when MSDC is used as an SDIO host. This > feature requires SDIO device support async IRQ function. With this > feature, SDIO host can be awakened by SDIO card in suspend state, > without additional pin. > > MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC > turn off clock and switch SDIO DAT1 pin to GPIO mode. And during > resume, switch GPIO function back to DAT1 mode then turn on clock. > > Some device tree property should be added or modified in MSDC node > to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since > this feature depends on asynchronous interrupts, "wakeup-source", > "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and > the interrupts list should be extended(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 <yong.mao@mediatek.com> > Signed-off-by: Yong Mao <yong.mao@mediatek.com> > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > --- > drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++- > -- > 1 file changed, 78 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index 195dc897188b..f907b96cfd87 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -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 <chaotian.jing@mediatek.com> > */ > > @@ -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); > } >
Hi, Gentle ping for this patch. Regards, Axe On Thu, 2022-06-23 at 17:04 +0800, Axe Yang wrote: > Add support for eint IRQ when MSDC is used as an SDIO host. This > feature requires SDIO device support async IRQ function. With this > feature, SDIO host can be awakened by SDIO card in suspend state, > without additional pin. > > MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC > turn off clock and switch SDIO DAT1 pin to GPIO mode. And during > resume, switch GPIO function back to DAT1 mode then turn on clock. > > Some device tree property should be added or modified in MSDC node > to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since > this feature depends on asynchronous interrupts, "wakeup-source", > "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and > the interrupts list should be extended(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 <yong.mao@mediatek.com> > Signed-off-by: Yong Mao <yong.mao@mediatek.com> > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > --- > drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++- > -- > 1 file changed, 78 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index 195dc897188b..f907b96cfd87 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -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 <chaotian.jing@mediatek.com> > */ > > @@ -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); > } >
On Thu, 23 Jun 2022 at 11:05, Axe Yang <axe.yang@mediatek.com> wrote: > > Add support for eint IRQ when MSDC is used as an SDIO host. This > feature requires SDIO device support async IRQ function. With this > feature, SDIO host can be awakened by SDIO card in suspend state, > without additional pin. > > MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC > turn off clock and switch SDIO DAT1 pin to GPIO mode. And during > resume, switch GPIO function back to DAT1 mode then turn on clock. > > Some device tree property should be added or modified in MSDC node > to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since > this feature depends on asynchronous interrupts, "wakeup-source", > "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and > the interrupts list should be extended(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 <yong.mao@mediatek.com> > Signed-off-by: Yong Mao <yong.mao@mediatek.com> > Signed-off-by: Axe Yang <axe.yang@mediatek.com> My apologies for the delay in reviewing this. > --- > drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 78 insertions(+), 6 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index 195dc897188b..f907b96cfd87 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -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 <chaotian.jing@mediatek.com> > */ > > @@ -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); 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? > + 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? > + } 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); > + } 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); } > 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) { Similar comment as above. You need to check sdio_irq_claimed() here too. > + 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) This works, but can be improved by checking sdio_irq_claimed() too. > + 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. > + > return pm_runtime_force_resume(dev); > } > Kind regards Uffe
On Mon, 2022-07-18 at 14:21 +0200, Ulf Hansson wrote: > On Thu, 23 Jun 2022 at 11:05, Axe Yang <axe.yang@mediatek.com> wrote: > > > > Add support for eint IRQ when MSDC is used as an SDIO host. This > > feature requires SDIO device support async IRQ function. With this > > feature, SDIO host can be awakened by SDIO card in suspend state, > > without additional pin. > > > > MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC > > turn off clock and switch SDIO DAT1 pin to GPIO mode. And during > > resume, switch GPIO function back to DAT1 mode then turn on clock. > > > > Some device tree property should be added or modified in MSDC node > > to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since > > this feature depends on asynchronous interrupts, "wakeup-source", > > "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and > > the interrupts list should be extended(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 <yong.mao@mediatek.com> > > Signed-off-by: Yong Mao <yong.mao@mediatek.com> > > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > > My apologies for the delay in reviewing this. It is okay. Glad to receive your reply. > > > --- > > drivers/mmc/host/mtk-sd.c | 84 > > ++++++++++++++++++++++++++++++++++++--- > > 1 file changed, 78 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > > index 195dc897188b..f907b96cfd87 100644 > > --- a/drivers/mmc/host/mtk-sd.c > > +++ b/drivers/mmc/host/mtk-sd.c > > @@ -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 <chaotian.jing@mediatek.com> > > */ > > > > @@ -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); > > 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. > 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. > > > + 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? > I have to call pinctrl_select_state() in pairs. > > + } 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); > > + } > > 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); > } > Agree, will adjust the logic in next version. Thanks. > > 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) { > > Similar comment as above. You need to check sdio_irq_claimed() here > too. Okay. > > > + 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) > > This works, but can be improved by checking sdio_irq_claimed() too. Sure. Will update it in next version. > > > + 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. Will update it in next version. > > > + > > return pm_runtime_force_resume(dev); > > } > > > > Kind regards > Uffe Regards, Axe
+ Linus Walleij On Tue, 19 Jul 2022 at 12:35, Axe Yang <axe.yang@mediatek.com> wrote: > > On Mon, 2022-07-18 at 14:21 +0200, Ulf Hansson wrote: > > On Thu, 23 Jun 2022 at 11:05, Axe Yang <axe.yang@mediatek.com> wrote: > > > > > > Add support for eint IRQ when MSDC is used as an SDIO host. This > > > feature requires SDIO device support async IRQ function. With this > > > feature, SDIO host can be awakened by SDIO card in suspend state, > > > without additional pin. > > > > > > MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC > > > turn off clock and switch SDIO DAT1 pin to GPIO mode. And during > > > resume, switch GPIO function back to DAT1 mode then turn on clock. > > > > > > Some device tree property should be added or modified in MSDC node > > > to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since > > > this feature depends on asynchronous interrupts, "wakeup-source", > > > "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and > > > the interrupts list should be extended(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 <yong.mao@mediatek.com> > > > Signed-off-by: Yong Mao <yong.mao@mediatek.com> > > > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > > > > My apologies for the delay in reviewing this. > > It is okay. Glad to receive your reply. > > > > > > --- > > > drivers/mmc/host/mtk-sd.c | 84 > > > ++++++++++++++++++++++++++++++++++++--- > > > 1 file changed, 78 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > > > index 195dc897188b..f907b96cfd87 100644 > > > --- a/drivers/mmc/host/mtk-sd.c > > > +++ b/drivers/mmc/host/mtk-sd.c > > > @@ -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 <chaotian.jing@mediatek.com> > > > */ > > > > > > @@ -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); > > > > 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: 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. > > 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. 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. > > > > 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. > > > > > > + 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? > > > I have to call pinctrl_select_state() in pairs. > > > > > + } 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
On Thu, 2022-07-21 at 12:58 +0200, Ulf Hansson wrote: > + Linus Walleij > > On Tue, 19 Jul 2022 at 12:35, Axe Yang <axe.yang@mediatek.com> wrote: > > > > On Mon, 2022-07-18 at 14:21 +0200, Ulf Hansson wrote: > > > On Thu, 23 Jun 2022 at 11:05, Axe Yang <axe.yang@mediatek.com> > > > wrote: > > > > > > > > Add support for eint IRQ when MSDC is used as an SDIO host. > > > > This > > > > feature requires SDIO device support async IRQ function. With > > > > this > > > > feature, SDIO host can be awakened by SDIO card in suspend > > > > state, > > > > without additional pin. > > > > > > > > MSDC driver will time-share the SDIO DAT1 pin. During suspend, > > > > MSDC > > > > turn off clock and switch SDIO DAT1 pin to GPIO mode. And > > > > during > > > > resume, switch GPIO function back to DAT1 mode then turn on > > > > clock. > > > > > > > > Some device tree property should be added or modified in MSDC > > > > node > > > > to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. > > > > Since > > > > this feature depends on asynchronous interrupts, "wakeup- > > > > source", > > > > "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, > > > > and > > > > the interrupts list should be extended(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 <yong.mao@mediatek.com> > > > > Signed-off-by: Yong Mao <yong.mao@mediatek.com> > > > > Signed-off-by: Axe Yang <axe.yang@mediatek.com> > > > > > > My apologies for the delay in reviewing this. > > > > It is okay. Glad to receive your reply. > > > > > > > > > --- > > > > drivers/mmc/host/mtk-sd.c | 84 > > > > ++++++++++++++++++++++++++++++++++++--- > > > > 1 file changed, 78 insertions(+), 6 deletions(-) > > > > > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk- > > > > sd.c > > > > index 195dc897188b..f907b96cfd87 100644 > > > > --- a/drivers/mmc/host/mtk-sd.c > > > > +++ b/drivers/mmc/host/mtk-sd.c > > > > @@ -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 <chaotian.jing@mediatek.com> > > > > */ > > > > > > > > @@ -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); > > > > > > 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: > > 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. > > > > https://urldefense.com/v3/__https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c*L339__;Iw!!CTRNKA9wMg0ARbw!10fxyOdpvC-aCfRRWEGS5lXRPC6qJ0Z79tnrnTNbOu8VgamIxVATeM_wDz-obpEJ$ > > > > > > 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://urldefense.com/v3/__https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/core.c*L1344__;Iw!!CTRNKA9wMg0ARbw!10fxyOdpvC-aCfRRWEGS5lXRPC6qJ0Z79tnrnTNbOu8VgamIxVATeM_wD2q7InpM$ > > > > , 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. > > 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. > That is correct. The GPIO mode is modified in a very hidden way, by pass pinctrl mechanism. > 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. > > > > > > > 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. > > > > > > > > > + 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? > > > > > > > I have to call pinctrl_select_state() in pairs. > > > > > > > > + } 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); > > > > + } > > > > + } > > > > } > > [...] > > Regards, Axe
On Thu, Jun 23, 2022 at 11:10 AM Axe Yang <axe.yang@mediatek.com> wrote: > 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. > + 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); > + } > + } This looks right. > + /* 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: Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Hi Linus, Thanks for the comments, but Ulf and I have some question on pinctrl. On Fri, 2022-07-22 at 13:21 +0200, Linus Walleij wrote: > On Thu, Jun 23, 2022 at 11:10 AM Axe Yang <axe.yang@mediatek.com> > wrote: > > > 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. > > > + 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); > > + } > > + } > > This looks right. 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() 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? > > > + /* 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? Yes. The property related change is in patch 1/3 > > With that: > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > Yours, > Linus Walleij Regards, Axe
On Mon, Jul 25, 2022 at 11:13 AM Axe Yang <axe.yang@mediatek.com> wrote: > On Fri, 2022-07-22 at 13:21 +0200, Linus Walleij wrote: > > On Thu, Jun 23, 2022 at 11:10 AM Axe Yang <axe.yang@mediatek.com> > > wrote: > 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? > 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
On Mon, 2022-07-25 at 14:46 +0200, Linus Walleij wrote: > On Mon, Jul 25, 2022 at 11:13 AM Axe Yang <axe.yang@mediatek.com> > wrote: > > On Fri, 2022-07-22 at 13:21 +0200, Linus Walleij wrote: > > > On Thu, Jun 23, 2022 at 11:10 AM Axe Yang <axe.yang@mediatek.com> > > > wrote: > > SDIO DAT1 pin mode is changed to GPIO mode in > > dev_pm_set_dedicated_wake_irq_reverse(): > > > > https://urldefense.com/v3/__https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c*L339__;Iw!!CTRNKA9wMg0ARbw!zE3kmi37pZw4HiBNeRipWbi3gbAqrljLVQc5JVz-WP_NaIWTVhXshkakjFNh478e$ > > > > > > 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. > > 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? 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. > > > 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? 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. > > Regards, Axe
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 195dc897188b..f907b96cfd87 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -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 <chaotian.jing@mediatek.com> */ @@ -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); }
Add support for eint IRQ when MSDC is used as an SDIO host. This feature requires SDIO device support async IRQ function. With this feature, SDIO host can be awakened by SDIO card in suspend state, without additional pin. MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC turn off clock and switch SDIO DAT1 pin to GPIO mode. And during resume, switch GPIO function back to DAT1 mode then turn on clock. Some device tree property should be added or modified in MSDC node to support SDIO eint IRQ. Pinctrls "state_eint" is mandatory. Since this feature depends on asynchronous interrupts, "wakeup-source", "keep-power-in-suspend" and "cap-sdio-irq" flags are necessary, and the interrupts list should be extended(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 <yong.mao@mediatek.com> Signed-off-by: Yong Mao <yong.mao@mediatek.com> Signed-off-by: Axe Yang <axe.yang@mediatek.com> --- drivers/mmc/host/mtk-sd.c | 84 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 6 deletions(-)