Move geode init to bus/cs5536.c

diff --git a/bus/cs5536.c b/bus/cs5536.c
index f481397b726c9353bda7ad86ffa4e87e513bbb5a..088f4dfc1d52cf6da4e46a0c7ffd2a9661e29848 100644 (file)
--- a/bus/cs5536.c
+++ b/bus/cs5536.c
@@ -20,6 +20,7 @@
 #include <grub/cs5536.h>
 #include <grub/pci.h>
 #include <grub/time.h>
+#include <grub/ata.h>
 
 int
 grub_cs5536_find (grub_pci_device_t *devp)
@@ -211,3 +212,169 @@ grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
     }
   return GRUB_ERR_NONE;
 }
+
+/* Dump of GPIO connections. FIXME: Remove useless and macroify.  */
+static grub_uint32_t gpiodump[] = {
+  0xffff0000, 0x2ffdd002, 0xffff0000, 0xffff0000,
+  0x2fffd000, 0xffff0000, 0x1000efff, 0xefff1000,
+  0x3ffbc004, 0xffff0000, 0xffff0000, 0xffff0000,
+  0x3ffbc004, 0x3ffbc004, 0xffff0000, 0x00000000,
+  0xffff0000, 0xffff0000, 0x3ffbc004, 0x3f9bc064,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
+  0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000,
+  0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000,
+  0xefff1000, 0xefff1000, 0xffff0000, 0x00000000,
+  0xffff0000, 0xffff0000, 0xefff1000, 0xffff0000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  0x00000000, 0x50000000, 0x00000000, 0x00000000,
+};
+
+static inline void
+set_io_space (grub_pci_device_t dev, int num, grub_uint16_t start,
+             grub_uint16_t len)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_REGIONS_START + num,
+                        ((((grub_uint64_t) start + len - 4)
+                          << GRUB_CS5536_MSR_GL_REGION_IO_TOP_SHIFT)
+                         & GRUB_CS5536_MSR_GL_REGION_TOP_MASK)
+                        | (((grub_uint64_t) start
+                            << GRUB_CS5536_MSR_GL_REGION_IO_BASE_SHIFT)
+                         & GRUB_CS5536_MSR_GL_REGION_BASE_MASK)
+                        | GRUB_CS5536_MSR_GL_REGION_IO
+                        | GRUB_CS5536_MSR_GL_REGION_ENABLE);
+}
+
+static inline void
+set_iod (grub_pci_device_t dev, int num, int dest, int start, int mask)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_IOD_START + num,
+                        ((grub_uint64_t) dest << GRUB_CS5536_IOD_DEST_SHIFT)
+                        | (((grub_uint64_t) start & GRUB_CS5536_IOD_ADDR_MASK)
+                           << GRUB_CS5536_IOD_BASE_SHIFT)
+                        | ((mask & GRUB_CS5536_IOD_ADDR_MASK)
+                           << GRUB_CS5536_IOD_MASK_SHIFT));
+}
+
+static inline void
+set_p2d (grub_pci_device_t dev, int num, int dest, grub_uint32_t start)
+{
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_P2D_START + num,
+                        (((grub_uint64_t) dest) << GRUB_CS5536_P2D_DEST_SHIFT)
+                        | ((grub_uint64_t) (start >> GRUB_CS5536_P2D_LOG_ALIGN)
+                           << GRUB_CS5536_P2D_BASE_SHIFT)
+                        | (((1 << (32 - GRUB_CS5536_P2D_LOG_ALIGN)) - 1)
+                           << GRUB_CS5536_P2D_MASK_SHIFT));
+}
+
+void
+grub_cs5536_init_geode (grub_pci_device_t dev)
+{
+  int i;
+
+  /* Make sure GPIO is where we expect it to be.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GPIO_BAR,
+                        GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_GPIO);
+
+  /* Setup GPIO.  */
+  for (i = 0; i < (int) ARRAY_SIZE (gpiodump); i++)
+    ((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_IO_BASE 
+                                + GRUB_CS5536_LBAR_GPIO)) [i] = gpiodump[i];
+
+  /* Enable more BARs.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IRQ_MAP_BAR,
+                        GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_IRQ_MAP);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_MFGPT_BAR,
+                        GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_MFGPT);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_ACPI_BAR,
+                        GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_ACPI);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_PM_BAR,
+                        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);
+  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,
+                        GRUB_CS5536_DIVIL_LPC_INTERRUPTS);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL,
+                        GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE);
+
+  /* Initialise USB controller.  */
+  /* FIXME: assign adresses dynamically.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, 
+                        GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+                        | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+                        | 0x05024000);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE,
+                        GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+                        | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
+                        | (0x20ULL << GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT)
+                        | 0x05023000);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_CONTROLLER_BASE,
+                        GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
+                        | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE | 0x05020000);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE,
+                        GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE | 0x05022000);
+  set_p2d (dev, 0, GRUB_CS5536_DESTINATION_USB, 0x05020000);
+  set_p2d (dev, 1, GRUB_CS5536_DESTINATION_USB, 0x05022000);
+  set_p2d (dev, 5, GRUB_CS5536_DESTINATION_USB, 0x05024000);
+  set_p2d (dev, 6, GRUB_CS5536_DESTINATION_USB, 0x05023000);
+
+  {
+    volatile grub_uint32_t *oc;
+    oc = grub_pci_device_map_range (dev, 0x05022000,
+                                   GRUB_CS5536_USB_OPTION_REGS_SIZE);
+
+    oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX] =
+      (oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX]
+       & ~GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_MASK)
+      | GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_HC;
+    grub_pci_device_unmap_range (dev, oc, GRUB_CS5536_USB_OPTION_REGS_SIZE);
+  }
+
+  /* Setup IDE controller.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_IO_BAR,
+                        GRUB_CS5536_LBAR_IDE
+                        | GRUB_CS5536_MSR_IDE_IO_BAR_UNITS);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CFG,
+                        GRUB_CS5536_MSR_IDE_CFG_CHANNEL_ENABLE);
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_TIMING,
+                        (GRUB_CS5536_MSR_IDE_TIMING_PIO0
+                         << GRUB_CS5536_MSR_IDE_TIMING_DRIVE0_SHIFT)
+                        | (GRUB_CS5536_MSR_IDE_TIMING_PIO0
+                           << GRUB_CS5536_MSR_IDE_TIMING_DRIVE1_SHIFT));
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CAS_TIMING,
+                        (GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_PIO0
+                         << GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_SHIFT)
+                        | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
+                           << GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE0_SHIFT)
+                        | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
+                           << GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE1_SHIFT));
+
+  /* Setup Geodelink PCI.  */
+  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_PCI_CTRL,
+                        (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_OUT_THR_SHIFT)
+                        | (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_IN_THR_SHIFT)
+                        | (8ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_LATENCY_SHIFT)
+                        | GRUB_CS5536_MSR_GL_PCI_CTRL_IO_ENABLE
+                        | GRUB_CS5536_MSR_GL_PCI_CTRL_MEMORY_ENABLE);
+
+  /* Setup windows.  */
+  set_io_space (dev, 0, GRUB_CS5536_LBAR_SMBUS, GRUB_CS5536_SMBUS_REGS_SIZE);
+  set_io_space (dev, 1, GRUB_CS5536_LBAR_GPIO, GRUB_CS5536_GPIO_REGS_SIZE);
+  set_io_space (dev, 2, GRUB_CS5536_LBAR_MFGPT, GRUB_CS5536_MFGPT_REGS_SIZE);
+  set_io_space (dev, 3, GRUB_CS5536_LBAR_IRQ_MAP, GRUB_CS5536_IRQ_MAP_REGS_SIZE);
+  set_io_space (dev, 4, GRUB_CS5536_LBAR_PM, GRUB_CS5536_PM_REGS_SIZE);
+  set_io_space (dev, 5, GRUB_CS5536_LBAR_ACPI, GRUB_CS5536_ACPI_REGS_SIZE);
+  set_iod (dev, 0, GRUB_CS5536_DESTINATION_IDE, GRUB_ATA_CH0_PORT1, 0xffff8);
+  set_iod (dev, 1, GRUB_CS5536_DESTINATION_ACC, GRUB_CS5536_LBAR_ACC, 0xfff80);
+  set_iod (dev, 2, GRUB_CS5536_DESTINATION_IDE, GRUB_CS5536_LBAR_IDE, 0xffff0);
+}

