mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

GEODE: use symbolic constant in cs5536 reboot fixup 

Simple cosmetic update for the cs5536 reboot fixup; define the MSR that's used
for rebooting in geode.h, and use the define.

Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Andres Salomon 2007-10-18 15:26:51 -04:00 committed by Thomas Gleixner
parent 54ffaa45c5
commit 0387f4511e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/reboot_fixups_32.c
View File

@ -12,6 +12,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/reboot_fixups.h> #include <asm/reboot_fixups.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/geode.h>
static void cs5530a_warm_reset(struct pci_dev *dev) 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) static void cs5536_warm_reset(struct pci_dev *dev)
{ {
/* /* writing 1 to the LSB of this MSR causes a hard reset */
* 6.6.2.12 Soft Reset (DIVIL_SOFT_RESET) wrmsrl(MSR_DIVIL_SOFT_RESET, 1ULL);
* writing 1 to the LSB of this MSR causes a hard reset.
*/
wrmsrl(0x51400017, 1ULL);
udelay(50); /* shouldn't get here but be safe and spin a while */ udelay(50); /* shouldn't get here but be safe and spin a while */
} }

2
include/asm-x86/geode.h
View File

@ -38,6 +38,8 @@ extern int geode_get_dev_base(unsigned int dev);
#define MSR_LBAR_ACPI 0x5140000E #define MSR_LBAR_ACPI 0x5140000E
#define MSR_LBAR_PMS 0x5140000F #define MSR_LBAR_PMS 0x5140000F
#define MSR_DIVIL_SOFT_RESET 0x51400017
#define MSR_PIC_YSEL_LOW 0x51400020 #define MSR_PIC_YSEL_LOW 0x51400020
#define MSR_PIC_YSEL_HIGH 0x51400021 #define MSR_PIC_YSEL_HIGH 0x51400021
#define MSR_PIC_ZSEL_LOW 0x51400022 #define MSR_PIC_ZSEL_LOW 0x51400022