Home Home > GIT Browse > openSUSE-15.0
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2011-11-07 22:57:32 +0100
committerJean Delvare <jdelvare@suse.de>2011-11-07 22:57:32 +0100
commit03ae7774dbd4f35b367f593ddd9bb0cb0139a7e9 (patch)
tree0e511c4ea7d4fe141c08b1da8bceec7be388d067
parentdb7a06b3985585cf68bac20fa1300fcb00c58ed6 (diff)
- patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch:rpm-3.0.8-0.9
watchdog/hpwdt: Allow BIOS calls when NX is enabled (bnc#720674).
-rw-r--r--kernel-source.changes14
-rw-r--r--patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch35
-rw-r--r--series.conf1
3 files changed, 50 insertions, 0 deletions
diff --git a/kernel-source.changes b/kernel-source.changes
index d77ba5da0c..671a86f2bc 100644
--- a/kernel-source.changes
+++ b/kernel-source.changes
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Mon Nov 7 22:57:11 CET 2011 - jdelvare@suse.de
+
+- patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch:
+ watchdog/hpwdt: Allow BIOS calls when NX is enabled
+ (bnc#720674).
+
+-------------------------------------------------------------------
+Mon Nov 7 22:56:40 CET 2011 - jdelvare@suse.de
+
+- patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch:
+ watchdog/hpwdt: Allow BIOS calls when NX is enabled
+ (bnc#720674 ).
+
+-------------------------------------------------------------------
Mon Nov 7 15:10:30 CET 2011 - jlee@suse.com
- patches.drivers/0001-tg3-fix-tigon3_dma_hwbug_workaround.patch:
diff --git a/patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch b/patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch
new file mode 100644
index 0000000000..c57417113f
--- /dev/null
+++ b/patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch
@@ -0,0 +1,35 @@
+From: Thomas Mingarelli <thomas.mingarelli@hp.com>
+Subject: watchdog/hpwdt: Allow BIOS calls when NX is enabled
+References: bnc#720674
+Patch-mainline: Not yet, should happen soon
+
+This patch makes use of the set_memory_x() kernel API in order to make necessary BIOS calls to source NMIs.
+
+Signed-off by: Thomas Mingarelli <thomas.mingarelli@hp.com>
+Acked-by: Jean Delvare <jdelvare@suse.de>
+---
+ drivers/watchdog/hpwdt.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/drivers/watchdog/hpwdt.c
++++ b/drivers/watchdog/hpwdt.c
+@@ -230,6 +230,7 @@ static int __devinit cru_detect(unsigned
+
+ cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE;
+
++ set_memory_x((unsigned long)bios32_entrypoint, (2 * PAGE_SIZE));
+ asminline_call(&cmn_regs, bios32_entrypoint);
+
+ if (cmn_regs.u1.ral != 0) {
+@@ -247,8 +248,10 @@ static int __devinit cru_detect(unsigned
+ if ((physical_bios_base + physical_bios_offset)) {
+ cru_rom_addr =
+ ioremap(cru_physical_address, cru_length);
+- if (cru_rom_addr)
++ if (cru_rom_addr) {
++ set_memory_x((unsigned long)cru_rom_addr, cru_length);
+ retval = 0;
++ }
+ }
+
+ printk(KERN_DEBUG "hpwdt: CRU Base Address: 0x%lx\n",
diff --git a/series.conf b/series.conf
index d3535d681d..84da7dfcc6 100644
--- a/series.conf
+++ b/series.conf
@@ -2069,6 +2069,7 @@
patches.arch/ppc-fate-312285-1
patches.arch/8250_pci-add-eeh-support-to-the-8250-driver-for-ibm-digi-pcie-2-port-adapter
patches.drivers/hpwdt_add_next_gen_HP_servers.patch
+ patches.fixes/hpwdt_fix_BIOS_calls_under_NX.patch
patches.suse/0001-saa7134-add-dummy-compatibility-parameter.patch
patches.suse/0001-bttv-add-dummy-module-parameter.patch
patches.fixes/ibmveth-bounce-oops2