From 6aad86d55eaa928bc2be625c47eb2b4662adc34f Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Thu, 18 Oct 2007 15:26:51 -0400 Subject: [PATCH] --- yaml --- r: 71676 b: refs/heads/master c: 0387f4511e05a5cba8570e47cd1c7b7cc7875787 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/reboot_fixups_32.c | 8 +++----- trunk/include/asm-x86/geode.h | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7d286a2fda7a..55625e9b9053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54ffaa45c5f572ff6c344ca583137d0edf2d78cc +refs/heads/master: 0387f4511e05a5cba8570e47cd1c7b7cc7875787 diff --git a/trunk/arch/x86/kernel/reboot_fixups_32.c b/trunk/arch/x86/kernel/reboot_fixups_32.c index 8b30b26ad069..1a07bbea7be3 100644 --- a/trunk/arch/x86/kernel/reboot_fixups_32.c +++ b/trunk/arch/x86/kernel/reboot_fixups_32.c @@ -12,6 +12,7 @@ #include #include #include +#include static void cs5530a_warm_reset(struct pci_dev *dev) { @@ -24,11 +25,8 @@ static void cs5530a_warm_reset(struct pci_dev *dev) static void cs5536_warm_reset(struct pci_dev *dev) { - /* - * 6.6.2.12 Soft Reset (DIVIL_SOFT_RESET) - * writing 1 to the LSB of this MSR causes a hard reset. - */ - wrmsrl(0x51400017, 1ULL); + /* writing 1 to the LSB of this MSR causes a hard reset */ + wrmsrl(MSR_DIVIL_SOFT_RESET, 1ULL); udelay(50); /* shouldn't get here but be safe and spin a while */ } diff --git a/trunk/include/asm-x86/geode.h b/trunk/include/asm-x86/geode.h index d94898831bac..771af336734f 100644 --- a/trunk/include/asm-x86/geode.h +++ b/trunk/include/asm-x86/geode.h @@ -38,6 +38,8 @@ extern int geode_get_dev_base(unsigned int dev); #define MSR_LBAR_ACPI 0x5140000E #define MSR_LBAR_PMS 0x5140000F +#define MSR_DIVIL_SOFT_RESET 0x51400017 + #define MSR_PIC_YSEL_LOW 0x51400020 #define MSR_PIC_YSEL_HIGH 0x51400021 #define MSR_PIC_ZSEL_LOW 0x51400022