Skip to content

Commit

Permalink
GEODE: use symbolic constant in cs5536 reboot fixup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andres Salomon authored and Thomas Gleixner committed Oct 19, 2007
1 parent 54ffaa4 commit 0387f45
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 3 additions & 5 deletions arch/x86/kernel/reboot_fixups_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/interrupt.h>
#include <asm/reboot_fixups.h>
#include <asm/msr.h>
#include <asm/geode.h>

static void cs5530a_warm_reset(struct pci_dev *dev)
{
Expand All @@ -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 */
}

Expand Down
2 changes: 2 additions & 0 deletions include/asm-x86/geode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0387f45

Please sign in to comment.