mmc: mediatek: add support for SDIO async irq

PATCH Superseded Axe Yang 2 participants 10 messages Jan 11, 2022 – Jan 17, 2022

Subsystems (4)

Device tree bindings Arm MediaTek MMC, SD and SDIO MediaTek MMC/SD/SDIO driver

lore

Share & tools

lore

Axe Yang

author

2022-01-11 01:40 UTC #0 lore raw

v2 cover mmc: mediatek: add support for SDIO async irq

Change in v2:
- change flag name from 'cap-sdio-async-int' to 'cap-sdio-async-irq'
- change corresponding macro names from xxx_INT to xxx_IRQ
- resort new member in msdc_host structure
- refine function msdc_request_dat1_eint_irq()
- rename msdc_{suspend,resume} function names, add suffix '_noirq'
- add MMC_CAP2_NO_SDIO judgement before parse eint related pin setting

Axe Yang (3):
dt-bindings: mmc: add cap-sdio-async-irq flag
mmc: core: Add support for SDIO async interrupt
mmc: mediatek: add support for SDIO eint irq

 .../bindings/mmc/mmc-controller.yaml          |   5 +
 drivers/mmc/core/host.c                       |   2 +
 drivers/mmc/core/sdio.c                       |  17 +++
 drivers/mmc/host/mtk-sd.c                     | 124 ++++++++++++++++--
 include/linux/mmc/card.h                      |   3 +-
 include/linux/mmc/host.h                      |   1 +
 include/linux/mmc/sdio.h                      |   5 +
 7 files changed, 148 insertions(+), 9 deletions(-)

Signature · 1 line

2.18.0

Axe Yang

author

2022-01-11 01:40 UTC #1 lore raw

PATCH v2 1/3 dt-bindings: mmc: add cap-sdio-async-irq flag

Asynchronous interrupt is a mechanism that allow SDIO devices alarm interrupt when host stop providing clock to card. Add a DT flag to enable this feature if it is supported by SDIO card.

Signed-off-by Axe Yang <[email protected]>

---
 Documentation/devicetree/bindings/mmc/mmc-controller.yaml | 5 +++++
 1 file changed, 5 insertions(+)

Documentation/devicetree/bindings/mmc/mmc-controller.yaml +5 -0

index 513f3c8758aa..16fb06f88471 100644
@@ -165,6 +165,11 @@ properties:
     description:
       eMMC hardware reset is supported
 
+  cap-sdio-async-irq:
+    $ref: /schemas/types.yaml#/definitions/flag
+    description:
+      SDIO async interrupt is supported.
+
   cap-sdio-irq:
     $ref: /schemas/types.yaml#/definitions/flag
     description:

Signature · 1 line

2.25.1

Axe Yang

author

2022-01-11 01:41 UTC #2 lore raw

PATCH v2 2/3 mmc: core: Add support for SDIO async interrupt

In reply to Axe Yang

If cap-sdio-async-irq flag is set in host dts node, parse EAI information from SDIO CCCR interrupt externsion segment. If async interrupt is supported by SDIO card then send command to card to enable it and set enable_async_irq flag in sdio_cccr structure to 1. The parse flow is implemented in sdio_read_cccr().

Signed-off-by Axe Yang <[email protected]>

---
 drivers/mmc/core/host.c  |  2 ++
 drivers/mmc/core/sdio.c  | 17 +++++++++++++++++
 include/linux/mmc/card.h |  3 ++-
 include/linux/mmc/host.h |  1 +
 include/linux/mmc/sdio.h |  5 +++++
 5 files changed, 27 insertions(+), 1 deletion(-)

drivers/mmc/core/host.c +2 -0

index cf140f4ec864..a972241548b4 100644
@@ -410,6 +410,8 @@ int mmc_of_parse(struct mmc_host *host)
 	if (device_property_read_bool(dev, "no-mmc-hs400"))
 		host->caps2 &= ~(MMC_CAP2_HS400_1_8V | MMC_CAP2_HS400_1_2V |
 				 MMC_CAP2_HS400_ES);
