Skip to contentSkip to conversation

linux-omap-psp, linux-omap: Added patch to fix MMC timeout errors

PATCH Superseded Joel A Fernandes 3 participants 3 messages Jul 20, 2011

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 linux-omap-psp, linux-omap: Added patch to fix MMC timeout errors

This fixes MMC errors due to timeouts on certain SD Cards, following suggestions to set dto to 14 by Jason Kridner and Steven Kipisz

Details of the issue:
http://talk.maemo.org/showthread.php?p=1000707#post1000707
---
Changes since earlier patch:
* Set dto to 14 instead of doubling timeout

Other notes:
* We have confirmation that this patch fixes the issue, so it is safe to apply to the maintentance tree

* Also please revert the earlier patch from the dev tree titled
"linux-omap-psp: Added patch to fix MMC timeout errors" (commit 93e91091c7e2864274207cc7c59e3f64e453f843)

Another thread discussing the issue:
http://www.mail-archive.com/[email protected]/msg42214.html

Thanks!

 ...mc-Adjust-dto-to-eliminate-timeout-errors.patch |   27 ++++++++++++++++++++
 ...mc-Adjust-dto-to-eliminate-timeout-errors.patch |   27 ++++++++++++++++++++
 recipes/linux/linux-omap-psp_2.6.32.bb             |    3 +-
 recipes/linux/linux-omap_2.6.39.bb                 |    3 +-
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 recipes/linux/linux-omap-2.6.39/beagle/0006-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch
 create mode 100644 recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch
recipes/linux/linux-omap-2.6.39/beagle/0006-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch new file +27 -0
new file mode 100644
index 0000000..7a563b7
@@ -0,0 +1,27 @@
+From bd0b2f97c48aa6aac0c6a494f1c6ba5af5de486b Mon Sep 17 00:00:00 2001
+From: Joel A Fernandes <[email protected]>
+Date: Mon, 18 Jul 2011 23:13:41 -0500
+Subject: [PATCH] omap_hsmmc: Set dto to max value of 14 to avoid SD Card timeouts
+
+Signed-off-by: Joel A Fernandes <[email protected]>
+---
+ drivers/mmc/host/omap_hsmmc.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
+index 9646a75..7443647 100644
+--- a/drivers/mmc/host/omap_hsmmc.c
++++ b/drivers/mmc/host/omap_hsmmc.c
+@@ -1049,6 +1049,9 @@ static void set_data_timeout(struct omap_hsmmc_host *host,
+ 			dto = 14;
+ 	}
+ 
++	/* Set dto to max value of 14 to avoid SD Card timeouts */
++	dto = 14;
++
+ 	reg &= ~DTO_MASK;
+ 	reg |= dto << DTO_SHIFT;
+ 	OMAP_HSMMC_WRITE(host->base, SYSCTL, reg);
+-- 
+1.7.0.4
+
recipes/linux/linux-omap-psp-2.6.32/0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch new file +27 -0
new file mode 100644
index 0000000..7a563b7
@@ -0,0 +1,27 @@
+From bd0b2f97c48aa6aac0c6a494f1c6ba5af5de486b Mon Sep 17 00:00:00 2001
+From: Joel A Fernandes <[email protected]>
+Date: Mon, 18 Jul 2011 23:13:41 -0500
+Subject: [PATCH] omap_hsmmc: Set dto to max value of 14 to avoid SD Card timeouts
+
+Signed-off-by: Joel A Fernandes <[email protected]>
+---
+ drivers/mmc/host/omap_hsmmc.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
+index 9646a75..7443647 100644
+--- a/drivers/mmc/host/omap_hsmmc.c
++++ b/drivers/mmc/host/omap_hsmmc.c
+@@ -1049,6 +1049,9 @@ static void set_data_timeout(struct omap_hsmmc_host *host,
+ 			dto = 14;
+ 	}
+ 
++	/* Set dto to max value of 14 to avoid SD Card timeouts */
++	dto = 14;
++
+ 	reg &= ~DTO_MASK;
+ 	reg |= dto << DTO_SHIFT;
+ 	OMAP_HSMMC_WRITE(host->base, SYSCTL, reg);
+-- 
+1.7.0.4
+
recipes/linux/linux-omap-psp_2.6.32.bb +2 -1
index ab9a04a..7a0797a 100644
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "am3517-crane|beagleboard|omap3evm|am3517-evm|dm37x-evm|am3
 SRCREV = "5fc29e7b2a76a64a739f857858ef0b98294aa155"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-MACHINE_KERNEL_PR_append = "e+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "f+gitr${SRCREV}"
 
 SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;branch=master \
            file://0001-Added-Crane-Board-support.patch \
