linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Anton Vorontsov <avorontsov@ru.mvista.com>
To: Pierre Ossman <drzeus-sdhci@drzeus.cx>
Cc: Ben Dooks <ben-linux@fluff.org>, Arnd Bergmann <arnd@arndb.de>,
	Liu Dave <DaveLiu@freescale.com>,
	linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org,
	sdhci-devel@list.drzeus.cx
Subject: [PATCH 03/11] sdhci: Enable only relevant (DMA/PIO) interrupts during transfers
Date: Thu, 5 Mar 2009 23:28:32 +0300	[thread overview]
Message-ID: <20090305202832.GC28709@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <20090305202737.GA24166@oksana.dev.rtsoft.ru>

Some hosts (that is, FSL eSDHC) throw PIO interrupts during DMA
transfers, this causes tons of unneeded interrupts, and thus highly
degraded speed.

This patch modifies the driver so that now we only enable relevant
(DMA or PIO) interrupts during transfers.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 drivers/mmc/host/sdhci.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ba9f95f..0cbde8e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -222,9 +222,7 @@ static void sdhci_init(struct sdhci_host *host)
 		SDHCI_INT_BUS_POWER | SDHCI_INT_DATA_END_BIT |
 		SDHCI_INT_DATA_CRC | SDHCI_INT_DATA_TIMEOUT | SDHCI_INT_INDEX |
 		SDHCI_INT_END_BIT | SDHCI_INT_CRC | SDHCI_INT_TIMEOUT |
-		SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL |
-		SDHCI_INT_DMA_END | SDHCI_INT_DATA_END | SDHCI_INT_RESPONSE |
-		SDHCI_INT_ADMA_ERROR);
+		SDHCI_INT_DATA_END | SDHCI_INT_RESPONSE);
 }
 
 static void sdhci_reinit(struct sdhci_host *host)
@@ -658,6 +656,17 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_data *data)
 	return count;
 }
 
+static void sdhci_set_transfer_irqs(struct sdhci_host *host)
+{
+	u32 pio_irqs = SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL;
+	u32 dma_irqs = SDHCI_INT_DMA_END | SDHCI_INT_ADMA_ERROR;
+
+	if (host->flags & SDHCI_REQ_USE_DMA)
+		sdhci_clear_set_irqs(host, pio_irqs, dma_irqs);
+	else
+		sdhci_clear_set_irqs(host, dma_irqs, pio_irqs);
+}
+
 static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
 {
 	u8 count;
@@ -806,6 +815,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
 		host->blocks = data->blocks;
 	}
 
+	sdhci_set_transfer_irqs(host);
+
 	/* We do not handle DMA boundaries, so set it to max (512 KiB) */
 	sdhci_writew(host, SDHCI_MAKE_BLKSZ(7, data->blksz), SDHCI_BLOCK_SIZE);
 	sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT);
-- 
1.5.6.5

  parent reply	other threads:[~2009-03-05 20:28 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-05 20:27 [PATCH v2 0/11] FSL eSDHC support Anton Vorontsov
2009-03-05 20:28 ` [PATCH 01/11] sdhci: Add support for bus-specific IO memory accessors Anton Vorontsov
2009-03-05 20:28 ` [PATCH 02/11] sdhci: Split card-detection IRQs management from sdhci_init() Anton Vorontsov
2009-03-05 20:28 ` Anton Vorontsov [this message]
2009-03-05 20:28 ` [PATCH 04/11] sdhci: Add support for card-detection polling Anton Vorontsov
2009-03-05 20:28 ` [PATCH 05/11] sdhci: Add support for hosts reporting inverted write-protect state Anton Vorontsov
2009-03-05 20:28 ` [PATCH 06/11] sdhci: Add get_{max,timeout}_clock callbacks Anton Vorontsov
2009-03-05 20:28 ` [PATCH 07/11] sdhci: Add set_clock callback and a quirk for nonstandard clocks Anton Vorontsov
2009-03-05 20:28 ` [PATCH 08/11] sdhci: Add quirk for controllers that need small delays for PIO Anton Vorontsov
2009-03-05 20:28 ` [PATCH 09/11] sdhci: Add quirk for controllers that need IRQ re-init after reset Anton Vorontsov
2009-03-05 20:28 ` [PATCH 10/11] sdhci: Add quirk for forcing maximum block size to 2048 bytes Anton Vorontsov
2009-03-05 20:28 ` [PATCH 11/11] mmc: Add OpenFirmware bindings for SDHCI driver Anton Vorontsov
2009-03-08 14:44   ` Pierre Ossman
2009-03-16 21:13 [PATCH v3 0/11] FSL eSDHC support Anton Vorontsov
2009-03-16 21:13 ` [PATCH 03/11] sdhci: Enable only relevant (DMA/PIO) interrupts during transfers Anton Vorontsov

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=20090305202832.GC28709@oksana.dev.rtsoft.ru \
    --to=avorontsov@ru.mvista.com \
    --cc=DaveLiu@freescale.com \
    --cc=arnd@arndb.de \
    --cc=ben-linux@fluff.org \
    --cc=drzeus-sdhci@drzeus.cx \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=sdhci-devel@list.drzeus.cx \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).