[kernel] r13624 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Martin Michlmayr]

Author: tbm
Date: Sat May 16 08:52:35 2009
New Revision: 13624

Log:
mmc: mvsdio: ignore high speed timing requests from the core

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/5

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat May 16 08:42:03 2009	(r13623)
+++ dists/sid/linux-2.6/debian/changelog	Sat May 16 08:52:35 2009	(r13624)
@@ -9,6 +9,7 @@
   [ Martin Michlmayr ]
   * Broadcom SB: fix locking in set_irq_affinity.
   * mmc: load mvsdio automatically when it's a platform device.
+  * mmc: mvsdio: ignore high speed timing requests from the core
   * USB: ftdi_sio: add vendor/product id for the Marvell SheevaPlug.
 
   [ Bastian Blank ]

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/mvsdio-ignore-high-speed.patch	Sat May 16 08:52:35 2009	(r13624)
@@ -0,0 +1,40 @@
+From: Nicolas Pitre <nico at cam.org>
+Date: Fri, 15 May 2009 00:59:47 +0000 (-0400)
+Subject: [MMC] mvsdio: ignore high speed timing requests from the core
+X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=9154da39b1da931b60ff380d3172d797ccaed71e
+
+[MMC] mvsdio: ignore high speed timing requests from the core
+
+Empirical evidences show that this is causing far more problems than it
+solves when this mode is enabled in the host hardware.  Amongst those
+cards that are known to be non functional when this bit is set are:
+
+	A-Data "Speedy" 2GB SD card
+	Kodak 512MB SD card
+	Ativa 1GB MicroSD card
+	Marvell 8688 (WIFI/Bluetooth) SDIO card
+
+Signed-off-by: Nicolas Pitre <nico at marvell.com>
+
+
+--- a/drivers/mmc/host/mvsdio.c~	2009-05-16 08:48:15.000000000 +0000
++++ b/drivers/mmc/host/mvsdio.c	2009-05-16 08:48:17.000000000 +0000
+@@ -617,9 +617,18 @@
+ 	if (ios->bus_width == MMC_BUS_WIDTH_4)
+ 		ctrl_reg |= MVSD_HOST_CTRL_DATA_WIDTH_4_BITS;
+ 
++	/*
++	 * The HI_SPEED_EN bit is causing trouble with many (but not all)
++	 * high speed SD, SDHC and SDIO cards.  Not enabling that bit
++	 * makes all cards work.  So let's just ignore that bit for now
++	 * and revisit this issue if problems for not enabling this bit
++	 * are ever reported.
++	 */
++#if 0
+ 	if (ios->timing == MMC_TIMING_MMC_HS ||
+ 	    ios->timing == MMC_TIMING_SD_HS)
+ 		ctrl_reg |= MVSD_HOST_CTRL_HI_SPEED_EN;
++#endif
+ 
+ 	host->ctrl = ctrl_reg;
+ 	mvsd_write(MVSD_HOST_CTRL, ctrl_reg);

Modified: dists/sid/linux-2.6/debian/patches/series/5
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/5	Sat May 16 08:42:03 2009	(r13623)
+++ dists/sid/linux-2.6/debian/patches/series/5	Sat May 16 08:52:35 2009	(r13624)
@@ -8,3 +8,4 @@
 + bugfix/all/stable/2.6.29.3-abi-1.patch
 + bugfix/sparc/ftbfs.patch
 + features/all/ftdi_sio-sheevaplug.patch
++ bugfix/all/mvsdio-ignore-high-speed.patch