4 files changed, 94 insertions, 5 deletions
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index a91381f0d6..806734c18b 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -686,13 +686,25 @@ unsigned int pci_scan_bridge(struct device *dev, unsigned int max)
 */
 static void pci_level_irq(unsigned char intNum)
 {
-	unsigned intBits = inb(0x4d0) | (((unsigned) inb(0x4d1)) << 8);
+	unsigned short intBits = inb(0x4d0) | (((unsigned) inb(0x4d1)) << 8);
 
+	printk_spew("%s: current ints are 0x%x\n", __FUNCTION__, intBits);
 	intBits |= (1 << intNum);
 
+	printk_spew("%s: try to set ints 0x%x\n", __FUNCTION__, intBits);
+
 	// Write new values
 	outb((unsigned char) intBits, 0x4d0);
 	outb((unsigned char) (intBits >> 8), 0x4d1);
+
+	if (inb(0x4d0) != (intBits & 0xf)) {
+	  printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
+		     __FUNCTION__, intBits &0xf, inb(0x4d0));
+	}
+	if (inb(0x4d1) != ((intBits >> 8) & 0xf)) {
+	  printk_err("%s: lower order bits are wrong: want 0x%x, got 0x%x\n",
+		     __FUNCTION__, (intBits>>8) &0xf, inb(0x4d1));
+	}
 }
 
 
diff --git a/src/mainboard/via/epia/auto.c b/src/mainboard/via/epia/auto.c
index c11f57297f..5e00564756 100644
--- a/src/mainboard/via/epia/auto.c
+++ b/src/mainboard/via/epia/auto.c
@@ -64,6 +64,20 @@ enable_mainboard_devices(void) {
   }
   pci_write_config8(dev, 0x50, 7);
   pci_write_config8(dev, 0x51, 0xff);
+#if 0
+  // This early setup switches IDE into compatibility mode before PCI gets 
+  // // a chance to assign I/Os
+  //         movl    $CONFIG_ADDR(0, 0x89, 0x42), %eax
+  //         //      movb    $0x09, %dl
+  //                 movb    $0x00, %dl
+  //                         PCI_WRITE_CONFIG_BYTE
+  //
+#endif
+  /* we do this here as in V2, we can not yet do raw operations 
+   * to pci!
+   */
+  dev++; /* ICKY */
+  pci_write_config8(dev, 0x42, 0);
 }
 
 static void
diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c
index 8f5d1730a6..8ad94f01a5 100644
--- a/src/northbridge/via/vt8601/northbridge.c
+++ b/src/northbridge/via/vt8601/northbridge.c
@@ -50,7 +50,54 @@ static void enumerate(struct chip *chip)
 	chip->dev->ops = &default_pci_ops_bus;
 }
 
+/*
+ * This fixup is based on capturing values from an Award bios.  Without
+ * this fixup the DMA write performance is awful (i.e. hdparm -t /dev/hda is 20x
+ * slower than normal, ethernet drops packets).
+ * Apparently these registers govern some sort of bus master behavior.
+ */
+static void
+random_fixup() {
+  device_t *pcidev = dev_find_slot(0, 0);
+
+  printk_spew("VT8601 random fixup ...\n");
+  if (pcidev) {
+    pci_write_config8(pcidev, 0x70, 0xc0);
+    pci_write_config8(pcidev, 0x71, 0x88);
+    pci_write_config8(pcidev, 0x72, 0xec);
+    pci_write_config8(pcidev, 0x73, 0x0c);
+    pci_write_config8(pcidev, 0x74, 0x0e);
+    pci_write_config8(pcidev, 0x75, 0x81);
+    pci_write_config8(pcidev, 0x76, 0x52);
+  }
+}
+
+static void 
+northbridge_init(struct chip *chip, enum chip_pass pass)
+{
+
+  struct northbridge_via_vt8601_config *conf = 
+    (struct northbridge_via_vt8601_config *)chip->chip_info;
+
+  switch (pass) {
+  case CONF_PASS_PRE_PCI:
+    break;
+
+  case CONF_PASS_POST_PCI:
+    break;
+
+  case CONF_PASS_PRE_BOOT:
+    random_fixup();
+    break;
+
+  default:
+    /* nothing yet */
+    break;
+  }
+}
+
 struct chip_control northbridge_via_vt8601_control = {
 	.enumerate = enumerate,
+	enable: northbridge_init,
 	.name   = "VIA vt8601 Northbridge",
 };
diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c
index e849be16ac..470ab5acf1 100644
--- a/src/southbridge/via/vt8231/vt8231.c
+++ b/src/southbridge/via/vt8231/vt8231.c
@@ -149,7 +149,7 @@ static void vt8231_pci_enable(struct southbridge_via_vt8231_config *conf) {
   /*
 	unsigned long busdevfn = 0x8000;
 	if (conf->enable_ide) {
-		printk_spew("%s: enabling IDE function\n", __FUNCTION__);
+		printk_debug("%s: enabling IDE function\n", __FUNCTION__);
 	}
   */
 }
@@ -203,6 +203,20 @@ static void pci_routing_fixup(void)
 }
 
 
+void
+dump_south(void){
+  device_t dev0;
+  dev0 = dev_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231, 0);
+  int i,j;
+
+  for(i = 0; i < 256; i += 16) {
+    printk_debug("0x%x: ", i);
+    for(j = 0; j < 16; j++) {
+      printk_debug("%02x ", pci_read_config8(dev0, i+j));
+    }
+    printk_debug("\n");
+  }
+}
 
 static void vt8231_init(struct southbridge_via_vt8231_config *conf)
 {
@@ -214,7 +228,7 @@ static void vt8231_init(struct southbridge_via_vt8231_config *conf)
   // to do: use the pcibios_find function here, instead of 
   // hard coding the devfn. 
   // done - kevinh/Ispiri
-  printk_spew("vt8231 init\n");
+  printk_debug("vt8231 init\n");
   /* Base 8231 controller */
   dev0 = dev_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231, 0);
   /* IDE controller */
@@ -303,7 +317,7 @@ static void vt8231_init(struct southbridge_via_vt8231_config *conf)
   // com2 to 3, com1 to 4
   pci_write_config8(dev0, 0x46, 0x04);
   pci_write_config8(dev0, 0x47, 0x03);
-
+  pci_write_config8(dev0, 0x6e, 0x98);
   //
   // Power management setup
   //
@@ -409,6 +423,8 @@ static void vt8231_init(struct southbridge_via_vt8231_config *conf)
   }
 
 
+  /* set up isa bus -- i/o recovery time, rom write enable, extend-ale */
+  pci_write_config8(dev0, 0x40, 0x54);
   ethernet_fixup();
 
   // Start the rtc
@@ -434,8 +450,8 @@ southbridge_init(struct chip *chip, enum chip_pass pass)
 
     break;
   case CONF_PASS_PRE_BOOT:
-    printk_err("FUCK! ROUTING FIXUP!\n");
     pci_routing_fixup();
+    dump_south();
     break;
 
   default: