On Thu, Jan 28, 2010 at 10:50:22AM +0900, Thomas Abraham wrote:
> 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 <thomas.ab@xxxxxxxxxxx>
Acked-by: Ben Dooks <ben-linux@xxxxxxxxx>
> ---
> drivers/mmc/host/sdhci.c | 35 ++++++++++++++++++++++-------------
> drivers/mmc/host/sdhci.h | 2 ++
> 2 files changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index c279fbc..8be2613 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -487,19 +487,28 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
> WARN_ON((desc - host->adma_desc) > (128 * 2 + 1) * 4);
> }
>
> - /*
> - * Add a terminating entry.
> - */
> - desc[7] = 0;
> - desc[6] = 0;
> - desc[5] = 0;
> - desc[4] = 0;
> -
> - desc[3] = 0;
> - desc[2] = 0;
> -
> - desc[1] = 0x00;
> - desc[0] = 0x03; /* nop, end, valid */
> + 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.
> + */
> + desc[7] = 0;
> + desc[6] = 0;
> + desc[5] = 0;
> + desc[4] = 0;
> +
> + desc[3] = 0;
> + desc[2] = 0;
> + desc[1] = 0x00;
> + desc[0] = 0x03; /* nop, end, valid */
> + }
>
> /*
> * 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.6.3.3
>
--
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