diff --git a/include/grub/cs5536.h b/include/grub/cs5536.h
index a16fb7a09da9bf8963563996c551220dfd73b362..cd17e11fcbb2d0b31a6dcfbaaa08d47434397b7a 100644 (file)
--- a/include/grub/cs5536.h
+++ b/include/grub/cs5536.h
@@ -183,6 +183,8 @@ grub_err_t grub_cs5536_smbus_wait (grub_port_t smbbase);
 grub_err_t EXPORT_FUNC (grub_cs5536_init_smbus) (grub_pci_device_t dev,
                                                 grub_uint16_t divisor,
                                                 grub_port_t *smbbase);
+
+void grub_cs5536_init_geode (grub_pci_device_t dev);
 #endif
 
 #endif

diff --git a/kern/mips/yeeloong/init.c b/kern/mips/yeeloong/init.c
index 5c3340f39bd6519cbb4b688e131745a5ddaa0271..fa02df60169e1da07fa5dcd4756eb6dff08c6747 100644 (file)
--- a/kern/mips/yeeloong/init.c
+++ b/kern/mips/yeeloong/init.c
@@ -31,7 +31,6 @@
 #include <grub/cs5536.h>
 #include <grub/term.h>
 #include <grub/machine/ec.h>
-#include <grub/ata.h>
 
 extern void grub_video_sm712_init (void);
 extern void grub_video_init (void);
