Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-12 08:09:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sdhci: make workaround for timeout bug more general

Browse Source 
Give the quirk for broken timeout handling a better chance of handling
more controllers by simply classifying the system as broken and setting
a fixed value.

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Pierre Ossman 2008-07-05 00:25:15 +02:00
parent 2260640589
commit ee53ab5d73
3 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/host/sdhci-pci.c
View File

@ -98,7 +98,7 @@ static const struct sdhci_pci_fixes sdhci_ene_714 = {
static const struct sdhci_pci_fixes sdhci_cafe = { static const struct sdhci_pci_fixes sdhci_cafe = {
.quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER | .quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER |
SDHCI_QUIRK_INCR_TIMEOUT_CONTROL, SDHCI_QUIRK_BROKEN_TIMEOUT_VAL,
}; };
static const struct sdhci_pci_fixes sdhci_jmicron = { static const struct sdhci_pci_fixes sdhci_jmicron = {

50
drivers/mmc/host/sdhci.c
View File

@ -314,23 +314,19 @@ static void sdhci_transfer_pio(struct sdhci_host *host)
DBG("PIO transfer complete.\n"); DBG("PIO transfer complete.\n");
} }
static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_data *data)
{ {
u8 count; u8 count;
unsigned target_timeout, current_timeout; unsigned target_timeout, current_timeout;
WARN_ON(host->data); /*
* If the host controller provides us with an incorrect timeout
if (data == NULL) * value, just skip the check and use 0xE. The hardware may take
return; * longer to time out, but that's much better than having a too-short
* timeout value.
/* Sanity checks */ */
BUG_ON(data->blksz * data->blocks > 524288); if ((host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL))
BUG_ON(data->blksz > host->mmc->max_blk_size); return 0xE;
BUG_ON(data->blocks > 65535);
host->data = data;
host->data_early = 0;
/* timeout in us */ /* timeout in us */
target_timeout = data->timeout_ns / 1000 + target_timeout = data->timeout_ns / 1000 +
@ -355,19 +351,33 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
break; break;
} }
/*
* Compensate for an off-by-one error in the CaFe hardware; otherwise,
* a too-small count gives us interrupt timeouts.
*/
if ((host->quirks & SDHCI_QUIRK_INCR_TIMEOUT_CONTROL))
count++;
if (count >= 0xF) { if (count >= 0xF) {
printk(KERN_WARNING "%s: Too large timeout requested!\n", printk(KERN_WARNING "%s: Too large timeout requested!\n",
mmc_hostname(host->mmc)); mmc_hostname(host->mmc));
count = 0xE; count = 0xE;
} }
return count;
}
static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data)
{
u8 count;
WARN_ON(host->data);
if (data == NULL)
return;
/* Sanity checks */
BUG_ON(data->blksz * data->blocks > 524288);
BUG_ON(data->blksz > host->mmc->max_blk_size);
BUG_ON(data->blocks > 65535);
host->data = data;
host->data_early = 0;
count = sdhci_calc_timeout(host, data);
writeb(count, host->ioaddr + SDHCI_TIMEOUT_CONTROL); writeb(count, host->ioaddr + SDHCI_TIMEOUT_CONTROL);
if (host->flags & SDHCI_USE_DMA) if (host->flags & SDHCI_USE_DMA)

4
drivers/mmc/host/sdhci.h
View File

@ -178,8 +178,8 @@ struct sdhci_host {
#define SDHCI_QUIRK_RESET_AFTER_REQUEST (1<<8) #define SDHCI_QUIRK_RESET_AFTER_REQUEST (1<<8)
/* Controller needs voltage and power writes to happen separately */ /* Controller needs voltage and power writes to happen separately */
#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1<<9) #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1<<9)
/* Controller has an off-by-one issue with timeout value */ /* Controller provides an incorrect timeout value for transfers */
#define SDHCI_QUIRK_INCR_TIMEOUT_CONTROL (1<<10) #define SDHCI_QUIRK_BROKEN_TIMEOUT_VAL (1<<10)
int irq; /* Device IRQ */ int irq; /* Device IRQ */
void __iomem * ioaddr; /* Mapped address */ void __iomem * ioaddr; /* Mapped address */