svn commit: r215772 - in stable/8: share/man/man4 sys/dev/ata sys/dev/ata/chipsets

[Alexander Motin]

Author: mav
Date: Tue Nov 23 21:29:40 2010
New Revision: 215772
URL: http://svn.freebsd.org/changeset/base/215772

Log:
  MFC r215428, r215431, r215462:
  Add support for VIA VX900 chipset SATA controller.

Modified:
  stable/8/share/man/man4/ata.4
  stable/8/sys/dev/ata/ata-pci.h
  stable/8/sys/dev/ata/chipsets/ata-via.c
Directory Properties:
  stable/8/share/man/man4/   (props changed)
  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)

Modified: stable/8/share/man/man4/ata.4
==============================================================================
--- stable/8/share/man/man4/ata.4	Tue Nov 23 21:22:18 2010	(r215771)
+++ stable/8/share/man/man4/ata.4	Tue Nov 23 21:29:40 2010	(r215772)
@@ -183,7 +183,7 @@ SIS963, SIS964, SIS965.
 .It VIA:
 VT6410, VT6420, VT6421, VT82C586, VT82C586B, VT82C596, VT82C596B, VT82C686,
 VT82C686A, VT82C686B, VT8231, VT8233, VT8233A, VT8233C, VT8235, VT8237,
-VT8237A, VT8237S, VT8251, CX700, VX800, VX855.
+VT8237A, VT8237S, VT8251, CX700, VX800, VX855, VX900.
 .El
 .Pp
 Unknown ATA chipsets are supported in PIO modes, and if the standard

Modified: stable/8/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/8/sys/dev/ata/ata-pci.h	Tue Nov 23 21:22:18 2010	(r215771)
+++ stable/8/sys/dev/ata/ata-pci.h	Tue Nov 23 21:29:40 2010	(r215772)
@@ -512,7 +512,10 @@ struct ata_pci_controller {
 #define ATA_VIACX700            0x83241106
 #define ATA_VIASATAIDE          0x53241106
 #define ATA_VIAVX800            0x83531106
+#define ATA_VIASATAIDE2         0xc4091106
 #define ATA_VIAVX855            0x84091106
+#define ATA_VIASATAIDE3         0x90011106
+#define ATA_VIAVX900            0x84101106
 
 /* global prototypes ata-pci.c */
 int ata_pci_probe(device_t dev);

Modified: stable/8/sys/dev/ata/chipsets/ata-via.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-via.c	Tue Nov 23 21:22:18 2010	(r215771)
+++ stable/8/sys/dev/ata/chipsets/ata-via.c	Tue Nov 23 21:29:40 2010	(r215772)
@@ -106,6 +106,7 @@ ata_via_probe(device_t dev)
      { ATA_VIACX700,  0x00, VIA133, VIASATA, ATA_SA150, "CX700" },
      { ATA_VIAVX800,  0x00, VIA133, VIASATA, ATA_SA150, "VX800" },
      { ATA_VIAVX855,  0x00, VIA133, 0x00,    ATA_UDMA6, "VX855" },
+     { ATA_VIAVX900,  0x00, VIA133, VIASATA, ATA_SA300, "VX900" },
      { 0, 0, 0, 0, 0, 0 }};
     static struct ata_chip_id new_ids[] =
     {{ ATA_VIA6410,   0x00, 0,      0x00,    ATA_UDMA6, "6410" },
@@ -123,7 +124,9 @@ ata_via_probe(device_t dev)
 
     if (pci_get_devid(dev) == ATA_VIA82C571 ||
 	pci_get_devid(dev) == ATA_VIACX700IDE ||
-	pci_get_devid(dev) == ATA_VIASATAIDE) {
+	pci_get_devid(dev) == ATA_VIASATAIDE ||
+	pci_get_devid(dev) == ATA_VIASATAIDE2 ||
+	pci_get_devid(dev) == ATA_VIASATAIDE3) {
 	if (!(ctlr->chip = ata_find_chip(dev, ids, -99))) 
 	    return ENXIO;
     }