From: Greg Kroah-Hartman Date: Sun, 21 Apr 2013 18:51:55 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.8.9~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c73280e98c46249e28a6218099406e8292ede6d7;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: arm-7696-1-fix-kexec-by-setting-outer_cache.inv_all-for-feroceon.patch ath9k_htc-accept-1.x-firmware-newer-than-1.3.patch --- diff --git a/queue-3.0/arm-7696-1-fix-kexec-by-setting-outer_cache.inv_all-for-feroceon.patch b/queue-3.0/arm-7696-1-fix-kexec-by-setting-outer_cache.inv_all-for-feroceon.patch new file mode 100644 index 00000000000..272bd5e118e --- /dev/null +++ b/queue-3.0/arm-7696-1-fix-kexec-by-setting-outer_cache.inv_all-for-feroceon.patch @@ -0,0 +1,39 @@ +From cd272d1ea71583170e95dde02c76166c7f9017e6 Mon Sep 17 00:00:00 2001 +From: Illia Ragozin +Date: Wed, 10 Apr 2013 19:43:34 +0100 +Subject: ARM: 7696/1: Fix kexec by setting outer_cache.inv_all for Feroceon + +From: Illia Ragozin + +commit cd272d1ea71583170e95dde02c76166c7f9017e6 upstream. + +On Feroceon the L2 cache becomes non-coherent with the CPU +when the L1 caches are disabled. Thus the L2 needs to be invalidated +after both L1 caches are disabled. + +On kexec before the starting the code for relocation the kernel, +the L1 caches are disabled in cpu_froc_fin (cpu_v7_proc_fin for Feroceon), +but after L2 cache is never invalidated, because inv_all is not set +in cache-feroceon-l2.c. +So kernel relocation and decompression may has (and usually has) errors. +Setting the function enables L2 invalidation and fixes the issue. + +Signed-off-by: Illia Ragozin +Acked-by: Jason Cooper +Signed-off-by: Russell King +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/mm/cache-feroceon-l2.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/mm/cache-feroceon-l2.c ++++ b/arch/arm/mm/cache-feroceon-l2.c +@@ -342,6 +342,7 @@ void __init feroceon_l2_init(int __l2_wt + outer_cache.inv_range = feroceon_l2_inv_range; + outer_cache.clean_range = feroceon_l2_clean_range; + outer_cache.flush_range = feroceon_l2_flush_range; ++ outer_cache.inv_all = l2_inv_all; + + enable_l2(); + diff --git a/queue-3.0/ath9k_htc-accept-1.x-firmware-newer-than-1.3.patch b/queue-3.0/ath9k_htc-accept-1.x-firmware-newer-than-1.3.patch new file mode 100644 index 00000000000..0b6f88939ad --- /dev/null +++ b/queue-3.0/ath9k_htc-accept-1.x-firmware-newer-than-1.3.patch @@ -0,0 +1,32 @@ +From 319e7bd96aca64a478f3aad40711c928405b8b77 Mon Sep 17 00:00:00 2001 +From: Felix Fietkau +Date: Sun, 7 Apr 2013 21:10:48 +0200 +Subject: ath9k_htc: accept 1.x firmware newer than 1.3 + +From: Felix Fietkau + +commit 319e7bd96aca64a478f3aad40711c928405b8b77 upstream. + +Since the firmware has been open sourced, the minor version has been +bumped to 1.4 and the API/ABI will stay compatible across further 1.x +releases. + +Signed-off-by: Felix Fietkau +Signed-off-by: John W. Linville +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c ++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c +@@ -823,7 +823,7 @@ static int ath9k_init_firmware_version(s + * required version. + */ + if (priv->fw_version_major != MAJOR_VERSION_REQ || +- priv->fw_version_minor != MINOR_VERSION_REQ) { ++ priv->fw_version_minor < MINOR_VERSION_REQ) { + dev_err(priv->dev, "ath9k_htc: Please upgrade to FW version %d.%d\n", + MAJOR_VERSION_REQ, MINOR_VERSION_REQ); + return -EINVAL; diff --git a/queue-3.0/series b/queue-3.0/series index 5e715a09778..9e6669d27db 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -1,3 +1,5 @@ hrtimer-don-t-reinitialize-a-cpu_base-lock-on-cpu_up.patch revert-8021q-fix-a-potential-use-after-free.patch can-sja1000-fix-handling-on-dt-properties-on-little-endian-systems.patch +arm-7696-1-fix-kexec-by-setting-outer_cache.inv_all-for-feroceon.patch +ath9k_htc-accept-1.x-firmware-newer-than-1.3.patch