From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Dooks Subject: Re: [PATCH 1/3] s3c6410: Add new quirk in sdhci driver and update ADMA descriptor build. Date: Wed, 5 May 2010 15:59:13 +0100 Message-ID: <20100505145913.GI26401@trinity.fluff.org> References: <4BDFEC3A.9060501@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from trinity.fluff.org ([89.16.178.74]:47889 "EHLO trinity.fluff.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753549Ab0EEO7S (ORCPT ); Wed, 5 May 2010 10:59:18 -0400 Content-Disposition: inline In-Reply-To: <4BDFEC3A.9060501@gmail.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Maurus Cuelenaere Cc: linux-samsung-soc@vger.kernel.org, pierre@ossman.eu, linux-mmc@vger.kernel.org, akpm@linux-foundation.org, sdhci-devel@lists.ossman.eu, ben-linux@fluff.org, thomas.ab@samsung.com On Tue, May 04, 2010 at 11:43:22AM +0200, Maurus Cuelenaere wrote: The 'From:' line seems to have been lost? > The s3c6410 sdhci controller does not support the 'End' attribute and > NOP attribute in the same 8-Byte ADMA descriptor. This patch adds a > new quirk to identify sdhci host contollers with such behaviour. > In addition to this, for controllers using the new quirk, the last > entry in the ADMA descritor table is marked with the 'End' attribute > (instead of using a NOP descriptor with 'End' attribute). > > Signed-off-by: Thomas Abraham > Acked-by: Ben Dooks > Signed-off-by: Maurus Cuelenaere > --- > drivers/mmc/host/sdhci.c | 20 +++++++++++++++----- > drivers/mmc/host/sdhci.h | 2 ++ > 2 files changed, 17 insertions(+), 5 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index 9d4fdfa..db5d566 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -496,12 +496,22 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, > WARN_ON((desc - host->adma_desc) > (128 * 2 + 1) * 4); > } > > - /* > - * Add a terminating entry. > - */ > + if (host->quirks & SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC) { > + /* > + * Mark the last descriptor as the terminating descriptor > + */ > + if (desc != host->adma_desc) { > + desc -= 8; > + desc[0] |= 0x2; /* end */ > + } > + } else { > + /* > + * Add a terminating entry. > + */ > > - /* nop, end, valid */ > - sdhci_set_adma_desc(desc, 0, 0, 0x3); > + /* nop, end, valid */ > + sdhci_set_adma_desc(desc, 0, 0, 0x3); > + } > > /* > * Resync align buffer as we might have changed it. > diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h > index 842f46f..7ba0006 100644 > --- a/drivers/mmc/host/sdhci.h > +++ b/drivers/mmc/host/sdhci.h > @@ -236,6 +236,8 @@ struct sdhci_host { > #define SDHCI_QUIRK_DELAY_AFTER_POWER (1<<23) > /* Controller uses SDCLK instead of TMCLK for data timeouts */ > #define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK (1<<24) > +/* Controller cannot support End Attribute in NOP ADMA descriptor */ > +#define SDHCI_QUIRK_NO_ENDATTR_IN_NOPDESC (1<<25) > > int irq; /* Device IRQ */ > void __iomem * ioaddr; /* Mapped address */ > -- > 1.7.1 > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- -- Ben Q: What's a light-year? A: One-third less calories than a regular year.