@@ -68,63 +67,6 @@ grub_machine_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
   return GRUB_ERR_NONE;
 }
 
-/* Dump of GPIO connections. FIXME: Remove useless and macroify.  */
-static grub_uint32_t gpiodump[] = {
-  0xffff0000, 0x2ffdd002, 0xffff0000, 0xffff0000,
-  0x2fffd000, 0xffff0000, 0x1000efff, 0xefff1000,
-  0x3ffbc004, 0xffff0000, 0xffff0000, 0xffff0000,
-  0x3ffbc004, 0x3ffbc004, 0xffff0000, 0x00000000,
-  0xffff0000, 0xffff0000, 0x3ffbc004, 0x3f9bc064,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0xffff0000, 0xffff0000, 0xffff0000, 0xffff0000,
-  0xffff0000, 0xffff0000, 0x0000ffff, 0xffff0000,
-  0xefff1000, 0xffff0000, 0xffff0000, 0xffff0000,
-  0xefff1000, 0xefff1000, 0xffff0000, 0x00000000,
-  0xffff0000, 0xffff0000, 0xefff1000, 0xffff0000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  0x00000000, 0x50000000, 0x00000000, 0x00000000,
-};
-
-static inline void
-set_io_space (grub_pci_device_t dev, int num, grub_uint16_t start,
-             grub_uint16_t len)
-{
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_REGIONS_START + num,
-                        ((((grub_uint64_t) start + len - 4)
-                          << GRUB_CS5536_MSR_GL_REGION_IO_TOP_SHIFT)
-                         & GRUB_CS5536_MSR_GL_REGION_TOP_MASK)
-                        | (((grub_uint64_t) start
-                            << GRUB_CS5536_MSR_GL_REGION_IO_BASE_SHIFT)
-                         & GRUB_CS5536_MSR_GL_REGION_BASE_MASK)
-                        | GRUB_CS5536_MSR_GL_REGION_IO
-                        | GRUB_CS5536_MSR_GL_REGION_ENABLE);
-}
-
-static inline void
-set_iod (grub_pci_device_t dev, int num, int dest, int start, int mask)
-{
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_IOD_START + num,
-                        ((grub_uint64_t) dest << GRUB_CS5536_IOD_DEST_SHIFT)
-                        | (((grub_uint64_t) start & GRUB_CS5536_IOD_ADDR_MASK)
-                           << GRUB_CS5536_IOD_BASE_SHIFT)
-                        | ((mask & GRUB_CS5536_IOD_ADDR_MASK)
-                           << GRUB_CS5536_IOD_MASK_SHIFT));
-}
-
-static inline void
-set_p2d (grub_pci_device_t dev, int num, int dest, grub_uint32_t start)
-{
-  grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_P2D_START + num,
-                        (((grub_uint64_t) dest) << GRUB_CS5536_P2D_DEST_SHIFT)
-                        | ((grub_uint64_t) (start >> GRUB_CS5536_P2D_LOG_ALIGN)
-                           << GRUB_CS5536_P2D_BASE_SHIFT)
-                        | (((1 << (32 - GRUB_CS5536_P2D_LOG_ALIGN)) - 1)
-                           << GRUB_CS5536_P2D_MASK_SHIFT));
-}
-
 void
 grub_machine_init (void)
 {
@@ -180,121 +122,7 @@ grub_machine_init (void)
          grub_arch_highmemsize = 0;
        }
 
