Apply fix for "pr82261 DMA-support on Sparc64 broken"

The Acer chip or wiring that SUN uses has problems that this patch
tries to work around.
Original patch by Marius Strobl, hacked into shape by me..

2 files changed, 42 insertions, 5 deletions

diff --git a/sys/dev/ata/ata-chipset.c b/sys/dev/ata/ata-chipset.c
index 5792917..a8d3d44 100644
--- a/sys/dev/ata/ata-chipset.c
+++ b/sys/dev/ata/ata-chipset.c
@@ -75,6 +75,7 @@ static void ata_acard_86X_setmode(device_t dev, int mode);
 static int ata_ali_chipinit(device_t dev);
 static int ata_ali_allocate(device_t dev);
 static int ata_ali_sata_allocate(device_t dev);
+static void ata_ali_reset(device_t dev);
 static void ata_ali_setmode(device_t dev, int mode);
 static int ata_amd_chipinit(device_t dev);
 static int ata_cyrix_chipinit(device_t dev);
@@ -878,26 +879,28 @@ ata_ali_chipinit(device_t dev)
 	break;
 
     case ALINEW:
-	/* deactivate the ATAPI FIFO and enable ATAPI UDMA */
-	pci_write_config(dev, 0x53,
-			 pci_read_config(dev, 0x53, 1) | 0x01, 1);
+	/* use device interrupt as byte count end */
+	pci_write_config(dev, 0x4a, pci_read_config(dev, 0x4a, 1) | 0x20, 1);
 
 	/* enable cable detection and UDMA support on newer chips */
 	pci_write_config(dev, 0x4b, pci_read_config(dev, 0x4b, 1) | 0x09, 1);
 
+	/* enable ATAPI UDMA mode */
+	pci_write_config(dev, 0x53, pci_read_config(dev, 0x53, 1) | 0x01, 1);
+
 	/* only chips with revision > 0xc4 can do 48bit DMA */
 	if (ctlr->chip->chiprev <= 0xc4)
 	    device_printf(dev,
 			  "using PIO transfers above 137GB as workaround for "
 			  "48bit DMA access bug, expect reduced performance\n");
+	ctlr->reset = ata_ali_reset;
 	ctlr->allocate = ata_ali_allocate;
 	ctlr->setmode = ata_ali_setmode;
 	break;
 
     case ALIOLD:
 	/* deactivate the ATAPI FIFO and enable ATAPI UDMA */
-	pci_write_config(dev, 0x53,
-			 (pci_read_config(dev, 0x53, 1) & ~0x02) | 0x03, 1);
+	pci_write_config(dev, 0x53, pci_read_config(dev, 0x53, 1) | 0x03, 1);
 	ctlr->setmode = ata_ali_setmode;
 	break;
     }
@@ -963,6 +966,39 @@ ata_ali_sata_allocate(device_t dev)
 }
 
 static void
+ata_ali_reset(device_t dev)
+{
+    struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev));
+    struct ata_channel *ch = device_get_softc(dev);
+    device_t *children;
+    int nchildren, i;
+
+    ata_generic_reset(dev);
+
+    /*
+     * workaround for datacorruption bug found on at least SUN Blade-100
+     * find the ISA function on the southbridge and disable then enable
+     * the ATA channel tristate buffer
+     */
+    if (ctlr->chip->chiprev == 0xc3 || ctlr->chip->chiprev == 0xc2) {
+	if (!device_get_children(GRANDPARENT(dev), &children, &nchildren)) {
+	    for (i = 0; i < nchildren; i++) {
+		if (pci_get_devid(children[i]) == ATA_ALI_1533) {
+		    pci_write_config(children[i], 0x58, 
+				     pci_read_config(children[i], 0x58, 1) &
+				     ~(0x04 << ch->unit), 1);
+		    pci_write_config(children[i], 0x58, 
+				     pci_read_config(children[i], 0x58, 1) |
+				     (0x04 << ch->unit), 1);
+		    break;
+		}
+	    }
+	    free(children, M_TEMP);
+	}
+    }
+}
+
+static void
 ata_ali_setmode(device_t dev, int mode)
 {
     device_t gparent = GRANDPARENT(dev);
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index 8d29a0e..33ccb26 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -90,6 +90,7 @@ struct ata_connect_task {
 #define ATA_AMD8111             0x74691022
 
 #define ATA_ACER_LABS_ID        0x10b9
+#define ATA_ALI_1533		0x153310b9
 #define ATA_ALI_5229            0x522910b9
 #define ATA_ALI_5281            0x528110b9
 #define ATA_ALI_5287            0x528710b9