svn commit: r230223 - in stable/9/sys/dev: ahci ata ata/chipsets

[Jim Harris]

Author: jimharris
Date: Mon Jan 16 17:30:00 2012
New Revision: 230223
URL: http://svn.freebsd.org/changeset/base/230223

Log:
  MFC r229671:
  
   Add 0x2826 device ID for C600 (Patsburg) SATA controller in RAID mode.
  
  Sponsored by: Intel
  Approved by: sbruno

Modified:
  stable/9/sys/dev/ahci/ahci.c
  stable/9/sys/dev/ata/ata-pci.h
  stable/9/sys/dev/ata/chipsets/ata-intel.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/ahci/ahci.c
==============================================================================
--- stable/9/sys/dev/ahci/ahci.c	Mon Jan 16 17:08:08 2012	(r230222)
+++ stable/9/sys/dev/ahci/ahci.c	Mon Jan 16 17:30:00 2012	(r230223)
@@ -171,6 +171,7 @@ static struct {
 	{0x1d028086, 0x00, "Intel Patsburg",	0},
 	{0x1d048086, 0x00, "Intel Patsburg",	0},
 	{0x1d068086, 0x00, "Intel Patsburg",	0},
+	{0x28268086, 0x00, "Intel Patsburg (RAID)",	0},
 	{0x1e028086, 0x00, "Intel Panther Point",	0},
 	{0x1e038086, 0x00, "Intel Panther Point",	0},
 	{0x1e048086, 0x00, "Intel Panther Point",	0},

Modified: stable/9/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/9/sys/dev/ata/ata-pci.h	Mon Jan 16 17:08:08 2012	(r230222)
+++ stable/9/sys/dev/ata/ata-pci.h	Mon Jan 16 17:30:00 2012	(r230223)
@@ -236,6 +236,7 @@ struct ata_pci_controller {
 #define ATA_PBG_AH1		0x1d028086
 #define ATA_PBG_R1		0x1d048086
 #define ATA_PBG_R2		0x1d068086
+#define ATA_PBG_R3		0x28268086
 #define ATA_PBG_S2		0x1d088086
 
 #define ATA_PPT_S1		0x1e008086

Modified: stable/9/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- stable/9/sys/dev/ata/chipsets/ata-intel.c	Mon Jan 16 17:08:08 2012	(r230222)
+++ stable/9/sys/dev/ata/chipsets/ata-intel.c	Mon Jan 16 17:30:00 2012	(r230223)
@@ -197,6 +197,7 @@ ata_intel_probe(device_t dev)
      { ATA_PBG_AH1,      0, INTEL_AHCI, 0, ATA_SA300, "Patsburg" },
      { ATA_PBG_R1,       0, INTEL_AHCI, 0, ATA_SA300, "Patsburg" },
      { ATA_PBG_R2,       0, INTEL_AHCI, 0, ATA_SA300, "Patsburg" },
+     { ATA_PBG_R3,       0, INTEL_AHCI, 0, ATA_SA300, "Patsburg" },
      { ATA_PBG_S2,       0, INTEL_6CH2, 0, ATA_SA300, "Patsburg" },
      { ATA_PPT_S1,       0, INTEL_6CH,  0, ATA_SA300, "Panther Point" },
      { ATA_PPT_S2,       0, INTEL_6CH,  0, ATA_SA300, "Panther Point" },