From: Willy Tarreau <w@1wt.eu>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Maxim Uvarov <maxim.uvarov@oracle.com>, Wim Van Sebroeck <wim@iguana.be>
Subject: [ 12/12] watchdog: hpwdt: clean up set_memory_x call for 32 bit
Date: Mon, 12 Mar 2012 01:20:57 +0100 [thread overview]
Message-ID: <20120312002046.443666929@1wt.eu> (raw)
In-Reply-To: <feb44625a10a45049eddf27890e95d54@local>
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Maxim Uvarov <maxim.uvarov@oracle.com>
commit 97d2a10d5804d585ab0b58efbd710948401b886a upstream.
1. address has to be page aligned.
2. set_memory_x uses page size argument, not size.
Bug causes with following commit:
commit da28179b4e90dda56912ee825c7eaa62fc103797
Author: Mingarelli, Thomas <Thomas.Mingarelli@hp.com>
Date: Mon Nov 7 10:59:00 2011 +0100
watchdog: hpwdt: Changes to handle NX secure bit in 32bit path
commit e67d668e147c3b4fec638c9e0ace04319f5ceccd upstream.
This patch makes use of the set_memory_x() kernel API in order
to make necessary BIOS calls to source NMIs.
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable <stable@vger.kernel.org>
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 8464ea1..3c166d3 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -231,7 +231,7 @@ static int __devinit cru_detect(unsigned long map_entry,
cmn_regs.u1.reax = CRU_BIOS_SIGNATURE_VALUE;
- set_memory_x((unsigned long)bios32_entrypoint, (2 * PAGE_SIZE));
+ set_memory_x((unsigned long)bios32_map, 2);
asminline_call(&cmn_regs, bios32_entrypoint);
if (cmn_regs.u1.ral != 0) {
@@ -250,7 +250,8 @@ static int __devinit cru_detect(unsigned long map_entry,
cru_rom_addr =
ioremap(cru_physical_address, cru_length);
if (cru_rom_addr) {
- set_memory_x((unsigned long)cru_rom_addr, cru_length);
+ set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK,
+ (cru_length + PAGE_SIZE - 1) >> PAGE_SHIFT);
retval = 0;
}
}
prev parent reply other threads:[~2012-03-12 0:20 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <feb44625a10a45049eddf27890e95d54@local>
2012-03-12 0:20 ` [ 00/12] 2.6.32.59-longterm review Willy Tarreau
2012-03-12 0:20 ` [ 01/12] compat: Re-add missing asm/compat.h include to fix compile breakage on s390 Willy Tarreau
2012-03-12 0:20 ` [ 02/12] Remove COMPAT_IA32 support Willy Tarreau
2012-03-12 1:07 ` Ben Hutchings
2012-03-12 2:49 ` Greg KH
2012-03-12 6:30 ` Willy Tarreau
2012-03-12 6:48 ` stripping [PATCH] without losing later tags from mailed patches (Re: [ 02/12] Remove COMPAT_IA32 support) Jonathan Nieder
2012-03-12 8:58 ` Willy Tarreau
2012-03-12 15:20 ` Greg KH
2012-03-12 15:24 ` Willy Tarreau
2012-03-12 16:41 ` Thomas Rast
2012-03-12 16:53 ` Willy Tarreau
2012-03-12 16:57 ` Jonathan Nieder
2012-03-12 18:04 ` Junio C Hamano
2012-03-12 18:50 ` Willy Tarreau
2012-03-12 18:54 ` Jonathan Nieder
2012-03-12 19:17 ` Willy Tarreau
2012-03-12 21:47 ` Thomas Rast
2012-03-12 21:56 ` [PATCH] git-am: error out when seeing -b/--binary Jonathan Nieder
2012-03-12 22:03 ` Thomas Rast
2012-03-12 22:22 ` Jonathan Nieder
2012-03-13 15:31 ` Thomas Rast
2012-03-13 17:31 ` Junio C Hamano
2012-03-13 17:51 ` Jonathan Nieder
2012-03-13 18:22 ` Junio C Hamano
2012-03-12 22:12 ` Junio C Hamano
2012-03-12 21:57 ` stripping [PATCH] without losing later tags from mailed patches (Re: [ 02/12] Remove COMPAT_IA32 support) Junio C Hamano
2012-03-12 16:40 ` Junio C Hamano
2012-03-12 16:48 ` Willy Tarreau
2012-03-12 17:57 ` Junio C Hamano
2012-03-12 18:45 ` Willy Tarreau
2012-03-12 19:29 ` Junio C Hamano
2012-03-12 17:12 ` Greg KH
2012-03-12 18:01 ` Junio C Hamano
2012-03-12 19:26 ` Greg KH
2012-03-12 19:51 ` Junio C Hamano
2012-03-12 20:19 ` Willy Tarreau
2012-03-12 15:25 ` [ 02/12] Remove COMPAT_IA32 support Ben Hutchings
2012-03-12 17:02 ` Arnd Bergmann
2012-03-12 17:14 ` Willy Tarreau
2012-03-12 19:34 ` Ben Hutchings
2012-03-12 19:45 ` Willy Tarreau
2012-03-12 0:20 ` [ 03/12] writeback: fixups for !dirty_writeback_centisecs Willy Tarreau
2012-03-12 0:20 ` [ 04/12] bsg: fix sysfs link remove warning Willy Tarreau
2012-03-12 0:20 ` [ 05/12] eCryptfs: Handle failed metadata read in lookup Willy Tarreau
2012-03-12 0:20 ` [ 06/12] [S390] KEYS: Enable the compat keyctl wrapper on s390x Willy Tarreau
2012-03-12 0:20 ` [ 07/12] cifs: fix dentry refcount leak when opening a FIFO on lookup Willy Tarreau
2012-03-12 0:20 ` [ 08/12] mac80211: zero initialize count field in ieee80211_tx_rate Willy Tarreau
2012-03-12 1:57 ` Ben Hutchings
2012-03-12 4:36 ` Mohammed Shafi Shajakhan
2012-03-12 6:34 ` Willy Tarreau
2012-03-12 6:52 ` Mohammed Shafi Shajakhan
2012-03-12 15:23 ` Ben Hutchings
2012-03-12 15:55 ` Mohammed Shafi Shajakhan
2012-03-12 16:10 ` Mohammed Shafi Shajakhan
2012-03-12 6:31 ` Willy Tarreau
2012-03-12 0:20 ` [ 09/12] net/usbnet: avoid recursive locking in usbnet_stop() Willy Tarreau
2012-03-12 0:20 ` [ 10/12] regset: Prevent null pointer reference on readonly regsets Willy Tarreau
2012-03-12 0:20 ` [ 11/12] regset: Return -EFAULT, not -EIO, on host-side memory fault Willy Tarreau
2012-03-12 0:20 ` Willy Tarreau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120312002046.443666929@1wt.eu \
--to=w@1wt.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=maxim.uvarov@oracle.com \
--cc=stable@vger.kernel.org \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).