From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
To: <cjb@laptop.org>
Cc: <linux-mmc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<vmehta@atheros.com>, <naveen.singh@atheros.com>,
<kvalo@adurom.com>, <j@w1.fi>,
"Luis R. Rodriguez" <lrodriguez@atheros.com>,
Naveen Singh <nsingh@atheros.com>,
Vipin Mehta <Vipin.Mehta@atheros.com>
Subject: [RFC 4/4] sdhci: add quick for controllers with for CIRQ issues
Date: Fri, 18 Mar 2011 15:12:00 -0700 [thread overview]
Message-ID: <1300486320-23607-5-git-send-email-lrodriguez@atheros.com> (raw)
In-Reply-To: <1300486320-23607-1-git-send-email-lrodriguez@atheros.com>
This adds an SDHCI quick for controller which cannot
cannot detect CIRQ reliably when in 4-bit mode. What
we do is while bus is idle we leave it in 1-bit mode at
the controller level.
This allows the PCI SDCHI ENE 712 controller to work
correctly.
Cc: Chris Ball <cjb@laptop.org>
Cc: Kalle Valo <kvalo@adurom.com>
Cc: Naveen Singh <nsingh@atheros.com>
Cc: Vipin Mehta <Vipin.Mehta@atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
drivers/mmc/host/sdhci-pci.c | 3 ++-
drivers/mmc/host/sdhci.c | 25 +++++++++++++++++++++++++
include/linux/mmc/sdhci.h | 2 ++
3 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 2f8d468..8b13f61 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -130,7 +130,8 @@ static const struct sdhci_pci_fixes sdhci_ricoh_mmc = {
static const struct sdhci_pci_fixes sdhci_ene_712 = {
.quirks = SDHCI_QUIRK_SINGLE_POWER_WRITE |
- SDHCI_QUIRK_BROKEN_DMA,
+ SDHCI_QUIRK_BROKEN_DMA |
+ SDHCI_QUIRK_1BIT_INTERRUPT,
};
static const struct sdhci_pci_fixes sdhci_ene_714 = {
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a4cf0c0..fac075e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -245,6 +245,27 @@ static void sdhci_led_control(struct led_classdev *led,
}
#endif
+/* handle bus case where controller cannot detect CIRQ reliably when in 4-bit mode */
+static void sdhci_idle_bus_adjust(struct sdhci_host *host, u8 idle)
+{
+ u8 ctrl;
+
+ if (!(host->flags & SDHCI_IN_4BIT_MODE))
+ return;
+
+ if (!(host->quirks & SDHCI_QUIRK_1BIT_INTERRUPT))
+ return;
+
+ /* while bus is idle, leave it in 1-bit mode at the controller level */
+ ctrl = readb(host->ioaddr + SDHCI_HOST_CONTROL);
+ ctrl &= ~SDHCI_CTRL_4BITBUS;
+
+ if (!idle)
+ ctrl |= SDHCI_CTRL_4BITBUS;
+
+ writeb(ctrl, host->ioaddr + SDHCI_HOST_CONTROL);
+}
+
/*****************************************************************************\
* *
* Core functions *
@@ -919,6 +940,8 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd)
mod_timer(&host->timer, jiffies + 10 * HZ);
+ sdhci_idle_bus_adjust(host, 0);
+
host->cmd = cmd;
sdhci_prepare_data(host, cmd->data);
@@ -1374,6 +1397,8 @@ static void sdhci_tasklet_finish(unsigned long param)
host->cmd = NULL;
host->data = NULL;
+ sdhci_idle_bus_adjust(host, 1);
+
#ifndef SDHCI_USE_LEDS_CLASS
sdhci_deactivate_led(host);
#endif
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 266f796..4f1b26263 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -85,6 +85,8 @@ struct sdhci_host {
#define SDHCI_QUIRK_NO_HISPD_BIT (1<<29)
/* Controller treats ADMA descriptors with length 0000h incorrectly */
#define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC (1<<30)
+/* Controller cannot detect CIRQ reliably when in 4-bit mode */
+#define SDHCI_QUIRK_1BIT_INTERRUPT (1<<31)
int irq; /* Device IRQ */
void __iomem *ioaddr; /* Mapped address */
--
1.7.4.15.g7811d
next prev parent reply other threads:[~2011-03-18 22:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-18 22:11 [RFC 0/4] sdhci: few patches for ENE 712 support Luis R. Rodriguez
2011-03-18 22:11 ` [RFC 1/4] sdhci: allow for multiple delays when sending commands Luis R. Rodriguez
2011-03-18 23:10 ` Chris Ball
2011-03-18 23:52 ` Luis R. Rodriguez
2011-03-18 22:11 ` [RFC 2/4] sdhci: sanity check for triggering interrupts thread Luis R. Rodriguez
2011-03-18 22:11 ` [RFC 3/4] sdhci: cache when the MMC bus width is 4 bits wide Luis R. Rodriguez
2011-03-18 22:12 ` Luis R. Rodriguez [this message]
2011-03-18 22:29 ` [RFC 0/4] sdhci: few patches for ENE 712 support Luis R. Rodriguez
2011-03-19 9:15 ` Wolfram Sang
2011-03-30 1:16 ` Luis R. Rodriguez
2011-03-30 7:47 ` Wolfram Sang
2011-08-24 11:02 ` Kalle Valo
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=1300486320-23607-5-git-send-email-lrodriguez@atheros.com \
--to=lrodriguez@atheros.com \
--cc=Vipin.Mehta@atheros.com \
--cc=cjb@laptop.org \
--cc=j@w1.fi \
--cc=kvalo@adurom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=naveen.singh@atheros.com \
--cc=nsingh@atheros.com \
--cc=vmehta@atheros.com \
/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
all inboxes | Powered by JetHome®