[oe-commits] org.oe.dev Added PXA27x resume fix from Russell King to linux-rp-2.6.24.

[utx commit]

Added PXA27x resume fix from Russell King to linux-rp-2.6.24.

Author: utx at openembedded.org
Branch: org.openembedded.dev
Revision: a9ec71b4b3a7b6500927fc2c0f61184d610a91e6
ViewMTN: http://monotone.openembedded.org/revision/info/a9ec71b4b3a7b6500927fc2c0f61184d610a91e6
Files:
1
packages/linux/linux-rp-2.6.24/pxa27x-resume.patch
packages/linux/linux-rp_2.6.24.bb
Diffs:

#
# mt diff -rb53dab09ba9dbaf5d7d8c22be3a0ae0643f47fcd -ra9ec71b4b3a7b6500927fc2c0f61184d610a91e6
#
# 
# 
# add_file "packages/linux/linux-rp-2.6.24/pxa27x-resume.patch"
#  content [9165b53d2b07e5d3fed32ccf6061ab1e12856c29]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [4e4d0888003dc67fb428a0930b3605d7a111f4a3]
#    to [660ace9202cedafc6cbeb0a7336411637f497bd5]
# 
============================================================
--- packages/linux/linux-rp-2.6.24/pxa27x-resume.patch	9165b53d2b07e5d3fed32ccf6061ab1e12856c29
+++ packages/linux/linux-rp-2.6.24/pxa27x-resume.patch	9165b53d2b07e5d3fed32ccf6061ab1e12856c29
@@ -0,0 +1,41 @@
+List:       linux-arm-kernel
+Subject:    [PATCH] Fix PXA27x resume
+From:       Russell King - ARM Linux <linux at arm.linux.org.uk>
+Date:       2008-01-21 13:53:31
+Message-ID: 20080121135331.GC30149 at flint.arm.linux.org.uk
+[Download message RAW]
+
+When PXA27x wakes up, tick_resume_oneshot() tries to set a timer
+interrupt to occur immediately.  Since PXA27x requires at least
+MIN_OSCR_DELTA, this causes us to flag an error.
+
+tick_program_event() then increments the next event time by
+min_delta_ns.  However, by the time we get back to programming
+the next event, the OSCR has incremented such that we fail again.
+We repeatedly retry, but the OSCR is too fast for us - we never
+catch up, so we never break out of the loop - resulting in us
+never apparantly resuming.
+
+Fix this by doubling min_delta_ns.
+
+Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
+
+diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
+index ac0bbad..7b7c017 100644
+--- a/arch/arm/mach-pxa/time.c
++++ b/arch/arm/mach-pxa/time.c
+@@ -169,7 +169,7 @@ static void __init pxa_timer_init(void)
+ 	ckevt_pxa_osmr0.max_delta_ns =
+ 		clockevent_delta2ns(0x7fffffff, &ckevt_pxa_osmr0);
+ 	ckevt_pxa_osmr0.min_delta_ns =
+-		clockevent_delta2ns(MIN_OSCR_DELTA, &ckevt_pxa_osmr0) + 1;
++		clockevent_delta2ns(MIN_OSCR_DELTA * 2, &ckevt_pxa_osmr0) + 1;
+ 
+ 	cksrc_pxa_oscr0.mult =
+ 		clocksource_hz2mult(clock_tick_rate, cksrc_pxa_oscr0.shift);
+
+-------------------------------------------------------------------
+List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
+FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
+Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php
+
============================================================
--- packages/linux/linux-rp_2.6.24.bb	4e4d0888003dc67fb428a0930b3605d7a111f4a3
+++ packages/linux/linux-rp_2.6.24.bb	660ace9202cedafc6cbeb0a7336411637f497bd5
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
@@ -41,6 +41,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
            ${RPSRC}/poodle_pm-r5.patch;patch=1 \
            ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \
            ${RPSRC}/poodle_asoc_fix-r1.patch;patch=1 \
+           file://pxa27x-resume.patch;patch=1;status=external \
            file://squashfs3.3.patch;patch=1;status=external \
            ${RPSRC}/logo_oh-r1.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \