On Sat, Feb 21, 2009 at 04:58:21PM +0100, Pierre Ossman wrote:
> On Fri, 13 Feb 2009 17:47:18 +0300
> Anton Vorontsov <[email protected]> wrote:
>
> > @@ -1110,13 +1113,18 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
> >
> > host->mrq = mrq;
> >
> > + if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
> > + goto send;
> > +
> > if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)
> > || (host->flags & SDHCI_DEVICE_DEAD)) {
> > host->mrq->cmd->error = -ENOMEDIUM;
> > tasklet_schedule(&host->finish_tasklet);
> > - } else
> > - sdhci_send_command(host, mrq->cmd);
> > -
> > + goto out;
> > + }
> > +send:
> > + sdhci_send_command(host, mrq->cmd);
> > +out:
> > mmiowb();
> > spin_unlock_irqrestore(&host->lock, flags);
> > }
>
> goto:s seem unnecessary here, and your patch is even incorrect as it
> ignores the SDHCI_DEVICE_DEAD flag.
Oops.
> Just modify the if-clause and
> things will work.
That would look horrid...
if ((!(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
!(sdhci_readl(host, SDHCI_PRESENT_STATE) &
SDHCI_CARD_PRESENT)) ||
(host->flags & SDHCI_DEVICE_DEAD)) {
> Might want to add a comment also to make it more obvious what the
> if-clause does.
Let's try to avoid the if-clause above? How about this:
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 0cbde8e..d71c877 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -167,6 +167,9 @@ static void sdhci_set_card_detection(struct sdhci_host *host, bool enable)
{
u32 irqs = SDHCI_INT_CARD_REMOVE | SDHCI_INT_CARD_INSERT;
+ if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
+ return;
+
if (enable)
sdhci_unmask_irqs(host, irqs);
else
@@ -1096,6 +1099,7 @@ out:
static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
{
struct sdhci_host *host;
+ bool present;
unsigned long flags;
host = mmc_priv(mmc);
@@ -1110,8 +1114,14 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
host->mrq = mrq;
- if (!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT)
- || (host->flags & SDHCI_DEVICE_DEAD)) {
+ /* If polling, assume that the card is always present. */
+ if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
+ present = true;
+ else
+ present = sdhci_readl(host, SDHCI_PRESENT_STATE) &
+ SDHCI_CARD_PRESENT;
+
+ if (!present || host->flags & SDHCI_DEVICE_DEAD) {
host->mrq->cmd->error = -ENOMEDIUM;
tasklet_schedule(&host->finish_tasklet);
} else
@@ -1745,6 +1755,9 @@ int sdhci_add_host(struct sdhci_host *host)
if (caps & SDHCI_CAN_DO_HISPD)
mmc->caps |= MMC_CAP_SD_HIGHSPEED;
+ if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION)
+ mmc->caps |= MMC_CAP_NEEDS_POLL;
+
mmc->ocr_avail = 0;
if (caps & SDHCI_CAN_VDD_330)
mmc->ocr_avail |= MMC_VDD_32_33|MMC_VDD_33_34;
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 1c29895..09a4363 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -212,6 +212,8 @@ struct sdhci_host {
#define SDHCI_QUIRK_BROKEN_SMALL_PIO (1<<13)
/* Controller does not provide transfer-complete interrupt when not busy */
#define SDHCI_QUIRK_NO_BUSY_IRQ (1<<14)
+/* Controller has unreliable card detection */
+#define SDHCI_QUIRK_BROKEN_CARD_DETECTION (1<<15)
int irq; /* Device IRQ */
void __iomem * ioaddr; /* Mapped address */
On Wed, 4 Mar 2009 20:49:17 +0300
Anton Vorontsov <[email protected]> wrote:
> On Sat, Feb 21, 2009 at 04:58:21PM +0100, Pierre Ossman wrote:
> > Just modify the if-clause and
> > things will work.
>
> That would look horrid...
>
> if ((!(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
> !(sdhci_readl(host, SDHCI_PRESENT_STATE) &
> SDHCI_CARD_PRESENT)) ||
> (host->flags & SDHCI_DEVICE_DEAD)) {
>
There are worse ones in that code, but I see your point. :)
> > Might want to add a comment also to make it more obvious what the
> > if-clause does.
>
> Let's try to avoid the if-clause above? How about this:
>
Looks ok.
> @@ -1096,6 +1099,7 @@ out:
> static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
> {
> struct sdhci_host *host;
> + bool present;
> unsigned long flags;
>
> host = mmc_priv(mmc);
Can we use bool in the kernel?
Rgds
--
-- Pierre Ossman
WARNING: This correspondence is being monitored by the
Swedish government. Make sure your server uses encryption
for SMTP traffic and consider using PGP for end-to-end
encryption.
On Sun, Mar 08, 2009 at 03:11:21PM +0100, Pierre Ossman wrote:
> On Wed, 4 Mar 2009 20:49:17 +0300
> Anton Vorontsov <[email protected]> wrote:
>
> > On Sat, Feb 21, 2009 at 04:58:21PM +0100, Pierre Ossman wrote:
> > > Just modify the if-clause and
> > > things will work.
> >
> > That would look horrid...
> >
> > if ((!(host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) &&
> > !(sdhci_readl(host, SDHCI_PRESENT_STATE) &
> > SDHCI_CARD_PRESENT)) ||
> > (host->flags & SDHCI_DEVICE_DEAD)) {
> >
>
> There are worse ones in that code, but I see your point. :)
>
> > > Might want to add a comment also to make it more obvious what the
> > > if-clause does.
> >
> > Let's try to avoid the if-clause above? How about this:
> >
>
> Looks ok.
>
> > @@ -1096,6 +1099,7 @@ out:
> > static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
> > {
> > struct sdhci_host *host;
> > + bool present;
> > unsigned long flags;
> >
> > host = mmc_priv(mmc);
>
> Can we use bool in the kernel?
Sure, it's widely used in the kernel, even in such places as
mm/ or kernel/.
Thanks for the review!
--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2