diff --git a/debian/changelog b/debian/changelog index f181d59a8..cb220b090 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,8 @@ linux-2.6 (2.6.26~rc8-1~experimental.1) UNRELEASED; urgency=low (closes: #475295, #478419) * [x86]: Enable modular FB_UVESA. (closes: #473180) * JFFS2 enable summary and compressor support. (closes: #488242) + * Add OLPC sdhci quirks. Thanks Andres Salomon + (closes: #485192) [ Martin Michlmayr ] * [arm/orion5x] Update the config to reflect upstream renaming this diff --git a/debian/patches/bugfix/all/sdhci-quirk-marvell-cafe-interrupt.patch b/debian/patches/bugfix/all/sdhci-quirk-marvell-cafe-interrupt.patch new file mode 100644 index 000000000..79ca0db56 --- /dev/null +++ b/debian/patches/bugfix/all/sdhci-quirk-marvell-cafe-interrupt.patch @@ -0,0 +1,66 @@ + +The CaFe chip has a hardware bug that ends up with us getting a timeout +value that's too small, causing the following sorts of problems: + +[ 60.525138] mmcblk0: error -110 transferring data +[ 60.531477] end_request: I/O error, dev mmcblk0, sector 1484353 +[ 60.533371] Buffer I/O error on device mmcblk0p2, logical block 181632 +[ 60.533371] lost page write due to I/O error on mmcblk0p2 + +Presumably this is an off-by-one error in the hardware. Incrementing +the timeout count value that we stuff into the TIMEOUT_CONTROL register +gets us a value that works. This bug was originally discovered by +Pierre Ossman, I believe. + +[thanks to Robert Millan for proving that this was still a problem] + +Signed-off-by: Andres Salomon +--- + drivers/mmc/host/sdhci.c | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c +index 5b74c8c..2b3f06a 100644 +--- a/drivers/mmc/host/sdhci.c ++++ b/drivers/mmc/host/sdhci.c +@@ -57,6 +57,8 @@ static unsigned int debug_quirks = 0; + #define SDHCI_QUIRK_RESET_AFTER_REQUEST (1<<8) + /* Controller needs voltage and power writes to happen separately */ + #define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1<<9) ++/* Controller has an off-by-one issue with timeout value */ ++#define SDHCI_QUIRK_INCR_TIMEOUT_CONTROL (1<<10) + + static const struct pci_device_id pci_ids[] __devinitdata = { + { +@@ -134,7 +136,8 @@ static const struct pci_device_id pci_ids[] __devinitdata = { + .device = PCI_DEVICE_ID_MARVELL_CAFE_SD, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, +- .driver_data = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER, ++ .driver_data = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER | ++ SDHCI_QUIRK_INCR_TIMEOUT_CONTROL, + }, + + { +@@ -479,6 +482,13 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_data *data) + break; + } + ++ /* ++ * Compensate for an off-by-one error in the CaFe hardware; otherwise, ++ * a too-small count gives us interrupt timeouts. ++ */ ++ if ((host->chip->quirks & SDHCI_QUIRK_INCR_TIMEOUT_CONTROL)) ++ count++; ++ + if (count >= 0xF) { + printk(KERN_WARNING "%s: Too large timeout requested!\n", + mmc_hostname(host->mmc)); +-- +1.5.5.3 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +Please read the FAQ at http://www.tux.org/lkml/ \ No newline at end of file diff --git a/debian/patches/bugfix/all/sdhci-quirk-marvell-cafe-vdd-powerup.patch b/debian/patches/bugfix/all/sdhci-quirk-marvell-cafe-vdd-powerup.patch new file mode 100644 index 000000000..e5d822f83 --- /dev/null +++ b/debian/patches/bugfix/all/sdhci-quirk-marvell-cafe-vdd-powerup.patch @@ -0,0 +1,78 @@ +This has been sitting around unloved for way too long.. + +The Marvell CaFe chip's SD implementation chokes during card insertion +if one attempts to set the voltage and power up in the same +SDHCI_POWER_CONTROL register write. This adds a quirk that does +that particular dance in two steps. + +It also adds an entry to pci_ids.h for the CaFe chip's SD device. + +Signed-off-by: Andres Salomon +--- + drivers/mmc/host/sdhci.c | 18 ++++++++++++++++++ + include/linux/pci_ids.h | 1 + + 2 files changed, 19 insertions(+), 0 deletions(-) + +diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c +index 07c2048..5b74c8c 100644 +--- a/drivers/mmc/host/sdhci.c ++++ b/drivers/mmc/host/sdhci.c +@@ -55,6 +55,8 @@ static unsigned int debug_quirks = 0; + #define SDHCI_QUIRK_32BIT_DMA_SIZE (1<<7) + /* Controller needs to be reset after each request to stay stable */ + #define SDHCI_QUIRK_RESET_AFTER_REQUEST (1<<8) ++/* Controller needs voltage and power writes to happen separately */ ++#define SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER (1<<9) + + static const struct pci_device_id pci_ids[] __devinitdata = { + { +@@ -128,6 +130,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = { + }, + + { ++ .vendor = PCI_VENDOR_ID_MARVELL, ++ .device = PCI_DEVICE_ID_MARVELL_CAFE_SD, ++ .subvendor = PCI_ANY_ID, ++ .subdevice = PCI_ANY_ID, ++ .driver_data = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER, ++ }, ++ ++ { + .vendor = PCI_VENDOR_ID_JMICRON, + .device = PCI_DEVICE_ID_JMICRON_JMB38X_SD, + .subvendor = PCI_ANY_ID, +@@ -774,6 +784,14 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power) + BUG(); + } + ++ /* ++ * At least the CaFe chip gets confused if we set the voltage ++ * and set turn on power at the same time, so set the voltage first. ++ */ ++ if ((host->chip->quirks & SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER)) ++ writeb(pwr & ~SDHCI_POWER_ON, ++ host->ioaddr + SDHCI_POWER_CONTROL); ++ + writeb(pwr, host->ioaddr + SDHCI_POWER_CONTROL); + + out: +diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h +index eafc9d6..6595382 100644 +--- a/include/linux/pci_ids.h ++++ b/include/linux/pci_ids.h +@@ -1520,6 +1520,7 @@ + #define PCI_DEVICE_ID_MARVELL_GT64260 0x6430 + #define PCI_DEVICE_ID_MARVELL_MV64360 0x6460 + #define PCI_DEVICE_ID_MARVELL_MV64460 0x6480 ++#define PCI_DEVICE_ID_MARVELL_CAFE_SD 0x4101 + + #define PCI_VENDOR_ID_V3 0x11b0 + #define PCI_DEVICE_ID_V3_V960 0x0001 +-- +1.5.5.3 + +-- +To unsubscribe from this list: send the line "unsubscribe linux-kernel" in +the body of a message to majordomo@vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html +Please read the FAQ at http://www.tux.org/lkml/ \ No newline at end of file diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index da0240f95..88c5ec4ad 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -47,3 +47,5 @@ + bugfix/fix-hifn_795X-divdi3.patch + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch + features/all/0001-iwlwifi-Set-monitor-mode-for-3945.patch ++ bugfix/all/sdhci-quirk-marvell-cafe-vdd-powerup.patch ++ bugfix/all/sdhci-quirk-marvell-cafe-interrupt.patch