svn commit: r220848 - in stable/8/sys/dev: ahci ata ata/chipsets
ichsmb ichwd
Alexander Motin
mav at FreeBSD.org
Tue Apr 19 16:40:58 UTC 2011
Author: mav
Date: Tue Apr 19 16:40:58 2011
New Revision: 220848
URL: http://svn.freebsd.org/changeset/base/220848
Log:
MFC r218140 (jfv):
Support for the new DH89xxCC PCH chipset including:
- SATA controller
- Watchdog timer
- SMBus controller
Modified:
stable/8/sys/dev/ahci/ahci.c
stable/8/sys/dev/ata/ata-pci.h
stable/8/sys/dev/ata/chipsets/ata-intel.c
stable/8/sys/dev/ichsmb/ichsmb_pci.c
stable/8/sys/dev/ichwd/ichwd.c
stable/8/sys/dev/ichwd/ichwd.h
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)
Modified: stable/8/sys/dev/ahci/ahci.c
==============================================================================
--- stable/8/sys/dev/ahci/ahci.c Tue Apr 19 16:39:03 2011 (r220847)
+++ stable/8/sys/dev/ahci/ahci.c Tue Apr 19 16:40:58 2011 (r220848)
@@ -161,6 +161,7 @@ static struct {
{0x1c038086, 0x00, "Intel Cougar Point", 0},
{0x1c048086, 0x00, "Intel Cougar Point", 0},
{0x1c058086, 0x00, "Intel Cougar Point", 0},
+ {0x23238086, 0x00, "Intel DH89xxCC", 0},
{0x2361197b, 0x00, "JMicron JMB361", AHCI_Q_NOFORCE},
{0x2363197b, 0x00, "JMicron JMB363", AHCI_Q_NOFORCE},
{0x2365197b, 0x00, "JMicron JMB365", AHCI_Q_NOFORCE},
Modified: stable/8/sys/dev/ata/ata-pci.h
==============================================================================
--- stable/8/sys/dev/ata/ata-pci.h Tue Apr 19 16:39:03 2011 (r220847)
+++ stable/8/sys/dev/ata/ata-pci.h Tue Apr 19 16:40:58 2011 (r220848)
@@ -229,6 +229,7 @@ struct ata_pci_controller {
#define ATA_I31244 0x32008086
#define ATA_ISCH 0x811a8086
+#define ATA_DH89XXCC 0x23238086
#define ATA_ITE_ID 0x1283
#define ATA_IT8211F 0x82111283
Modified: stable/8/sys/dev/ata/chipsets/ata-intel.c
==============================================================================
--- stable/8/sys/dev/ata/chipsets/ata-intel.c Tue Apr 19 16:39:03 2011 (r220847)
+++ stable/8/sys/dev/ata/chipsets/ata-intel.c Tue Apr 19 16:40:58 2011 (r220848)
@@ -178,6 +178,7 @@ ata_intel_probe(device_t dev)
{ ATA_CPT_S4, 0, INTEL_6CH2, 0, ATA_SA300, "Cougar Point" },
{ ATA_I31244, 0, 0, 2, ATA_SA150, "31244" },
{ ATA_ISCH, 0, 0, 1, ATA_UDMA5, "SCH" },
+ { ATA_DH89XXCC, 0, INTEL_AHCI, 0, ATA_SA300, "DH89xxCC" },
{ 0, 0, 0, 0, 0, 0}};
if (pci_get_vendor(dev) != ATA_INTEL_ID)
Modified: stable/8/sys/dev/ichsmb/ichsmb_pci.c
==============================================================================
--- stable/8/sys/dev/ichsmb/ichsmb_pci.c Tue Apr 19 16:39:03 2011 (r220847)
+++ stable/8/sys/dev/ichsmb/ichsmb_pci.c Tue Apr 19 16:40:58 2011 (r220848)
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
#define ID_PCH 0x3b308086
#define ID_6300ESB 0x25a48086
#define ID_631xESB 0x269b8086
+#define ID_DH89XXCC 0x23308086
#define ID_CPT 0x1c228086
#define PCIS_SERIALBUS_SMBUS_PROGIF 0x00
@@ -175,6 +176,9 @@ ichsmb_pci_probe(device_t dev)
case ID_631xESB:
device_set_desc(dev, "Intel 631xESB/6321ESB (ESB2) SMBus controller");
break;
+ case ID_DH89XXCC:
+ device_set_desc(dev, "Intel DH89xxCC SMBus controller");
+ break;
case ID_CPT:
device_set_desc(dev, "Intel Cougar Point SMBus controller");
break;
Modified: stable/8/sys/dev/ichwd/ichwd.c
==============================================================================
--- stable/8/sys/dev/ichwd/ichwd.c Tue Apr 19 16:39:03 2011 (r220847)
+++ stable/8/sys/dev/ichwd/ichwd.c Tue Apr 19 16:40:58 2011 (r220848)
@@ -111,6 +111,7 @@ static struct ichwd_device ichwd_devices
{ DEVICEID_ICH10DO, "Intel ICH10DO watchdog timer", 10 },
{ DEVICEID_ICH10R, "Intel ICH10R watchdog timer", 10 },
{ DEVICEID_H55, "Intel H55 watchdog timer", 10 },
+ { DEVICEID_DH89XXCC_LPC, "Intel DH89xxCC watchdog timer", 10 },
{ 0, NULL, 0 },
};
Modified: stable/8/sys/dev/ichwd/ichwd.h
==============================================================================
--- stable/8/sys/dev/ichwd/ichwd.h Tue Apr 19 16:39:03 2011 (r220847)
+++ stable/8/sys/dev/ichwd/ichwd.h Tue Apr 19 16:40:58 2011 (r220848)
@@ -64,6 +64,7 @@ struct ichwd_softc {
};
#define VENDORID_INTEL 0x8086
+#define DEVICEID_DH89XXCC_LPC 0x2310
#define DEVICEID_82801AA 0x2410
#define DEVICEID_82801AB 0x2420
#define DEVICEID_82801BA 0x2440
More information about the svn-src-stable
mailing list