GEODE: use symbolic constant in cs5536 reboot fixup
PATCH 1/1 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 <[email protected]>
arch/x86/kernel/reboot_fixups_32.c +3 -5
@@ -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) {
@@ -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 */ }
include/asm-x86/geode.h +2 -0
@@ -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
Quoted 4 lines · Andres Salomon
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 <[email protected]>
Acked-by Jordan Crouse <[email protected]>
Quoted 41 lines
arch/x86/kernel/reboot_fixups_32.c +3
-5@@ -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) {@@ -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 */ }include/asm-x86/geode.h +2
-0@@ -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
Signature · 3 lines
Jordan Crouse Systems Software Development Engineer Advanced Micro Devices, Inc.