3.0-stable patches

added patches:
	arm-7321-1-cache-v7-disable-preemption-when-reading-ccsidr.patch
	hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch

diff --git a/queue-3.0/arm-7321-1-cache-v7-disable-preemption-when-reading-ccsidr.patch b/queue-3.0/arm-7321-1-cache-v7-disable-preemption-when-reading-ccsidr.patch
new file mode 100644 (file)
index 0000000..4da1428
--- /dev/null
+++ b/queue-3.0/arm-7321-1-cache-v7-disable-preemption-when-reading-ccsidr.patch
@@ -0,0 +1,58 @@
+From b46c0f74657d1fe1c1b0c1452631cc38a9e6987f Mon Sep 17 00:00:00 2001
+From: Stephen Boyd <sboyd@codeaurora.org>
+Date: Tue, 7 Feb 2012 19:42:07 +0100
+Subject: ARM: 7321/1: cache-v7: Disable preemption when reading CCSIDR
+
+From: Stephen Boyd <sboyd@codeaurora.org>
+
+commit b46c0f74657d1fe1c1b0c1452631cc38a9e6987f upstream.
+
+armv7's flush_cache_all() flushes caches via set/way. To
+determine the cache attributes (line size, number of sets,
+etc.) the assembly first writes the CSSELR register to select a
+cache level and then reads the CCSIDR register. The CSSELR register
+is banked per-cpu and is used to determine which cache level CCSIDR
+reads. If the task is migrated between when the CSSELR is written and
+the CCSIDR is read the CCSIDR value may be for an unexpected cache
+level (for example L1 instead of L2) and incorrect cache flushing
+could occur.
+
+Disable interrupts across the write and read so that the correct
+cache attributes are read and used for the cache flushing
+routine. We disable interrupts instead of disabling preemption
+because the critical section is only 3 instructions and we want
+to call v7_dcache_flush_all from __v7_setup which doesn't have a
+full kernel stack with a struct thread_info.
+
+This fixes a problem we see in scm_call() when flush_cache_all()
+is called from preemptible context and sometimes the L2 cache is
+not properly flushed out.
+
+Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
+Acked-by: Catalin Marinas <catalin.marinas@arm.com>
+Reviewed-by: Nicolas Pitre <nico@linaro.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/mm/cache-v7.S |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/mm/cache-v7.S
++++ b/arch/arm/mm/cache-v7.S
+@@ -54,9 +54,15 @@ loop1:
+       and     r1, r1, #7                      @ mask of the bits for current cache only
+       cmp     r1, #2                          @ see what cache we have at this level
+       blt     skip                            @ skip if no cache, or just i-cache
++#ifdef CONFIG_PREEMPT
++      save_and_disable_irqs r9                @ make cssr&csidr read atomic
++#endif
+       mcr     p15, 2, r10, c0, c0, 0          @ select current cache level in cssr
+       isb                                     @ isb to sych the new cssr&csidr
+       mrc     p15, 1, r1, c0, c0, 0           @ read the new csidr
++#ifdef CONFIG_PREEMPT
++      restore_irqs_notrace r9
++#endif
+       and     r2, r1, #7                      @ extract the length of the cache lines
+       add     r2, r2, #4                      @ add 4 (line length offset)
+       ldr     r4, =0x3ff

diff --git a/queue-3.0/hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch b/queue-3.0/hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch
new file mode 100644 (file)
index 0000000..3cccd34
--- /dev/null
+++ b/queue-3.0/hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch
@@ -0,0 +1,31 @@
+From 09e87e5c4f9af656af2a8a3afc03487c5d9287c3 Mon Sep 17 00:00:00 2001
+From: Nikolaus Schulz <schulz@macnetix.de>
+Date: Wed, 8 Feb 2012 18:56:08 +0100
+Subject: hwmon: (f75375s) Fix automatic pwm mode setting for F75373 & F75375
+
+From: Nikolaus Schulz <schulz@macnetix.de>
+
+commit 09e87e5c4f9af656af2a8a3afc03487c5d9287c3 upstream.
+
+In order to enable temperature mode aka automatic mode for the F75373 and
+F75375 chips, the two FANx_MODE bits in the fan configuration register
+need be set to 01, not 10.
+
+Signed-off-by: Nikolaus Schulz <mail@microschulz.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwmon/f75375s.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/hwmon/f75375s.c
++++ b/drivers/hwmon/f75375s.c
+@@ -311,7 +311,7 @@ static int set_pwm_enable_direct(struct
+               fanmode  |= (3 << FAN_CTRL_MODE(nr));
+               break;
+       case 2: /* AUTOMATIC*/
+-              fanmode  |= (2 << FAN_CTRL_MODE(nr));
++              fanmode  |= (1 << FAN_CTRL_MODE(nr));
+               break;
+       case 3: /* fan speed */
+               break;

diff --git a/queue-3.0/series b/queue-3.0/series
index 318ee4eec3227c6c7c20df6dc5b093489eb84c8b..23608af66ebcfb5217bc7c446e646fda8ca5ec5a 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -7,3 +7,5 @@ relay-prevent-integer-overflow-in-relay_open.patch
 mac80211-timeout-a-single-frame-in-the-rx-reorder-buffer.patch
 writeback-fix-dereferencing-null-bdi-dev-on-trace_writeback_queue.patch
 gpio-pca953x-fix-warning-of-enabled-interrupts-in-handler.patch
+arm-7321-1-cache-v7-disable-preemption-when-reading-ccsidr.patch
+hwmon-f75375s-fix-automatic-pwm-mode-setting-for-f75373-f75375.patch