@@ -59,6 +59,7 @@ SRC_URI = "git://arago-project.org/git/projects/linux-omap3.git;protocol=http;br
            file://0044-ARM-OMAP-beagle-every-known-beagle-except-revB-uses-.patch \
            file://0045-ARM-OMAP-beagle-add-support-for-beagleFPGA-expansion.patch \
            file://0046-ARM-OMAP-beagle-disable-uart-timeout.patch \
+           file://0047-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch \
            file://cam/0001-mt9t111-first-stab-at-merging-sensor-driver-based-on.patch \
            file://cam/0002-mt9t111-Fix-all-checkpatch-errors.patch \
            file://cam/0003-mt9t111-Pass-v4l2_int_device-data.patch \
recipes/linux/linux-omap_2.6.39.bb +2 -1
index 5b1c797..5566c0d 100644
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(beagleboard)"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
 SRCREV_pn-${PN} = "v2.6.39"
-MACHINE_KERNEL_PR_append = "h"
+MACHINE_KERNEL_PR_append = "i"
 
 FILESPATHPKG_prepend = "linux-omap-2.6.39:"
 
@@ -52,6 +52,7 @@ SRC_URI_append = " \
            file://beagle/0003-OMAP3-beagle-add-MADC-support.patch \
            file://beagle/0004-OMAP3-beagle-add-regulators-for-camera-interface.patch \
            file://beagle/0005-OMAP3-beagle-HACK-add-in-1GHz-OPP.patch \
+           file://beagle/0006-omap-mmc-Adjust-dto-to-eliminate-timeout-errors.patch \
            \
            file://camera/0001-Add-driver-for-Aptina-Micron-mt9p031-sensor.patch \
            file://camera/0002-v4l-Add-mt9v032-sensor-driver.patch \
Signature · 1 line
1.7.0.4
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 20-07-11 02:27, Joel A Fernandes schreef:

Quoted 3 lines

This fixes MMC errors due to timeouts on certain SD Cards, following suggestions to set dto to 14 by Jason Kridner and Steven Kipisz

Details of the issue: http://talk.maemo.org/showthread.php?p=1000707#post1000707

This patch doesn't apply to .dev

Quoted 5 lines

--- Changes since earlier patch: * Set dto to 14 instead of doubling timeout

Other notes: * We have confirmation that this patch fixes the issue, so it is safe to apply to the maintentance tree

* Also please revert the earlier patch from the dev tree titled "linux-omap-psp: Added patch to fix MMC timeout errors" (commit 93e91091c7e2864274207cc7c59e3f64e453f843)

We don't work like that.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOJne1MkyGM64RGpERAhkiAKCDgNisgBs53GsmoVUfhIjK/2zRgQCfatRU wiq8t6sOSGduyJfHkhrCgLc=
=XpXN
-----END PGP SIGNATURE-----

#2 lore raw

Am Mittwoch, den 20.07.2011, 08:37 +0200 schrieb Koen Kooi:

Quoted 6 lines

Op 20-07-11 02:27, Joel A Fernandes schreef:

Quoted 3 lines

This fixes MMC errors due to timeouts on certain SD Cards, following suggestions to set dto to 14 by Jason Kridner and Steven Kipisz

Details of the issue: http://talk.maemo.org/showthread.php?p=1000707#post1000707

This patch doesn't apply to .dev

I guess because it was intended for maintenance. Joel, I think the policy is that patches should go to master first.

Quoted 7 lines
Quoted 5 lines

--- Changes since earlier patch: * Set dto to 14 instead of doubling timeout

Other notes: * We have confirmation that this patch fixes the issue, so it is safe to apply to the maintentance tree

* Also please revert the earlier patch from the dev tree titled "linux-omap-psp: Added patch to fix MMC timeout errors" (commit 93e91091c7e2864274207cc7c59e3f64e453f843)

We don't work like that.

I think the problem is that the version was bumped and decreasing it when reverting does not work.

Therefore either send a patch reverting the previous commit but increasing the version or send a patch updating the MMC patch.

Thanks,

Paul

PS: Joel, do I still need to CC everyone? I guess Koen is reading the list anyhow.