From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABC38C433FE for ; Wed, 19 Jan 2022 10:09:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353440AbiASKJB (ORCPT ); Wed, 19 Jan 2022 05:09:01 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:37144 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S235647AbiASKJA (ORCPT ); Wed, 19 Jan 2022 05:09:00 -0500 X-UUID: 49d83384142440208d0a257734441af4-20220119 X-UUID: 49d83384142440208d0a257734441af4-20220119 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 386561848; Wed, 19 Jan 2022 18:08:57 +0800 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Wed, 19 Jan 2022 18:08:56 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 19 Jan 2022 18:08:55 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 19 Jan 2022 18:08:54 +0800 Message-ID: <923906efde997b1ad338c1f5d7748acd078e2438.camel@mediatek.com> Subject: Re: [PATCH 3/3] mmc: mediatek: add support for SDIO eint IRQ From: Axe Yang To: AngeloGioacchino Del Regno , "Ulf Hansson" , Rob Herring , "Chaotian Jing" , Matthias Brugger , Adrian Hunter CC: Yoshihiro Shimoda , Satya Tangirala , Andy Shevchenko , Wolfram Sang , Lucas Stach , Eric Biggers , Andrew Jeffery , Stephen Boyd , Kiwoong Kim , Yue Hu , Tian Tao , , , , , , Yong Mao Date: Wed, 19 Jan 2022 18:08:54 +0800 In-Reply-To: <754779eb-71f9-2083-a204-1d98b4a04a08@collabora.com> References: <20220117071220.17330-1-axe.yang@mediatek.com> <20220117071220.17330-4-axe.yang@mediatek.com> <754779eb-71f9-2083-a204-1d98b4a04a08@collabora.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2022-01-17 at 11:50 +0100, AngeloGioacchino Del Regno wrote: > Il 17/01/22 08:12, Axe Yang ha scritto: > > 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 named state_dat1 and state_eint > > are mandatory. And cap-sdio-async-irq flag is necessary since this > > feature depends on asynchronous interrupt: > > &mmcX { > > ... > > pinctrl-names = "default", "state_uhs", > > "state_eint", > > "state_dat1"; > > ... > > pinctrl-2 = <&mmc2_pins_eint>; > > pinctrl-3 = <&mmc2_pins_dat1>; > > ... > > cap-sdio-async-irq; > > ... > > }; > > > > Signed-off-by: Axe Yang > > Signed-off-by: Yong Mao > > --- > > drivers/mmc/host/mtk-sd.c | 125 > > +++++++++++++++++++++++++++++++++++--- > > 1 file changed, 117 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > > index 65037e1d7723..cbdbcce99fd9 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) 2022 MediaTek Inc. > > * Author: Chaotian.Jing > > */ > > > > @@ -9,6 +9,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -440,8 +441,12 @@ struct msdc_host { > > struct pinctrl *pinctrl; > > struct pinctrl_state *pins_default; > > struct pinctrl_state *pins_uhs; > > + struct pinctrl_state *pins_eint; > > + struct pinctrl_state *pins_dat1; > > struct delayed_work req_timeout; > > int irq; /* host interrupt */ > > + int eint_irq; /* device interrupt */ > > + int sdio_irq_cnt; /* irq enable cnt */ > > struct reset_control *reset; > > > > struct clk *src_clk; /* msdc source clock */ > > @@ -465,6 +470,7 @@ struct msdc_host { > > bool hs400_tuning; /* hs400 mode online tuning */ > > bool internal_cd; /* Use internal card-detect logic */ > > bool cqhci; /* support eMMC hw cmdq */ > > + bool sdio_eint_ready; /* Ready to support SDIO eint > > interrupt */ > > struct msdc_save_para save_para; /* used when gate HCLK */ > > struct msdc_tune_para def_tune_para; /* default tune setting */ > > struct msdc_tune_para saved_tune_para; /* tune result of > > CMD21/CMD19 */ > > @@ -1527,10 +1533,12 @@ static void msdc_enable_sdio_irq(struct > > mmc_host *mmc, int enb) > > __msdc_enable_sdio_irq(host, enb); > > spin_unlock_irqrestore(&host->lock, flags); > > > > - if (enb) > > - pm_runtime_get_noresume(host->dev); > > - else > > - pm_runtime_put_noidle(host->dev); > > + if (mmc->card && !mmc->card->cccr.enable_async_irq) { > > + if (enb) > > + pm_runtime_get_noresume(host->dev); > > + else > > + pm_runtime_put_noidle(host->dev); > > + } > > } > > > > static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32 > > intsts) > > @@ -2461,6 +2469,50 @@ static const struct mmc_host_ops mt_msdc_ops > > = { > > .hw_reset = msdc_hw_reset, > > }; > > > > +static irqreturn_t msdc_sdio_eint_irq(int irq, void *dev_id) > > +{ > > + struct msdc_host *host = dev_id; > > + struct mmc_host *mmc = mmc_from_priv(host); > > + unsigned long flags; > > + > > + spin_lock_irqsave(&host->lock, flags); > > + if (likely(host->sdio_irq_cnt > 0)) { > > + disable_irq_nosync(host->eint_irq); > > + disable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt--; > > + } > > + spin_unlock_irqrestore(&host->lock, flags); > > + > > + sdio_signal_irq(mmc); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static int msdc_request_dat1_eint_irq(struct msdc_host *host) > > +{ > > + struct gpio_desc *desc; > > + int irq, ret; > > + > > + desc = devm_gpiod_get(host->dev, "eint", GPIOD_IN); > > + if (IS_ERR(desc)) > > + return PTR_ERR(desc); > > + > > + ret = gpiod_to_irq(desc); > > + if (ret < 0) > > + return ret; > > + > > + irq = ret; > > + ret = devm_request_threaded_irq(host->dev, irq, NULL, > > msdc_sdio_eint_irq, > > + IRQF_TRIGGER_LOW | IRQF_ONESHOT > > | IRQF_NO_AUTOEN, > > + "sdio-eint", host); > > + if (ret) > > + return ret; > > + > > + host->eint_irq = irq; > > + > > + return 0; > > +} > > + > > static const struct cqhci_host_ops msdc_cmdq_ops = { > > .enable = msdc_cqe_enable, > > .disable = msdc_cqe_disable, > > @@ -2631,6 +2683,23 @@ static int msdc_drv_probe(struct > > platform_device *pdev) > > goto host_free; > > } > > > > + if (!(mmc->caps2 & MMC_CAP2_NO_SDIO)) { > > Please, also check for the async irq capability here: > > if (!(mmc->caps2 & MMC_CAP2_NO_SDIO) && (mmc->caps2 & > MMC_CAP2_SDIO_ASYNC_IRQ)) { > > ...because if we have "state_eint" specified in DT, but we didn't > *also* specify > cap-sdio-async-irq, then clearly we don't want to use this > functionality - hence > it becomes useless to register the interrupt handler for that because > we're never > enabling the CCCR_INTERRUPT_EXT on the card (from > drivers/mmc/core/host.c). > > Regards, > Angelo Thanks, will fix this in next version. > > > + /* Support for SDIO eint irq */ > > + host->pins_eint = pinctrl_lookup_state(host->pinctrl, > > "state_eint"); > > + if (IS_ERR(host->pins_eint)) { > > + dev_dbg(&pdev->dev, "Cannot find pinctrl > > eint!\n"); > > + } else { > > + host->pins_dat1 = pinctrl_lookup_state(host- > > >pinctrl, "state_dat1"); > > + if (IS_ERR(host->pins_dat1)) { > > + ret = dev_err_probe(&pdev->dev, > > PTR_ERR(host->pins_dat1), > > + "Cannot find > > pinctrl dat1!\n"); > > + goto host_free; > > + } > > + > > + host->sdio_eint_ready = true; > > + } > > + } > > + > > msdc_of_property_parse(pdev, host); > > > > host->dev = &pdev->dev; > > @@ -2722,6 +2791,16 @@ static int msdc_drv_probe(struct > > platform_device *pdev) > > if (ret) > > goto release; > > > > + if (host->sdio_eint_ready) { > > + ret = msdc_request_dat1_eint_irq(host); > > + if (ret) { > > + dev_err(host->dev, "Failed to register data1 > > eint irq!\n"); > > + goto release; > > + } > > + > > + pinctrl_select_state(host->pinctrl, host->pins_dat1); > > + } > > + > > pm_runtime_set_active(host->dev); > > pm_runtime_set_autosuspend_delay(host->dev, > > MTK_MMC_AUTOSUSPEND_DELAY); > > pm_runtime_use_autosuspend(host->dev); > > @@ -2841,16 +2920,31 @@ static void msdc_restore_reg(struct > > msdc_host *host) > > > > static int __maybe_unused msdc_runtime_suspend(struct device > > *dev) > > { > > + unsigned long flags; > > struct mmc_host *mmc = dev_get_drvdata(dev); > > struct msdc_host *host = mmc_priv(mmc); > > > > msdc_save_reg(host); > > + > > + if (host->sdio_eint_ready) { > > + disable_irq(host->irq); > > + pinctrl_select_state(host->pinctrl, host->pins_eint); > > + spin_lock_irqsave(&host->lock, flags); > > + if (host->sdio_irq_cnt == 0) { > > + enable_irq(host->eint_irq); > > + enable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt++; > > + } > > + sdr_clr_bits(host->base + SDC_CFG, SDC_CFG_SDIOIDE); > > + spin_unlock_irqrestore(&host->lock, flags); > > + } > > msdc_gate_clock(host); > > return 0; > > } > > > > static int __maybe_unused msdc_runtime_resume(struct device *dev) > > { > > + unsigned long flags; > > struct mmc_host *mmc = dev_get_drvdata(dev); > > struct msdc_host *host = mmc_priv(mmc); > > int ret; > > @@ -2860,10 +2954,25 @@ static int __maybe_unused > > msdc_runtime_resume(struct device *dev) > > return ret; > > > > msdc_restore_reg(host); > > + > > + if (host->sdio_eint_ready) { > > + spin_lock_irqsave(&host->lock, flags); > > + if (host->sdio_irq_cnt > 0) { > > + disable_irq_nosync(host->eint_irq); > > + disable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt--; > > + sdr_set_bits(host->base + SDC_CFG, > > SDC_CFG_SDIOIDE); > > + } else { > > + sdr_clr_bits(host->base + MSDC_INTEN, > > MSDC_INTEN_SDIOIRQ); > > + } > > + spin_unlock_irqrestore(&host->lock, flags); > > + pinctrl_select_state(host->pinctrl, host->pins_uhs); > > + enable_irq(host->irq); > > + } > > return 0; > > } > > > > -static int __maybe_unused msdc_suspend(struct device *dev) > > +static int __maybe_unused msdc_suspend_noirq(struct device *dev) > > { > > struct mmc_host *mmc = dev_get_drvdata(dev); > > int ret; > > @@ -2877,13 +2986,13 @@ static int __maybe_unused > > msdc_suspend(struct device *dev) > > return pm_runtime_force_suspend(dev); > > } > > > > -static int __maybe_unused msdc_resume(struct device *dev) > > +static int __maybe_unused msdc_resume_noirq(struct device *dev) > > { > > return pm_runtime_force_resume(dev); > > } > > > > static const struct dev_pm_ops msdc_dev_pm_ops = { > > - SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) > > + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msdc_suspend_noirq, > > msdc_resume_noirq) > > SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, > > NULL) > > }; > > > > > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A796C433EF for ; Wed, 19 Jan 2022 10:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ttZjOtLg3RPpwJuQZHtvl+XLoRJKIGMmmR7AEWYTn3k=; b=MmcwOceiK/+jMN BgZ3Iraav2kqSGO5UKf1e6Mr7aDCfWLVc8zgO6SPTeJO0qzZeMxhI+BPPNb9hdV328/8siF2kMT+R FsueBpx/kw/GriNWC8WhOaDXK2Nz85PWn7ruV1hgzAJ/HnCJY5B3mABW9mMk5gnkEo5EeSa/XMYp9 +QfzXse2fUuQvaKmo0gkj3FTqnMJKF6QV5Ozk2cW4QveYRdDMfMR+n1XQ8hr4c9hqMKPznwWmzwJQ ZC7OSsEqdDxL3i2DF6bgvGa76prGjlCi9oW3N5c4MoxO+LCRrgbVEBuU6PVYWIkRdGHarLP3532o7 wZ5nej+VglCzk/ZWbIoA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7u9-004omD-V0; Wed, 19 Jan 2022 10:09:25 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7tv-004ogC-HU; Wed, 19 Jan 2022 10:09:13 +0000 X-UUID: edbfe59976d6444e8ab4a0db01ecddcb-20220119 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=arZnyqDKD9FxpERT0trtDxvrDfuZ/EfoVh8hok1TihA=; b=cNyN0jxb1oHU/70PoSXxAPT8HIrV3N6hRdjH/zkYsFECGxYs5CzWwm90pLBXoiiaPaj7Eau1YYKdZsUE0H/UPmLP6P6HZ8PBC45r1ESy11Kiz4oZXsP8K9p33fh6ztkou+VjNJR+3klziUPjWXvMfJ6n98APQPDD7VEwfnMqgsI=; X-UUID: edbfe59976d6444e8ab4a0db01ecddcb-20220119 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 266566027; Wed, 19 Jan 2022 03:09:04 -0700 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 19 Jan 2022 02:09:03 -0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 19 Jan 2022 18:08:55 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 19 Jan 2022 18:08:54 +0800 Message-ID: <923906efde997b1ad338c1f5d7748acd078e2438.camel@mediatek.com> Subject: Re: [PATCH 3/3] mmc: mediatek: add support for SDIO eint IRQ From: Axe Yang To: AngeloGioacchino Del Regno , "Ulf Hansson" , Rob Herring , "Chaotian Jing" , Matthias Brugger , Adrian Hunter CC: Yoshihiro Shimoda , Satya Tangirala , Andy Shevchenko , Wolfram Sang , Lucas Stach , Eric Biggers , Andrew Jeffery , Stephen Boyd , Kiwoong Kim , Yue Hu , Tian Tao , , , , , , Yong Mao Date: Wed, 19 Jan 2022 18:08:54 +0800 In-Reply-To: <754779eb-71f9-2083-a204-1d98b4a04a08@collabora.com> References: <20220117071220.17330-1-axe.yang@mediatek.com> <20220117071220.17330-4-axe.yang@mediatek.com> <754779eb-71f9-2083-a204-1d98b4a04a08@collabora.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220119_020911_618582_D770170D X-CRM114-Status: GOOD ( 37.40 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org On Mon, 2022-01-17 at 11:50 +0100, AngeloGioacchino Del Regno wrote: > Il 17/01/22 08:12, Axe Yang ha scritto: > > 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 named state_dat1 and state_eint > > are mandatory. And cap-sdio-async-irq flag is necessary since this > > feature depends on asynchronous interrupt: > > &mmcX { > > ... > > pinctrl-names = "default", "state_uhs", > > "state_eint", > > "state_dat1"; > > ... > > pinctrl-2 = <&mmc2_pins_eint>; > > pinctrl-3 = <&mmc2_pins_dat1>; > > ... > > cap-sdio-async-irq; > > ... > > }; > > > > Signed-off-by: Axe Yang > > Signed-off-by: Yong Mao > > --- > > drivers/mmc/host/mtk-sd.c | 125 > > +++++++++++++++++++++++++++++++++++--- > > 1 file changed, 117 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > > index 65037e1d7723..cbdbcce99fd9 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) 2022 MediaTek Inc. > > * Author: Chaotian.Jing > > */ > > > > @@ -9,6 +9,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -440,8 +441,12 @@ struct msdc_host { > > struct pinctrl *pinctrl; > > struct pinctrl_state *pins_default; > > struct pinctrl_state *pins_uhs; > > + struct pinctrl_state *pins_eint; > > + struct pinctrl_state *pins_dat1; > > struct delayed_work req_timeout; > > int irq; /* host interrupt */ > > + int eint_irq; /* device interrupt */ > > + int sdio_irq_cnt; /* irq enable cnt */ > > struct reset_control *reset; > > > > struct clk *src_clk; /* msdc source clock */ > > @@ -465,6 +470,7 @@ struct msdc_host { > > bool hs400_tuning; /* hs400 mode online tuning */ > > bool internal_cd; /* Use internal card-detect logic */ > > bool cqhci; /* support eMMC hw cmdq */ > > + bool sdio_eint_ready; /* Ready to support SDIO eint > > interrupt */ > > struct msdc_save_para save_para; /* used when gate HCLK */ > > struct msdc_tune_para def_tune_para; /* default tune setting */ > > struct msdc_tune_para saved_tune_para; /* tune result of > > CMD21/CMD19 */ > > @@ -1527,10 +1533,12 @@ static void msdc_enable_sdio_irq(struct > > mmc_host *mmc, int enb) > > __msdc_enable_sdio_irq(host, enb); > > spin_unlock_irqrestore(&host->lock, flags); > > > > - if (enb) > > - pm_runtime_get_noresume(host->dev); > > - else > > - pm_runtime_put_noidle(host->dev); > > + if (mmc->card && !mmc->card->cccr.enable_async_irq) { > > + if (enb) > > + pm_runtime_get_noresume(host->dev); > > + else > > + pm_runtime_put_noidle(host->dev); > > + } > > } > > > > static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32 > > intsts) > > @@ -2461,6 +2469,50 @@ static const struct mmc_host_ops mt_msdc_ops > > = { > > .hw_reset = msdc_hw_reset, > > }; > > > > +static irqreturn_t msdc_sdio_eint_irq(int irq, void *dev_id) > > +{ > > + struct msdc_host *host = dev_id; > > + struct mmc_host *mmc = mmc_from_priv(host); > > + unsigned long flags; > > + > > + spin_lock_irqsave(&host->lock, flags); > > + if (likely(host->sdio_irq_cnt > 0)) { > > + disable_irq_nosync(host->eint_irq); > > + disable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt--; > > + } > > + spin_unlock_irqrestore(&host->lock, flags); > > + > > + sdio_signal_irq(mmc); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static int msdc_request_dat1_eint_irq(struct msdc_host *host) > > +{ > > + struct gpio_desc *desc; > > + int irq, ret; > > + > > + desc = devm_gpiod_get(host->dev, "eint", GPIOD_IN); > > + if (IS_ERR(desc)) > > + return PTR_ERR(desc); > > + > > + ret = gpiod_to_irq(desc); > > + if (ret < 0) > > + return ret; > > + > > + irq = ret; > > + ret = devm_request_threaded_irq(host->dev, irq, NULL, > > msdc_sdio_eint_irq, > > + IRQF_TRIGGER_LOW | IRQF_ONESHOT > > | IRQF_NO_AUTOEN, > > + "sdio-eint", host); > > + if (ret) > > + return ret; > > + > > + host->eint_irq = irq; > > + > > + return 0; > > +} > > + > > static const struct cqhci_host_ops msdc_cmdq_ops = { > > .enable = msdc_cqe_enable, > > .disable = msdc_cqe_disable, > > @@ -2631,6 +2683,23 @@ static int msdc_drv_probe(struct > > platform_device *pdev) > > goto host_free; > > } > > > > + if (!(mmc->caps2 & MMC_CAP2_NO_SDIO)) { > > Please, also check for the async irq capability here: > > if (!(mmc->caps2 & MMC_CAP2_NO_SDIO) && (mmc->caps2 & > MMC_CAP2_SDIO_ASYNC_IRQ)) { > > ...because if we have "state_eint" specified in DT, but we didn't > *also* specify > cap-sdio-async-irq, then clearly we don't want to use this > functionality - hence > it becomes useless to register the interrupt handler for that because > we're never > enabling the CCCR_INTERRUPT_EXT on the card (from > drivers/mmc/core/host.c). > > Regards, > Angelo Thanks, will fix this in next version. > > > + /* Support for SDIO eint irq */ > > + host->pins_eint = pinctrl_lookup_state(host->pinctrl, > > "state_eint"); > > + if (IS_ERR(host->pins_eint)) { > > + dev_dbg(&pdev->dev, "Cannot find pinctrl > > eint!\n"); > > + } else { > > + host->pins_dat1 = pinctrl_lookup_state(host- > > >pinctrl, "state_dat1"); > > + if (IS_ERR(host->pins_dat1)) { > > + ret = dev_err_probe(&pdev->dev, > > PTR_ERR(host->pins_dat1), > > + "Cannot find > > pinctrl dat1!\n"); > > + goto host_free; > > + } > > + > > + host->sdio_eint_ready = true; > > + } > > + } > > + > > msdc_of_property_parse(pdev, host); > > > > host->dev = &pdev->dev; > > @@ -2722,6 +2791,16 @@ static int msdc_drv_probe(struct > > platform_device *pdev) > > if (ret) > > goto release; > > > > + if (host->sdio_eint_ready) { > > + ret = msdc_request_dat1_eint_irq(host); > > + if (ret) { > > + dev_err(host->dev, "Failed to register data1 > > eint irq!\n"); > > + goto release; > > + } > > + > > + pinctrl_select_state(host->pinctrl, host->pins_dat1); > > + } > > + > > pm_runtime_set_active(host->dev); > > pm_runtime_set_autosuspend_delay(host->dev, > > MTK_MMC_AUTOSUSPEND_DELAY); > > pm_runtime_use_autosuspend(host->dev); > > @@ -2841,16 +2920,31 @@ static void msdc_restore_reg(struct > > msdc_host *host) > > > > static int __maybe_unused msdc_runtime_suspend(struct device > > *dev) > > { > > + unsigned long flags; > > struct mmc_host *mmc = dev_get_drvdata(dev); > > struct msdc_host *host = mmc_priv(mmc); > > > > msdc_save_reg(host); > > + > > + if (host->sdio_eint_ready) { > > + disable_irq(host->irq); > > + pinctrl_select_state(host->pinctrl, host->pins_eint); > > + spin_lock_irqsave(&host->lock, flags); > > + if (host->sdio_irq_cnt == 0) { > > + enable_irq(host->eint_irq); > > + enable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt++; > > + } > > + sdr_clr_bits(host->base + SDC_CFG, SDC_CFG_SDIOIDE); > > + spin_unlock_irqrestore(&host->lock, flags); > > + } > > msdc_gate_clock(host); > > return 0; > > } > > > > static int __maybe_unused msdc_runtime_resume(struct device *dev) > > { > > + unsigned long flags; > > struct mmc_host *mmc = dev_get_drvdata(dev); > > struct msdc_host *host = mmc_priv(mmc); > > int ret; > > @@ -2860,10 +2954,25 @@ static int __maybe_unused > > msdc_runtime_resume(struct device *dev) > > return ret; > > > > msdc_restore_reg(host); > > + > > + if (host->sdio_eint_ready) { > > + spin_lock_irqsave(&host->lock, flags); > > + if (host->sdio_irq_cnt > 0) { > > + disable_irq_nosync(host->eint_irq); > > + disable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt--; > > + sdr_set_bits(host->base + SDC_CFG, > > SDC_CFG_SDIOIDE); > > + } else { > > + sdr_clr_bits(host->base + MSDC_INTEN, > > MSDC_INTEN_SDIOIRQ); > > + } > > + spin_unlock_irqrestore(&host->lock, flags); > > + pinctrl_select_state(host->pinctrl, host->pins_uhs); > > + enable_irq(host->irq); > > + } > > return 0; > > } > > > > -static int __maybe_unused msdc_suspend(struct device *dev) > > +static int __maybe_unused msdc_suspend_noirq(struct device *dev) > > { > > struct mmc_host *mmc = dev_get_drvdata(dev); > > int ret; > > @@ -2877,13 +2986,13 @@ static int __maybe_unused > > msdc_suspend(struct device *dev) > > return pm_runtime_force_suspend(dev); > > } > > > > -static int __maybe_unused msdc_resume(struct device *dev) > > +static int __maybe_unused msdc_resume_noirq(struct device *dev) > > { > > return pm_runtime_force_resume(dev); > > } > > > > static const struct dev_pm_ops msdc_dev_pm_ops = { > > - SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) > > + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msdc_suspend_noirq, > > msdc_resume_noirq) > > SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, > > NULL) > > }; > > > > > > _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4241EC433EF for ; Wed, 19 Jan 2022 10:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Pf6TBNq+2WLYvhi+HRvom/SJrb+SWV3CPdpn/8ZXaDU=; b=FZoWrPFWQ0+xge JxyVoOnqCnl++we309L3/fzg0rKIH3LvGyS5okFGcWvWmzuMTeFMEeZHBKDqZEVSFUYnIxOIov7Tr u0qELRF6RSPY+JpCmEXx8OT+TK7v2ZcifM5drZfrta70Sxlooa3hMJsSupR2rpLcZQlsLEmvjo0Wn nuDPjHwvBnAT7NDoRPvyVPVRbWgW1EmwADscMAETKQzHfJNneew/h4SjGMEEMXFatmmwfX3PmXVaA TNNarppYHhiZEF75xwQYhkAGCsmKQ3DCeJUkXgYdWviWtRwXqprRtsbqKXeQIKzcntwPXIHjYN/En 2guGaxAkvO66X3Syy3xA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7u0-004oiz-20; Wed, 19 Jan 2022 10:09:16 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nA7tv-004ogC-HU; Wed, 19 Jan 2022 10:09:13 +0000 X-UUID: edbfe59976d6444e8ab4a0db01ecddcb-20220119 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=arZnyqDKD9FxpERT0trtDxvrDfuZ/EfoVh8hok1TihA=; b=cNyN0jxb1oHU/70PoSXxAPT8HIrV3N6hRdjH/zkYsFECGxYs5CzWwm90pLBXoiiaPaj7Eau1YYKdZsUE0H/UPmLP6P6HZ8PBC45r1ESy11Kiz4oZXsP8K9p33fh6ztkou+VjNJR+3klziUPjWXvMfJ6n98APQPDD7VEwfnMqgsI=; X-UUID: edbfe59976d6444e8ab4a0db01ecddcb-20220119 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 266566027; Wed, 19 Jan 2022 03:09:04 -0700 Received: from mtkexhb02.mediatek.inc (172.21.101.103) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 19 Jan 2022 02:09:03 -0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkexhb02.mediatek.inc (172.21.101.103) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 19 Jan 2022 18:08:55 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 19 Jan 2022 18:08:54 +0800 Message-ID: <923906efde997b1ad338c1f5d7748acd078e2438.camel@mediatek.com> Subject: Re: [PATCH 3/3] mmc: mediatek: add support for SDIO eint IRQ From: Axe Yang To: AngeloGioacchino Del Regno , "Ulf Hansson" , Rob Herring , "Chaotian Jing" , Matthias Brugger , Adrian Hunter CC: Yoshihiro Shimoda , Satya Tangirala , Andy Shevchenko , Wolfram Sang , Lucas Stach , Eric Biggers , Andrew Jeffery , Stephen Boyd , Kiwoong Kim , Yue Hu , Tian Tao , , , , , , Yong Mao Date: Wed, 19 Jan 2022 18:08:54 +0800 In-Reply-To: <754779eb-71f9-2083-a204-1d98b4a04a08@collabora.com> References: <20220117071220.17330-1-axe.yang@mediatek.com> <20220117071220.17330-4-axe.yang@mediatek.com> <754779eb-71f9-2083-a204-1d98b4a04a08@collabora.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220119_020911_618582_D770170D X-CRM114-Status: GOOD ( 37.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 2022-01-17 at 11:50 +0100, AngeloGioacchino Del Regno wrote: > Il 17/01/22 08:12, Axe Yang ha scritto: > > 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 named state_dat1 and state_eint > > are mandatory. And cap-sdio-async-irq flag is necessary since this > > feature depends on asynchronous interrupt: > > &mmcX { > > ... > > pinctrl-names = "default", "state_uhs", > > "state_eint", > > "state_dat1"; > > ... > > pinctrl-2 = <&mmc2_pins_eint>; > > pinctrl-3 = <&mmc2_pins_dat1>; > > ... > > cap-sdio-async-irq; > > ... > > }; > > > > Signed-off-by: Axe Yang > > Signed-off-by: Yong Mao > > --- > > drivers/mmc/host/mtk-sd.c | 125 > > +++++++++++++++++++++++++++++++++++--- > > 1 file changed, 117 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > > index 65037e1d7723..cbdbcce99fd9 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) 2022 MediaTek Inc. > > * Author: Chaotian.Jing > > */ > > > > @@ -9,6 +9,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -440,8 +441,12 @@ struct msdc_host { > > struct pinctrl *pinctrl; > > struct pinctrl_state *pins_default; > > struct pinctrl_state *pins_uhs; > > + struct pinctrl_state *pins_eint; > > + struct pinctrl_state *pins_dat1; > > struct delayed_work req_timeout; > > int irq; /* host interrupt */ > > + int eint_irq; /* device interrupt */ > > + int sdio_irq_cnt; /* irq enable cnt */ > > struct reset_control *reset; > > > > struct clk *src_clk; /* msdc source clock */ > > @@ -465,6 +470,7 @@ struct msdc_host { > > bool hs400_tuning; /* hs400 mode online tuning */ > > bool internal_cd; /* Use internal card-detect logic */ > > bool cqhci; /* support eMMC hw cmdq */ > > + bool sdio_eint_ready; /* Ready to support SDIO eint > > interrupt */ > > struct msdc_save_para save_para; /* used when gate HCLK */ > > struct msdc_tune_para def_tune_para; /* default tune setting */ > > struct msdc_tune_para saved_tune_para; /* tune result of > > CMD21/CMD19 */ > > @@ -1527,10 +1533,12 @@ static void msdc_enable_sdio_irq(struct > > mmc_host *mmc, int enb) > > __msdc_enable_sdio_irq(host, enb); > > spin_unlock_irqrestore(&host->lock, flags); > > > > - if (enb) > > - pm_runtime_get_noresume(host->dev); > > - else > > - pm_runtime_put_noidle(host->dev); > > + if (mmc->card && !mmc->card->cccr.enable_async_irq) { > > + if (enb) > > + pm_runtime_get_noresume(host->dev); > > + else > > + pm_runtime_put_noidle(host->dev); > > + } > > } > > > > static irqreturn_t msdc_cmdq_irq(struct msdc_host *host, u32 > > intsts) > > @@ -2461,6 +2469,50 @@ static const struct mmc_host_ops mt_msdc_ops > > = { > > .hw_reset = msdc_hw_reset, > > }; > > > > +static irqreturn_t msdc_sdio_eint_irq(int irq, void *dev_id) > > +{ > > + struct msdc_host *host = dev_id; > > + struct mmc_host *mmc = mmc_from_priv(host); > > + unsigned long flags; > > + > > + spin_lock_irqsave(&host->lock, flags); > > + if (likely(host->sdio_irq_cnt > 0)) { > > + disable_irq_nosync(host->eint_irq); > > + disable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt--; > > + } > > + spin_unlock_irqrestore(&host->lock, flags); > > + > > + sdio_signal_irq(mmc); > > + > > + return IRQ_HANDLED; > > +} > > + > > +static int msdc_request_dat1_eint_irq(struct msdc_host *host) > > +{ > > + struct gpio_desc *desc; > > + int irq, ret; > > + > > + desc = devm_gpiod_get(host->dev, "eint", GPIOD_IN); > > + if (IS_ERR(desc)) > > + return PTR_ERR(desc); > > + > > + ret = gpiod_to_irq(desc); > > + if (ret < 0) > > + return ret; > > + > > + irq = ret; > > + ret = devm_request_threaded_irq(host->dev, irq, NULL, > > msdc_sdio_eint_irq, > > + IRQF_TRIGGER_LOW | IRQF_ONESHOT > > | IRQF_NO_AUTOEN, > > + "sdio-eint", host); > > + if (ret) > > + return ret; > > + > > + host->eint_irq = irq; > > + > > + return 0; > > +} > > + > > static const struct cqhci_host_ops msdc_cmdq_ops = { > > .enable = msdc_cqe_enable, > > .disable = msdc_cqe_disable, > > @@ -2631,6 +2683,23 @@ static int msdc_drv_probe(struct > > platform_device *pdev) > > goto host_free; > > } > > > > + if (!(mmc->caps2 & MMC_CAP2_NO_SDIO)) { > > Please, also check for the async irq capability here: > > if (!(mmc->caps2 & MMC_CAP2_NO_SDIO) && (mmc->caps2 & > MMC_CAP2_SDIO_ASYNC_IRQ)) { > > ...because if we have "state_eint" specified in DT, but we didn't > *also* specify > cap-sdio-async-irq, then clearly we don't want to use this > functionality - hence > it becomes useless to register the interrupt handler for that because > we're never > enabling the CCCR_INTERRUPT_EXT on the card (from > drivers/mmc/core/host.c). > > Regards, > Angelo Thanks, will fix this in next version. > > > + /* Support for SDIO eint irq */ > > + host->pins_eint = pinctrl_lookup_state(host->pinctrl, > > "state_eint"); > > + if (IS_ERR(host->pins_eint)) { > > + dev_dbg(&pdev->dev, "Cannot find pinctrl > > eint!\n"); > > + } else { > > + host->pins_dat1 = pinctrl_lookup_state(host- > > >pinctrl, "state_dat1"); > > + if (IS_ERR(host->pins_dat1)) { > > + ret = dev_err_probe(&pdev->dev, > > PTR_ERR(host->pins_dat1), > > + "Cannot find > > pinctrl dat1!\n"); > > + goto host_free; > > + } > > + > > + host->sdio_eint_ready = true; > > + } > > + } > > + > > msdc_of_property_parse(pdev, host); > > > > host->dev = &pdev->dev; > > @@ -2722,6 +2791,16 @@ static int msdc_drv_probe(struct > > platform_device *pdev) > > if (ret) > > goto release; > > > > + if (host->sdio_eint_ready) { > > + ret = msdc_request_dat1_eint_irq(host); > > + if (ret) { > > + dev_err(host->dev, "Failed to register data1 > > eint irq!\n"); > > + goto release; > > + } > > + > > + pinctrl_select_state(host->pinctrl, host->pins_dat1); > > + } > > + > > pm_runtime_set_active(host->dev); > > pm_runtime_set_autosuspend_delay(host->dev, > > MTK_MMC_AUTOSUSPEND_DELAY); > > pm_runtime_use_autosuspend(host->dev); > > @@ -2841,16 +2920,31 @@ static void msdc_restore_reg(struct > > msdc_host *host) > > > > static int __maybe_unused msdc_runtime_suspend(struct device > > *dev) > > { > > + unsigned long flags; > > struct mmc_host *mmc = dev_get_drvdata(dev); > > struct msdc_host *host = mmc_priv(mmc); > > > > msdc_save_reg(host); > > + > > + if (host->sdio_eint_ready) { > > + disable_irq(host->irq); > > + pinctrl_select_state(host->pinctrl, host->pins_eint); > > + spin_lock_irqsave(&host->lock, flags); > > + if (host->sdio_irq_cnt == 0) { > > + enable_irq(host->eint_irq); > > + enable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt++; > > + } > > + sdr_clr_bits(host->base + SDC_CFG, SDC_CFG_SDIOIDE); > > + spin_unlock_irqrestore(&host->lock, flags); > > + } > > msdc_gate_clock(host); > > return 0; > > } > > > > static int __maybe_unused msdc_runtime_resume(struct device *dev) > > { > > + unsigned long flags; > > struct mmc_host *mmc = dev_get_drvdata(dev); > > struct msdc_host *host = mmc_priv(mmc); > > int ret; > > @@ -2860,10 +2954,25 @@ static int __maybe_unused > > msdc_runtime_resume(struct device *dev) > > return ret; > > > > msdc_restore_reg(host); > > + > > + if (host->sdio_eint_ready) { > > + spin_lock_irqsave(&host->lock, flags); > > + if (host->sdio_irq_cnt > 0) { > > + disable_irq_nosync(host->eint_irq); > > + disable_irq_wake(host->eint_irq); > > + host->sdio_irq_cnt--; > > + sdr_set_bits(host->base + SDC_CFG, > > SDC_CFG_SDIOIDE); > > + } else { > > + sdr_clr_bits(host->base + MSDC_INTEN, > > MSDC_INTEN_SDIOIRQ); > > + } > > + spin_unlock_irqrestore(&host->lock, flags); > > + pinctrl_select_state(host->pinctrl, host->pins_uhs); > > + enable_irq(host->irq); > > + } > > return 0; > > } > > > > -static int __maybe_unused msdc_suspend(struct device *dev) > > +static int __maybe_unused msdc_suspend_noirq(struct device *dev) > > { > > struct mmc_host *mmc = dev_get_drvdata(dev); > > int ret; > > @@ -2877,13 +2986,13 @@ static int __maybe_unused > > msdc_suspend(struct device *dev) > > return pm_runtime_force_suspend(dev); > > } > > > > -static int __maybe_unused msdc_resume(struct device *dev) > > +static int __maybe_unused msdc_resume_noirq(struct device *dev) > > { > > return pm_runtime_force_resume(dev); > > } > > > > static const struct dev_pm_ops msdc_dev_pm_ops = { > > - SET_SYSTEM_SLEEP_PM_OPS(msdc_suspend, msdc_resume) > > + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msdc_suspend_noirq, > > msdc_resume_noirq) > > SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, > > NULL) > > }; > > > > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel