diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-08-19 17:59:01 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2006-08-19 17:59:01 +0000 |
| commit | f05668ae74bd500cc5b57fcf62a4e1d6240bfeef (patch) | |
| tree | 83d9838970730fb154c40d4b0f10e54e607e3308 | |
| parent | 55bcf52aaad812ff04d572169340a0c79e0e1b7e (diff) | |
Support for Intel 82801H/ICH8 SATA parts, untested but should
work like the previous generation for our purposes going by the
datasheet.
| -rw-r--r-- | share/man/man4/pciide.4 | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pciide.c | 39 |
2 files changed, 40 insertions, 3 deletions
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4 index 4c7ebfa4be2..88d511caf62 100644 --- a/share/man/man4/pciide.4 +++ b/share/man/man4/pciide.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pciide.4,v 1.66 2006/08/06 01:33:29 brad Exp $ +.\" $OpenBSD: pciide.4,v 1.67 2006/08/19 17:59:00 jsg Exp $ .\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $ .\" .\" Copyright (c) 1998 Manuel Bouyer. @@ -84,7 +84,7 @@ Intel PIIX, PIIX3, and PIIX4 .It Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/\& -ICH6/ICH6M/ICH6R/ICH7/ICH7M/ICH7R/ICH7M DH) +ICH6/ICH6M/ICH6R/ICH7/ICH7M/ICH7R/ICH7M DH/ICH8/ICH8M) .It Intel 6300ESB/6321ESB .It diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 57bfa33fc95..cde797620f7 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.251 2006/08/19 17:38:56 jsg Exp $ */ +/* $OpenBSD: pciide.c,v 1.252 2006/08/19 17:59:00 jsg Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -464,6 +464,34 @@ const struct pciide_product_desc pciide_intel_products[] = { { PCI_PRODUCT_INTEL_82801GHM_RAID, /* Intel 82801GHM (ICH7-M DH) SATA */ IDE_PCI_CLASS_OVERRIDE, piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801H_SATA_1_6P, /* Intel 82801H (ICH8) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801H_AHCI, /* Intel 82801H (ICH8) AHCI */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801H_RAID, /* Intel 82801H (ICH8) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801H_SATA_1_4P, /* Intel 82801H (ICH8) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801H_SATA_2, /* Intel 82801H (ICH8) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801HBM_SATA_1, /* Intel 82801HBM (ICH8M) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map + }, + { PCI_PRODUCT_INTEL_82801HBM_SATA_2, /* Intel 82801HBM (ICH8M) SATA */ + IDE_PCI_CLASS_OVERRIDE, + piixsata_chip_map } }; @@ -2307,6 +2335,15 @@ piixsata_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) case PCI_PRODUCT_INTEL_82801GHM_RAID: ich = 7; break; + case PCI_PRODUCT_INTEL_82801H_SATA_1_6P: + case PCI_PRODUCT_INTEL_82801H_AHCI: + case PCI_PRODUCT_INTEL_82801H_RAID: + case PCI_PRODUCT_INTEL_82801H_SATA_1_4P: + case PCI_PRODUCT_INTEL_82801H_SATA_2: + case PCI_PRODUCT_INTEL_82801HBM_SATA_1: + case PCI_PRODUCT_INTEL_82801HBM_SATA_2: + ich = 8; + break; } /* |