svn commit: r204653 - in stable/8/sys/dev/ata: . chipsets

[Alexander Motin]

Author: mav
Date: Wed Mar  3 19:14:05 2010
New Revision: 204653
URL: http://svn.freebsd.org/changeset/base/204653

Log:
  MFC r204509:
  - Add ALI M5228 PATA ID.
  - Add missed DMA initialization for ALI SATA chips.

Modified:
  stable/8/sys/dev/ata/ata-pci.h
  stable/8/sys/dev/ata/chipsets/ata-acerlabs.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/8/sys/dev/ata/ata-pci.h	Wed Mar  3 19:12:53 2010	(r204652)
+++ stable/8/sys/dev/ata/ata-pci.h	Wed Mar  3 19:14:05 2010	(r204653)
@@ -84,6 +84,7 @@ struct ata_pci_controller {
 
 #define ATA_ACER_LABS_ID        0x10b9
 #define ATA_ALI_1533            0x153310b9
+#define ATA_ALI_5228            0x522810b9
 #define ATA_ALI_5229            0x522910b9
 #define ATA_ALI_5281            0x528110b9
 #define ATA_ALI_5287            0x528710b9

Modified: stable/8/sys/dev/ata/chipsets/ata-acerlabs.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Wed Mar  3 19:12:53 2010	(r204652)
+++ stable/8/sys/dev/ata/chipsets/ata-acerlabs.c	Wed Mar  3 19:14:05 2010	(r204653)
@@ -79,6 +79,7 @@ ata_ali_probe(device_t dev)
      { ATA_ALI_5288, 0x00, 4, ALI_SATA, ATA_SA300, "M5288" },
      { ATA_ALI_5287, 0x00, 4, ALI_SATA, ATA_SA150, "M5287" },
      { ATA_ALI_5281, 0x00, 2, ALI_SATA, ATA_SA150, "M5281" },
+     { ATA_ALI_5228, 0xc5, 0, ALI_NEW,  ATA_UDMA6, "M5228" },
      { ATA_ALI_5229, 0xc5, 0, ALI_NEW,  ATA_UDMA6, "M5229" },
      { ATA_ALI_5229, 0xc4, 0, ALI_NEW,  ATA_UDMA5, "M5229" },
      { ATA_ALI_5229, 0xc2, 0, ALI_NEW,  ATA_UDMA4, "M5229" },
@@ -208,7 +209,7 @@ ata_ali_sata_ch_attach(device_t dev)
 	    io = res->bars[0];
 	    ctlio = res->bars[1];
     }
-		
+    ata_pci_dmainit(dev);
     for (i = ATA_DATA; i <= ATA_COMMAND; i ++) {
 	ch->r_io[i].res = io;
 	ch->r_io[i].offset = i + (unit10 ? 8 : 0);