-      /* Make sure GPIO is where we expect it to be.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GPIO_BAR,
-                            GRUB_CS5536_LBAR_TURN_ON 
-                            | GRUB_CS5536_LBAR_GPIO);
-
-      /* Setup GPIO.  */
-      for (i = 0; i < (int) ARRAY_SIZE (gpiodump); i++)
-       ((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_IO_BASE 
-                                    + GRUB_CS5536_LBAR_GPIO)) [i]
-         = gpiodump[i];
-
-      /* Enable more BARs.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IRQ_MAP_BAR,
-                            GRUB_CS5536_LBAR_TURN_ON 
-                            | GRUB_CS5536_LBAR_IRQ_MAP);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_MFGPT_BAR,
-                            GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_MFGPT);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_ACPI_BAR,
-                            GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_ACPI);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_PM_BAR,
-                            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);
-      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,
-                            GRUB_CS5536_DIVIL_LPC_INTERRUPTS);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL,
-                            GRUB_CS5536_MSR_DIVIL_LPC_SERIAL_IRQ_CONTROL_ENABLE);
-
-      /* Initialise USB controller.  */
-      /* FIXME: assign adresses dynamically.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, 
-                            GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
-                            | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-                            | 0x05024000);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_EHCI_BASE,
-                            GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
-                            | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-                            | (0x20ULL 
-                               << GRUB_CS5536_MSR_USB_EHCI_BASE_FLDJ_SHIFT)
-                            | 0x05023000);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_CONTROLLER_BASE,
-                            GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
-                            | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-                            | 0x05020000);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OPTION_CONTROLLER_BASE,
-                            GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
-                            | 0x05022000);
-      set_p2d (dev, 0, GRUB_CS5536_DESTINATION_USB, 0x05020000);
-      set_p2d (dev, 1, GRUB_CS5536_DESTINATION_USB, 0x05022000);
-      set_p2d (dev, 5, GRUB_CS5536_DESTINATION_USB, 0x05024000);
-      set_p2d (dev, 6, GRUB_CS5536_DESTINATION_USB, 0x05023000);
-
-      {
-       volatile grub_uint32_t *oc;
-       oc = grub_pci_device_map_range (dev, 0x05022000,
-                                       GRUB_CS5536_USB_OPTION_REGS_SIZE);
-
-       oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX] =
-         (oc[GRUB_CS5536_USB_OPTION_REG_UOCMUX]
-          & ~GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_MASK)
-         | GRUB_CS5536_USB_OPTION_REG_UOCMUX_PMUX_HC;
-       grub_pci_device_unmap_range (dev, oc, GRUB_CS5536_USB_OPTION_REGS_SIZE);
-      }
-
-
-      /* Setup IDE controller.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_IO_BAR,
-                            GRUB_CS5536_LBAR_IDE
-                            | GRUB_CS5536_MSR_IDE_IO_BAR_UNITS);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CFG,
-                            GRUB_CS5536_MSR_IDE_CFG_CHANNEL_ENABLE);
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_TIMING,
-                            (GRUB_CS5536_MSR_IDE_TIMING_PIO0
-                             << GRUB_CS5536_MSR_IDE_TIMING_DRIVE0_SHIFT)
-                            | (GRUB_CS5536_MSR_IDE_TIMING_PIO0
-                               << GRUB_CS5536_MSR_IDE_TIMING_DRIVE1_SHIFT));
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_IDE_CAS_TIMING,
-                            (GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_PIO0
-                             << GRUB_CS5536_MSR_IDE_CAS_TIMING_CMD_SHIFT)
-                            | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
-                               << GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE0_SHIFT)
-                            | (GRUB_CS5536_MSR_IDE_CAS_TIMING_PIO0
-                               << GRUB_CS5536_MSR_IDE_CAS_TIMING_DRIVE1_SHIFT));
-
-      /* Setup Geodelink PCI.  */
-      grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_GL_PCI_CTRL,
-                            (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_OUT_THR_SHIFT)
-                            | (4ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_IN_THR_SHIFT)
-                            | (8ULL << GRUB_CS5536_MSR_GL_PCI_CTRL_LATENCY_SHIFT)
-                            | GRUB_CS5536_MSR_GL_PCI_CTRL_IO_ENABLE
-                            | GRUB_CS5536_MSR_GL_PCI_CTRL_MEMORY_ENABLE);
-
-      /* Setup windows.  */
-      set_io_space (dev, 0, GRUB_CS5536_LBAR_SMBUS,
-                   GRUB_CS5536_SMBUS_REGS_SIZE);
-      set_io_space (dev, 1, GRUB_CS5536_LBAR_GPIO, GRUB_CS5536_GPIO_REGS_SIZE);
-      set_io_space (dev, 2, GRUB_CS5536_LBAR_MFGPT,
-                   GRUB_CS5536_MFGPT_REGS_SIZE);
-      set_io_space (dev, 3, GRUB_CS5536_LBAR_IRQ_MAP,
-                   GRUB_CS5536_IRQ_MAP_REGS_SIZE);
-      set_io_space (dev, 4, GRUB_CS5536_LBAR_PM, GRUB_CS5536_PM_REGS_SIZE);
-      set_io_space (dev, 5, GRUB_CS5536_LBAR_ACPI, GRUB_CS5536_ACPI_REGS_SIZE);
-      set_iod (dev, 0, GRUB_CS5536_DESTINATION_IDE, GRUB_ATA_CH0_PORT1,
-              0xffff8);
-      set_iod (dev, 1, GRUB_CS5536_DESTINATION_ACC, GRUB_CS5536_LBAR_ACC,
-              0xfff80);
-      set_iod (dev, 2, GRUB_CS5536_DESTINATION_IDE, GRUB_CS5536_LBAR_IDE,
-              0xffff0);
+      grub_cs5536_init_geode (dev);
 
       /* Setup PCI controller.  */
       *((volatile grub_uint32_t *) (GRUB_MACHINE_PCI_CONTROLLER_HEADER