* grub-core/kern/mips/loongson/init.c (grub_reboot): Reboot Fuloong.

	* include/grub/cs5536.h (GRUB_CS5536_MSR_DIVIL_RESET): New definition.

diff --git a/ChangeLog b/ChangeLog
index 2bff79544d8c58f2a29dab491a592cb99238d3dc..d8ad1d63455f231aafef4378c37be5f83e2940bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/mips/loongson/init.c (grub_reboot): Reboot Fuloong.
+       * include/grub/cs5536.h (GRUB_CS5536_MSR_DIVIL_RESET): New definition.
+
 2011-08-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/Makefile.core.def (kernel): Add video/radeon_fuloong2e.c on

diff --git a/grub-core/kern/mips/loongson/init.c b/grub-core/kern/mips/loongson/init.c
index 5a95d29ed36a8814aea495bec1090b7009d0b1e7..d1cac7a67b3d8b2f798df4d248973f8e5f01ce79 100644 (file)
--- a/grub-core/kern/mips/loongson/init.c
+++ b/grub-core/kern/mips/loongson/init.c
@@ -269,8 +269,27 @@ grub_exit (void)
 void
 grub_reboot (void)
 {
-  grub_write_ec (GRUB_MACHINE_EC_COMMAND_REBOOT);
-
+  switch (grub_arch_machine)
+    {
+    case GRUB_ARCH_MACHINE_FULOONG2E:
+      grub_outb (grub_inb (0xbfe00104) & ~4, 0xbfe00104);
+      grub_outb (grub_inb (0xbfe00104) | 4, 0xbfe00104);
+      break;
+    case GRUB_ARCH_MACHINE_FULOONG2F:
+      {
+       grub_pci_device_t dev;
+       if (!grub_cs5536_find (&dev))
+         break;
+       grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_RESET,
+                              grub_cs5536_read_msr (dev,
+                                                    GRUB_CS5536_MSR_DIVIL_RESET) 
+                              | 1);
+       break;
+      }
+    case GRUB_ARCH_MACHINE_YEELOONG:
+      grub_write_ec (GRUB_MACHINE_EC_COMMAND_REBOOT);
+      break;
+    }
   grub_millisleep (1500);
 
   grub_printf ("Reboot failed\n");

diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index 103b306336b925b54f1bbc3fed92b023c8852d50..fcacb23e888ed826fbd06b35a9b349c9890feea1 100644 (file)
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -77,6 +77,7 @@
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP     0x04000000
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1  0x00070000
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3  0x00500000
+#define GRUB_CS5536_MSR_DIVIL_RESET 0x80000017
 #define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK 0x80000024
 #define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK 0x80000025
 #define GRUB_CS5536_DIVIL_LPC_INTERRUPTS 0x1002