[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-299c56966a72b9109d47c71a6db52097098703dd@git.kernel.org>
Date: Mon, 28 Feb 2011 15:26:04 GMT
From: tip-bot for Don Zickus <dzickus@...hat.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, mjg@...hat.com, hpa@...or.com,
mingo@...hat.com, stable@...nel.org, tglx@...utronix.de,
dzickus@...hat.com, mingo@...e.hu
Subject: [tip:x86/urgent] x86: Use u32 instead of long to set reset vector back to 0
Commit-ID: 299c56966a72b9109d47c71a6db52097098703dd
Gitweb: http://git.kernel.org/tip/299c56966a72b9109d47c71a6db52097098703dd
Author: Don Zickus <dzickus@...hat.com>
AuthorDate: Mon, 7 Feb 2011 23:25:00 -0500
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 28 Feb 2011 16:22:18 +0100
x86: Use u32 instead of long to set reset vector back to 0
A customer of ours, complained that when setting the reset
vector back to 0, it trashed other data and hung their box.
They noticed when only 4 bytes were set to 0 instead of 8,
everything worked correctly.
Mathew pointed out:
|
| We're supposed to be resetting trampoline_phys_low and
| trampoline_phys_high here, which are two 16-bit values.
| Writing 64 bits is definitely going to overwrite space
| that we're not supposed to be touching.
|
So limit the area modified to u32.
Signed-off-by: Don Zickus <dzickus@...hat.com>
Acked-by: Matthew Garrett <mjg@...hat.com>
Cc: <stable@...nel.org>
LKML-Reference: <1297139100-424-1-git-send-email-dzickus@...hat.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/include/asm/smpboot_hooks.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/include/asm/smpboot_hooks.h b/arch/x86/include/asm/smpboot_hooks.h
index 6c22bf3..725b778 100644
--- a/arch/x86/include/asm/smpboot_hooks.h
+++ b/arch/x86/include/asm/smpboot_hooks.h
@@ -34,7 +34,7 @@ static inline void smpboot_restore_warm_reset_vector(void)
*/
CMOS_WRITE(0, 0xf);
- *((volatile long *)phys_to_virt(apic->trampoline_phys_low)) = 0;
+ *((volatile u32 *)phys_to_virt(apic->trampoline_phys_low)) = 0;
}
static inline void __init smpboot_setup_io_apic(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists