From: Heiner Kallweit <hkallweit1@gmail.com>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Kevin Hilman <khilman@baylibre.com>
Cc: Carlo Caione <carlo@caione.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
linux-amlogic@lists.infradead.org
Subject: [PATCH v3 5/9] mmc: meson-gx: improve interrupt handling
Date: Tue, 7 Feb 2017 22:34:51 +0100 [thread overview]
Message-ID: <e3a3e5ef-2896-68e0-67d2-69a36e7892ee@gmail.com> (raw)
In-Reply-To: <0991d40b-e05b-2fcb-9ee4-7b529448de69@gmail.com>
Disabling and immediately re-enabling interrupts in meson_mmc_request
doesn't provide a benefit. Instead enable interrupts in probe already.
And disable interrupts in remove, this was missing so far.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
---
v3:
- in probe leave the original behavior to first disable all irqs and
then clear irq status bits
---
drivers/mmc/host/meson-gx-mmc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index dd7f936c..4c622ad2 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -542,11 +542,6 @@ static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
/* Stop execution */
writel(0, host->regs + SD_EMMC_START);
- /* clear, ack, enable all interrupts */
- writel(0, host->regs + SD_EMMC_IRQ_EN);
- writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS);
- writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN);
-
host->mrq = mrq;
if (mrq->sbc)
@@ -775,6 +770,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
/* clear, ack, enable all interrupts */
writel(0, host->regs + SD_EMMC_IRQ_EN);
writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS);
+ writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN);
ret = devm_request_threaded_irq(&pdev->dev, host->irq,
meson_mmc_irq, meson_mmc_irq_thread,
@@ -812,6 +808,9 @@ static int meson_mmc_remove(struct platform_device *pdev)
if (WARN_ON(!host))
return 0;
+ /* disable interrupts */
+ writel(0, host->regs + SD_EMMC_IRQ_EN);
+
if (host->bounce_buf)
dma_free_coherent(host->dev, host->bounce_buf_size,
host->bounce_buf, host->bounce_dma_addr);
--
2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: hkallweit1@gmail.com (Heiner Kallweit)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v3 5/9] mmc: meson-gx: improve interrupt handling
Date: Tue, 7 Feb 2017 22:34:51 +0100 [thread overview]
Message-ID: <e3a3e5ef-2896-68e0-67d2-69a36e7892ee@gmail.com> (raw)
In-Reply-To: <0991d40b-e05b-2fcb-9ee4-7b529448de69@gmail.com>
Disabling and immediately re-enabling interrupts in meson_mmc_request
doesn't provide a benefit. Instead enable interrupts in probe already.
And disable interrupts in remove, this was missing so far.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
---
v3:
- in probe leave the original behavior to first disable all irqs and
then clear irq status bits
---
drivers/mmc/host/meson-gx-mmc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index dd7f936c..4c622ad2 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -542,11 +542,6 @@ static void meson_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
/* Stop execution */
writel(0, host->regs + SD_EMMC_START);
- /* clear, ack, enable all interrupts */
- writel(0, host->regs + SD_EMMC_IRQ_EN);
- writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS);
- writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN);
-
host->mrq = mrq;
if (mrq->sbc)
@@ -775,6 +770,7 @@ static int meson_mmc_probe(struct platform_device *pdev)
/* clear, ack, enable all interrupts */
writel(0, host->regs + SD_EMMC_IRQ_EN);
writel(IRQ_EN_MASK, host->regs + SD_EMMC_STATUS);
+ writel(IRQ_EN_MASK, host->regs + SD_EMMC_IRQ_EN);
ret = devm_request_threaded_irq(&pdev->dev, host->irq,
meson_mmc_irq, meson_mmc_irq_thread,
@@ -812,6 +808,9 @@ static int meson_mmc_remove(struct platform_device *pdev)
if (WARN_ON(!host))
return 0;
+ /* disable interrupts */
+ writel(0, host->regs + SD_EMMC_IRQ_EN);
+
if (host->bounce_buf)
dma_free_coherent(host->dev, host->bounce_buf_size,
host->bounce_buf, host->bounce_dma_addr);
--
2.11.0
next prev parent reply other threads:[~2017-02-07 21:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <0991d40b-e05b-2fcb-9ee4-7b529448de69@gmail.com>
2017-02-07 21:34 ` [PATCH v3 2/9] mmc: meson-gx: minor improvements in meson_mmc_set_ios Heiner Kallweit
2017-02-07 21:34 ` Heiner Kallweit
2017-02-07 21:34 ` [PATCH v3 3/9] mmc: meson-gx: improve meson_mmc_clk_set Heiner Kallweit
2017-02-07 21:34 ` Heiner Kallweit
2017-02-07 21:34 ` [PATCH v3 4/9] mmc: meson-gx: improve meson_mmc_irq_thread Heiner Kallweit
2017-02-07 21:34 ` Heiner Kallweit
2017-02-07 21:34 ` Heiner Kallweit [this message]
2017-02-07 21:34 ` [PATCH v3 5/9] mmc: meson-gx: improve interrupt handling Heiner Kallweit
2017-02-07 21:34 ` [PATCH v3 6/9] mmc: meson-gx: set max block count and request size Heiner Kallweit
2017-02-07 21:34 ` Heiner Kallweit
2017-02-07 21:35 ` [PATCH v3 7/9] mmc: meson-gx: reduce bounce buffer size Heiner Kallweit
2017-02-07 21:35 ` Heiner Kallweit
2017-02-07 21:35 ` [PATCH v3 8/9] mmc: meson-gx: remove unneeded checks in remove Heiner Kallweit
2017-02-07 21:35 ` Heiner Kallweit
2017-02-07 21:35 ` [PATCH v3 9/9] mmc: meson-gx: add support for HS400 mode Heiner Kallweit
2017-02-07 21:35 ` Heiner Kallweit
2017-02-08 10:17 ` Neil Armstrong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e3a3e5ef-2896-68e0-67d2-69a36e7892ee@gmail.com \
--to=hkallweit1@gmail.com \
--cc=carlo@caione.org \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.