From 88906eaa69c3f117ef7416b225c33f6bdaf7a2c4 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 24 Jan 2011 01:46:00 +0100
Subject: [PATCH] Fix accidental disable of Geode UARTs

---
 grub-core/boot/mips/yeeloong/fwstart.S |  7 ++++++-
 grub-core/bus/cs5536.c                 | 25 ++++++++++++++++++++-----
 include/grub/cs5536.h                  |  2 ++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/grub-core/boot/mips/yeeloong/fwstart.S b/grub-core/boot/mips/yeeloong/fwstart.S
index 995aa5071..d25ff1a5b 100644
--- a/grub-core/boot/mips/yeeloong/fwstart.S
+++ b/grub-core/boot/mips/yeeloong/fwstart.S
@@ -254,7 +254,12 @@ serial_hw_init:
 #ifdef FULOONG
 	lui $a0, %hi(GRUB_CS5536_MSR_DIVIL_LEG_IO)
 	addiu $a0, $a0, %lo(GRUB_CS5536_MSR_DIVIL_LEG_IO)
-	li $a1, 0x04570003
+	li $a1, (GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3    \
+	         | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP	    \
+	         | GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86    \
+	         | GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1  \
+	         | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0 \
+		 | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1)
 	bal wrmsr
 	 move $a2, $zero
 
diff --git a/grub-core/bus/cs5536.c b/grub-core/bus/cs5536.c
index 690b8f29a..f5b2089e3 100644
--- a/grub-core/bus/cs5536.c
+++ b/grub-core/bus/cs5536.c
@@ -21,6 +21,7 @@
 #include <grub/pci.h>
 #include <grub/time.h>
 #include <grub/ata.h>
+#include <grub/machine/kernel.h>
 
 int
 grub_cs5536_find (grub_pci_device_t *devp)
@@ -264,11 +265,25 @@ grub_cs5536_init_geode (grub_pci_device_t dev)
 			 GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
 
   /* Setup DIVIL.  */
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
-			 GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
-			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
-			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
-			 | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+  switch (grub_arch_machine)
+    {
+    case GRUB_ARCH_MACHINE_YEELOONG:
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
+			     GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+      break;
+    case GRUB_ARCH_MACHINE_FULOONG:
+      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LEG_IO,
+			     GRUB_CS5536_MSR_DIVIL_LEG_IO_UART2_COM3
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_UART1_COM1
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_F_REMAP
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE0
+			     | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
+      break;
+    }
   grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK,
 			 (~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff);
   grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK,
diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index 90a39df44..103b30633 100644
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -75,6 +75,8 @@
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1 0x00000002
 #define GRUB_CS5536_MSR_DIVIL_LEG_IO_MODE_X86    0x10000000
 #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_IRQ_MAPPER_PRIMARY_MASK 0x80000024
 #define GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK 0x80000025
 #define GRUB_CS5536_DIVIL_LPC_INTERRUPTS 0x1002