+	if (device_property_read_bool(dev, "cap-sdio-async-irq"))
+		host->caps2 |= MMC_CAP2_SDIO_ASYNC_IRQ;
 
 	/* Must be after "non-removable" check */
 	if (device_property_read_u32(dev, "fixed-emmc-driver-type", &drv_type) == 0) {

drivers/mmc/core/sdio.c +17 -0

index 41164748723d..771fb5d18585 100644
@@ -225,6 +225,23 @@ static int sdio_read_cccr(struct mmc_card *card, u32 ocr)
 				card->sw_caps.sd3_drv_type |= SD_DRIVER_TYPE_C;
 			if (data & SDIO_DRIVE_SDTD)
 				card->sw_caps.sd3_drv_type |= SD_DRIVER_TYPE_D;
+
+			if (card->host->caps2 & MMC_CAP2_SDIO_ASYNC_IRQ) {
+				ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTERRUPT_EXT, 0,
+						       &data);
+				if (ret)
+					goto out;
+
+				if (data & SDIO_INTERRUPT_EXT_SAI) {
+					data |= SDIO_INTERRUPT_EXT_EAI;
+					ret = mmc_io_rw_direct(card, 1, 0, SDIO_CCCR_INTERRUPT_EXT,
+							       data, NULL);
+					if (ret)
+						goto out;
+
+					card->cccr.enable_async_irq = 1;
+				}
+			}
 		}
 
 		/* if no uhs mode ensure we check for high speed */

include/linux/mmc/card.h +2 -1

