: Add the RDC machine specific reboot fixup
PATCH RESEND 4/4 : Add the RDC machine specific reboot fixup
The RDC R-321x SoC needs a reboot fixup which
uses its internal hardware watchdog set to
reset the CPU on next tick.
Signed-off-by Florian Fainelli <[email protected]>
--- arch/x86/kernel/reboot_fixups_32.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
---
arch/x86/kernel/reboot_fixups_32.c +14 -0
@@ -32,6 +32,19 @@ static void cs5536_warm_reset(struct pci_dev *dev)udelay (50 );/* shouldn't get here but be safe and spin a while */ } +static void rdc321x_reset (struct pci_dev *dev) +{ +unsigned i; +/* Voluntary reset the watchdog timer */ +outl (0x80003840 ,0xCF8 ); +/* Generate a CPU reset on next tick */ + i =inl (0xCFC ); +/* Use the minimum timer resolution */ + i |=0x1600 ; +outl (i,0xCFC ); +outb (1 ,0x92 ); +} +struct device_fixup {unsigned int vendor;unsigned int device;
@@ -41,6 +54,7 @@ struct device_fixup {static struct device_fixup fixups_table[] = { {PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5530_LEGACY , cs5530a_warm_reset }, {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_CS5536_ISA , cs5536_warm_reset }, +{PCI_VENDOR_ID_RDC ,PCI_DEVICE_ID_RDC_R6030 , rdc321x_reset }, };/*
arch/x86/kernel/reboot_fixups_32.c +14 -0
@@ -32,6 +32,19 @@ static void cs5536_warm_reset(struct pci_dev *dev)udelay (50 );/* shouldn't get here but be safe and spin a while */ } +static void rdc321x_reset (struct pci_dev *dev) +{ +unsigned i; +/* Voluntary reset the watchdog timer */ +outl (0x80003840 ,0xCF8 ); +/* Generate a CPU reset on next tick */ + i =inl (0xCFC ); +/* Use the minimum timer resolution */ + i |=0x1600 ; +outl (i,0xCFC ); +outb (1 ,0x92 ); +} +struct device_fixup {unsigned int vendor;unsigned int device;
@@ -41,6 +54,7 @@ struct device_fixup {static struct device_fixup fixups_table[] = { {PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5530_LEGACY , cs5530a_warm_reset }, {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_CS5536_ISA , cs5536_warm_reset }, +{PCI_VENDOR_ID_RDC ,PCI_DEVICE_ID_RDC_R6030 , rdc321x_reset }, };/*
This one also had the attachment, sorry for the noise.
The RDC R-321x SoC needs a reboot fixup which
uses its internal hardware watchdog set to
reset the CPU on next tick.
Signed-off-by Florian Fainelli <[email protected]>
---
arch/x86/kernel/reboot_fixups_32.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
---
arch/x86/kernel/reboot_fixups_32.c +14 -0
@@ -32,6 +32,19 @@ static void cs5536_warm_reset(struct pci_dev *dev)udelay (50 );/* shouldn't get here but be safe and spin a while */ } +static void rdc321x_reset (struct pci_dev *dev) +{ +unsigned i; +/* Voluntary reset the watchdog timer */ +outl (0x80003840 ,0xCF8 ); +/* Generate a CPU reset on next tick */ + i =inl (0xCFC ); +/* Use the minimum timer resolution */ + i |=0x1600 ; +outl (i,0xCFC ); +outb (1 ,0x92 ); +} +struct device_fixup {unsigned int vendor;unsigned int device;
@@ -41,6 +54,7 @@ struct device_fixup {static struct device_fixup fixups_table[] = { {PCI_VENDOR_ID_CYRIX ,PCI_DEVICE_ID_CYRIX_5530_LEGACY , cs5530a_warm_reset }, {PCI_VENDOR_ID_AMD ,PCI_DEVICE_ID_AMD_CS5536_ISA , cs5536_warm_reset }, +{PCI_VENDOR_ID_RDC ,PCI_DEVICE_ID_RDC_R6030 , rdc321x_reset }, };/*