index 37f975875102..4df9182bc0e6 100644
@@ -219,7 +219,8 @@ struct sdio_cccr {
 				wide_bus:1,
 				high_power:1,
 				high_speed:1,
-				disable_cd:1;
+				disable_cd:1,
+				enable_async_irq:1;
 };
 
 struct sdio_cis {

include/linux/mmc/host.h +1 -0

index 7afb57cab00b..502a5418264c 100644
@@ -402,6 +402,7 @@ struct mmc_host {
 #define MMC_CAP2_CRYPTO		0
 #endif
 #define MMC_CAP2_ALT_GPT_TEGRA	(1 << 28)	/* Host with eMMC that has GPT entry at a non-standard location */
+#define MMC_CAP2_SDIO_ASYNC_IRQ	(1 << 29)	/* SDIO host supports asynchronous interrupt */
 
 	int			fixed_drv_type;	/* fixed driver type for non-removable media */

include/linux/mmc/sdio.h +5 -0

index 2a05d1ac4f0e..1ef400f28642 100644
@@ -159,6 +159,11 @@
 #define  SDIO_DTSx_SET_TYPE_A	(1 << SDIO_DRIVE_DTSx_SHIFT)
 #define  SDIO_DTSx_SET_TYPE_C	(2 << SDIO_DRIVE_DTSx_SHIFT)
 #define  SDIO_DTSx_SET_TYPE_D	(3 << SDIO_DRIVE_DTSx_SHIFT)
+
+#define SDIO_CCCR_INTERRUPT_EXT	0x16
+#define SDIO_INTERRUPT_EXT_SAI	(1 << 0)
+#define SDIO_INTERRUPT_EXT_EAI	(1 << 1)
+
 /*
  * Function Basic Registers (FBR)
  */

Signature · 1 line

2.25.1

Axe Yang

author

2022-01-11 01:41 UTC #3 lore raw

PATCH v2 3/3 mmc: mediatek: add support for SDIO eint irq

In reply to Axe Yang

Add support for eint irq when MSDC is used as an SDIO host. This feature requires SDIO device support async irq function. With this feature,SDIO host can be awakened by SDIO card in suspend state, without additional pin.

MSDC driver will time-share the SDIO DAT1 pin. During suspend, MSDC turn off clock and switch SDIO DAT1 pin to GPIO mode. And during resume, switch GPIO function back to DAT1 mode then turn on clock.

Some device tree property should be added or modified in msdc node to support SDIO eint irq. Pinctrls 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 <[email protected]>

---
 drivers/mmc/host/mtk-sd.c | 124 +++++++++++++++++++++++++++++++++++---
 1 file changed, 116 insertions(+), 8 deletions(-)

drivers/mmc/host/mtk-sd.c +116 -8

index 65037e1d7723..d78e05c89c29 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2014-2015 MediaTek Inc.
+ * Copyright (c) 2014-2022 MediaTek Inc.
  * Author: Chaotian.Jing <[email protected]>
  */

@@ -9,6 +9,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/gpio/consumer.h>
 #include <linux/iopoll.h>
 #include <linux/ioport.h>
 #include <linux/irq.h>

@@ -440,8 +441,12 @@ struct msdc_host {
 	struct pinctrl *pinctrl;
 	struct pinctrl_state *pins_default;
 	struct pinctrl_state *pins_uhs;
+	struct pinctrl_state *pins_eint;
+	struct pinctrl_state *pins_dat1;
 	struct delayed_work req_timeout;
 	int irq;		/* host interrupt */
+	int eint_irq;		/* 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,49 @@ 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)
+{
+	unsigned long flags;
+	struct msdc_host *host = (struct msdc_host *)dev_id;
+	struct mmc_host *mmc = mmc_from_priv(host);
+
+	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)
+		host->eint_irq = irq;
+
+	return ret;
+}
+
 static const struct cqhci_host_ops msdc_cmdq_ops = {
 	.enable         = msdc_cqe_enable,
 	.disable        = msdc_cqe_disable,

@@ -2631,6 +2682,23 @@ static int msdc_drv_probe(struct platform_device *pdev)
 		goto host_free;
 	}
 
+	if (!(mmc->caps2 & MMC_CAP2_NO_SDIO)) {
+		/* 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 +2790,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 +2919,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 +2953,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 +2985,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)
 };

Signature · 1 line

2.25.1

Andy Shevchenko

2022-01-11 11:48 UTC #4 lore raw

Re: [PATCH v2 3/3] mmc: mediatek: add support for SDIO eint irq

Quoted 1 line · Axe Yang

Add support for eint irq when MSDC is used as an SDIO host. This

IRQ

Quoted 1 line

feature requires SDIO device support async irq function. With this

IRQ

Quoted 1 line

feature,SDIO host can be awakened by SDIO card in suspend state,

feature, SDIO

Quoted 7 lines

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

MSDC

Quoted 1 line

to support SDIO eint irq. Pinctrls named state_dat1 and state_eint

IRQ

Quoted 13 lines

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;
                ...
        };

...

Quoted 2 lines

- * Copyright (c) 2014-2015 MediaTek Inc.
+ * Copyright (c) 2014-2022 MediaTek Inc.

Shouldn't it be rather like

...

drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2475

Quoted 4 lines

drivers/mmc/host/mtk-sd.c +4 -0

+static irqreturn_t msdc_sdio_eint_irq(int irq, void *dev_id)
+{
+	unsigned long flags;
+	struct msdc_host *host = (struct msdc_host *)dev_id;

No casting is needed.

drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2476

Quoted 1 line

drivers/mmc/host/mtk-sd.c +1 -0
+	struct mmc_host *mmc = mmc_from_priv(host);

Perhaps reversed xmas tree order

	struct msdc_host *host = dev_id;
	struct mmc_host *mmc = mmc_from_priv(host);
	unsigned long flags;

But hey, why do you need flags?

Quoted 12 lines

drivers/mmc/host/mtk-sd.c +12 -0

+	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;
+}

...

Quoted 9 lines

drivers/mmc/host/mtk-sd.c +9 -0

+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);
+

drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2508

Quoted 10 lines

drivers/mmc/host/mtk-sd.c +9 -0

+	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);
 
+

Redundant blank line.

drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2512

Quoted 4 lines

drivers/mmc/host/mtk-sd.c +4 -0

+	if (!ret)
+		host->eint_irq = irq;
+
+	return ret;

I guess I have already commented on this, i.e. use standard pattern

	if (ret)
		return ret;

	...
	return 0;

Quoted 1 line

+}

...

drivers/mmc/host/mtk-sd.c static int msdc_drv_probe(struct platform_device *pdev)

Quoted 4 lines

drivers/mmc/host/mtk-sd.c +3 -0

+		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");

In debug mode of pin control this will bring a duplicate message.

Quoted 11 lines

drivers/mmc/host/mtk-sd.c +11 -0

+		} 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;
+		}
+	}

Signature · 2 lines

With Best Regards,
Andy Shevchenko

Axe Yang

author

2022-01-13 07:59 UTC #5 lore raw

Re: [PATCH v2 3/3] mmc: mediatek: add support for SDIO eint irq

Andy, thank you for the review.
But for the comment for 'dev_dbg', can you explain more about that?

Quoted 129 lines · Andy Shevchenko

Quoted 1 line · Axe Yang
Add support for eint irq when MSDC is used as an SDIO host. This
IRQ
Quoted 1 line
feature requires SDIO device support async irq function. With this
IRQ
Quoted 1 line
feature,SDIO host can be awakened by SDIO card in suspend state,
feature, SDIO
Quoted 7 lines
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
MSDC
Quoted 1 line
to support SDIO eint irq. Pinctrls named state_dat1 and state_eint
IRQ
Quoted 14 lines
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;
                ...
        };
...
Quoted 2 lines
- * Copyright (c) 2014-2015 MediaTek Inc.
+ * Copyright (c) 2014-2022 MediaTek Inc.
Shouldn't it be rather like
* Copyright (c) 2014-2015,2022 MediaTek Inc.
?
...
drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2475
Quoted 4 lines
drivers/mmc/host/mtk-sd.c +4 -0
+static irqreturn_t msdc_sdio_eint_irq(int irq, void *dev_id)
+{
+	unsigned long flags;
+	struct msdc_host *host = (struct msdc_host *)dev_id;
No casting is needed.
drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2476
Quoted 1 line
drivers/mmc/host/mtk-sd.c +1 -0
+	struct mmc_host *mmc = mmc_from_priv(host);
Perhaps reversed xmas tree order
	struct msdc_host *host = dev_id;
	struct mmc_host *mmc = mmc_from_priv(host);
	unsigned long flags;
?
But hey, why do you need flags?
Quoted 12 lines
drivers/mmc/host/mtk-sd.c +12 -0
+	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;
+}
...
Quoted 18 lines
drivers/mmc/host/mtk-sd.c +15 -0
+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,
(quoted diff) +1 -0
+					IRQF_TRIGGER_LOW | IRQF_ONESHOT
| IRQF_NO_AUTOEN,
Review
Quoted 2 lines
(quoted diff) +2 -0
+					"sdio-eint", host);
+
Redundant blank line.
drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2512
Quoted 4 lines
drivers/mmc/host/mtk-sd.c +4 -0
+	if (!ret)
+		host->eint_irq = irq;
+
+	return ret;
I guess I have already commented on this, i.e. use standard pattern
	if (ret)
		return ret;

	...
	return 0;
Quoted 1 line
+}
...

Quoted 7 lines

Quoted 5 lines
(quoted diff) +1 -0
+		host->pins_eint = pinctrl_lookup_state(host->pinctrl,
"state_eint");
(quoted diff) +2 -0
+		if (IS_ERR(host->pins_eint)) {
+			dev_dbg(&pdev->dev, "Cannot find pinctrl
eint!\n");
In debug mode of pin control this will bring a duplicate message.

Can you explain more about this comment?
I don't understand what the 'duplicate message' refers for.

Quoted 17 lines

Quoted 15 lines
(quoted diff) +2 -0
+		} else {
+			host->pins_dat1 = pinctrl_lookup_state(host-
Quoted 1 line
pinctrl, "state_dat1");
(quoted diff) +2 -0
+			if (IS_ERR(host->pins_dat1)) {
+				ret = dev_err_probe(&pdev->dev,
PTR_ERR(host->pins_dat1),
(quoted diff) +1 -0
+						    "Cannot find
pinctrl dat1!\n");
drivers/mmc/host/mtk-sd.c +6 -0
+				goto host_free;
+			}
+
+			host->sdio_eint_ready = true;
+		}
+	}

Andy Shevchenko

2022-01-13 10:49 UTC #6 lore raw

Re: [PATCH v2 3/3] mmc: mediatek: add support for SDIO eint irq

Quoted 1 line · Axe Yang

But for the comment for 'dev_dbg', can you explain more about that?

Sure.

Quoted 2 lines · Andy Shevchenko

Quoted 1 line · Axe Yang

...

Quoted 10 lines

Quoted 7 lines
Quoted 5 lines
(quoted diff) +1 -0
+		host->pins_eint = pinctrl_lookup_state(host->pinctrl,
"state_eint");
(quoted diff) +2 -0
+		if (IS_ERR(host->pins_eint)) {
+			dev_dbg(&pdev->dev, "Cannot find pinctrl
eint!\n");
In debug mode of pin control this will bring a duplicate message.
Can you explain more about this comment?
I don't understand what the 'duplicate message' refers for.

Have you chance to read the implementation of pinctrl_lookup_state()?

Signature · 2 lines

With Best Regards,
Andy Shevchenko

Axe Yang

author

2022-01-14 03:06 UTC #7 lore raw

Re: [PATCH v2 3/3] mmc: mediatek: add support for SDIO eint irq

Quoted 21 lines · Andy Shevchenko

Quoted 1 line · Axe Yang
But for the comment for 'dev_dbg', can you explain more about that?
Sure.
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Axe Yang
..
Quoted 10 lines
Quoted 9 lines
Quoted 7 lines
(quoted diff) +1 -0
+		host->pins_eint = pinctrl_lookup_state(host-
Quoted 1 line
pinctrl,
"state_eint");
(quoted diff) +2 -0
+		if (IS_ERR(host->pins_eint)) {
+			dev_dbg(&pdev->dev, "Cannot find
pinctrl
eint!\n");
In debug mode of pin control this will bring a duplicate message.

Quoted 4 lines

Quoted 2 lines
Can you explain more about this comment?
I don't understand what the 'duplicate message' refers for.
Have you chance to read the implementation of pinctrl_lookup_state()?

I have read pinctrl_lookup_state(), and if the 'duplicate message' you were talking about is 'using pinctrl dummy state...':

https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/core.c#L1214
No, this message will not appear in debug mode if pins_eint not found because pinctrl_dummy_state is always FALSE. MTK Soc do not need dummy state support.

--
Best Regard,
Axe Yang

Andy Shevchenko

2022-01-14 13:40 UTC #8 lore raw

Re: [PATCH v2 3/3] mmc: mediatek: add support for SDIO eint irq

Quoted 4 lines · Axe Yang

Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Axe Yang
Quoted 1 line · Andy Shevchenko
On Tue, Jan 11, 2022 at 09:40:46AM +0800, Axe Yang wrote:

...

Quoted 15 lines

Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 7 lines
(quoted diff) +1 -0
+		host->pins_eint = pinctrl_lookup_state(host-
Quoted 1 line
pinctrl,
"state_eint");
(quoted diff) +2 -0
+		if (IS_ERR(host->pins_eint)) {
+			dev_dbg(&pdev->dev, "Cannot find
pinctrl
eint!\n");
In debug mode of pin control this will bring a duplicate message.
Quoted 4 lines
Quoted 2 lines
Can you explain more about this comment?
I don't understand what the 'duplicate message' refers for.
Have you chance to read the implementation of pinctrl_lookup_state()?

Quoted 7 lines

I have read pinctrl_lookup_state(), and if the 'duplicate message' you were talking about is 'using pinctrl dummy state...':
https://elixir.bootlin.com/linux/latest/source/drivers/pinctrl/core.c#L1214
No, this message will not appear in debug mode if pins_eint not found because pinctrl_dummy_state is always FALSE. MTK Soc do not need dummy state support.

I see, thanks for explanation. I'm wondering how good or bad would be the idea of adding a debug message on the !pinctrl_dummy_state case.

Signature · 2 lines

With Best Regards,
Andy Shevchenko

Axe Yang

author

2022-01-17 07:36 UTC #9 lore raw

Re: [PATCH v2 3/3] mmc: mediatek: add support for SDIO eint irq

In reply to Andy Shevchenko

Andy, patchset v3 is uploaded. I fixed most of the defect you pointed out.
And in msdc_sdio_eint_irq(), you asked why do we need flags, the flags is for spin lock irq save/restore, so I keep it.

Quoted 66 lines · Andy Shevchenko

Quoted 1 line · Axe Yang
Add support for eint irq when MSDC is used as an SDIO host. This
IRQ
Quoted 1 line
feature requires SDIO device support async irq function. With this
IRQ
Quoted 1 line
feature,SDIO host can be awakened by SDIO card in suspend state,
feature, SDIO
Quoted 7 lines
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
MSDC
Quoted 1 line
to support SDIO eint irq. Pinctrls named state_dat1 and state_eint
IRQ
Quoted 14 lines
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;
                ...
        };
...
Quoted 2 lines
- * Copyright (c) 2014-2015 MediaTek Inc.
+ * Copyright (c) 2014-2022 MediaTek Inc.
Shouldn't it be rather like
* Copyright (c) 2014-2015,2022 MediaTek Inc.
?
...
drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2475
Quoted 4 lines
drivers/mmc/host/mtk-sd.c +4 -0
+static irqreturn_t msdc_sdio_eint_irq(int irq, void *dev_id)
+{
+	unsigned long flags;
+	struct msdc_host *host = (struct msdc_host *)dev_id;
No casting is needed.
drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2476
Quoted 1 line
drivers/mmc/host/mtk-sd.c +1 -0
+	struct mmc_host *mmc = mmc_from_priv(host);
Perhaps reversed xmas tree order

Quoted 7 lines

	struct msdc_host *host = dev_id;
	struct mmc_host *mmc = mmc_from_priv(host);
	unsigned long flags;

But hey, why do you need flags?

falgs is for spin lock irq save/restore.

Quoted 80 lines

Quoted 13 lines
drivers/mmc/host/mtk-sd.c +12 -0
+	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;
+}
...
Quoted 18 lines
drivers/mmc/host/mtk-sd.c +15 -0
+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,
(quoted diff) +1 -0
+					IRQF_TRIGGER_LOW | IRQF_ONESHOT
| IRQF_NO_AUTOEN,
Review
Quoted 2 lines
(quoted diff) +2 -0
+					"sdio-eint", host);
+
Redundant blank line.
drivers/mmc/host/mtk-sd.c static const struct mmc_host_ops mt_msdc_ops = { · line 2512
Quoted 4 lines
drivers/mmc/host/mtk-sd.c +4 -0
+	if (!ret)
+		host->eint_irq = irq;
+
+	return ret;
I guess I have already commented on this, i.e. use standard pattern
	if (ret)
		return ret;

	...
	return 0;
Quoted 1 line
+}
...
Quoted 5 lines
(quoted diff) +1 -0
+		host->pins_eint = pinctrl_lookup_state(host->pinctrl,
"state_eint");
(quoted diff) +2 -0
+		if (IS_ERR(host->pins_eint)) {
+			dev_dbg(&pdev->dev, "Cannot find pinctrl
eint!\n");
In debug mode of pin control this will bring a duplicate message.
Quoted 14 lines
(quoted diff) +2 -0
+		} else {
+			host->pins_dat1 = pinctrl_lookup_state(host-
Quoted 1 line
pinctrl, "state_dat1");
(quoted diff) +2 -0
+			if (IS_ERR(host->pins_dat1)) {
+				ret = dev_err_probe(&pdev->dev,
PTR_ERR(host->pins_dat1),
(quoted diff) +1 -0
+						    "Cannot find
pinctrl dat1!\n");
drivers/mmc/host/mtk-sd.c +6 -0
+				goto host_free;
+			}
+
+			host->sdio_eint_ready = true;
+		}
+	}