summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/notes/amd64/hardware4
-rw-r--r--distrib/notes/cats/hardware4
-rw-r--r--distrib/notes/i386/hardware4
-rw-r--r--share/man/man4/pciide.44
-rw-r--r--sys/dev/pci/pciide.c20
5 files changed, 23 insertions, 13 deletions
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware
index 50a3c1a316e..344802be080 100644
--- a/distrib/notes/amd64/hardware
+++ b/distrib/notes/amd64/hardware
@@ -1,4 +1,4 @@
-dnl $OpenBSD: hardware,v 1.42 2005/03/18 04:00:58 jsg Exp $
+dnl $OpenBSD: hardware,v 1.43 2005/04/10 00:45:42 jsg Exp $
OpenBSD/MACHINE OSREV should work on all Athlon 64-based and
compatible designs.
@@ -32,7 +32,7 @@ dnl YENTA-compatible PCI-CardBus bridges
(RAID mode is not supported)
Intel PIIX, PIIX3, and PIIX4
Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/
- ICH6/ICH6R)
+ ICH6/ICH6M/ICH6R)
Intel 6300ESB
ITE IT8212F (RAID mode is not supported)
National Semiconductor PC87415
diff --git a/distrib/notes/cats/hardware b/distrib/notes/cats/hardware
index bc4eaa86e58..6061ec02ee8 100644
--- a/distrib/notes/cats/hardware
+++ b/distrib/notes/cats/hardware
@@ -1,4 +1,4 @@
-dnl $OpenBSD: hardware,v 1.19 2005/03/18 23:51:39 miod Exp $
+dnl $OpenBSD: hardware,v 1.20 2005/04/10 00:45:42 jsg Exp $
OpenBSD/MACHINE runs on the Chalice/Simtec StrongARM 110 Evaluation Board.
Supported devices {:-include-:}:
@@ -12,7 +12,7 @@ Supported devices {:-include-:}:
(RAID mode is not supported)
Intel PIIX, PIIX3, and PIIX4
Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/
- ICH6/ICH6R)
+ ICH6/ICH6M/ICH6R)
Intel 6300ESB
National Semiconductor PC87415
NVIDIA nForce/nForce2
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 6df04415395..6a341568d6f 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-dnl $OpenBSD: hardware,v 1.197 2005/04/10 00:17:53 jsg Exp $
+dnl $OpenBSD: hardware,v 1.198 2005/04/10 00:45:42 jsg Exp $
OpenBSD/MACHINE OSREV works across a broad range of standard PCs and
clones, with a wide variety of processors and I/O bus architectures. It
can be expected to install and run with minimal difficulties on most
@@ -75,7 +75,7 @@ Supported hardware {:-include-:}:
(RAID mode is not supported)
Intel PIIX, PIIX3, and PIIX4
Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/
- ICH6/ICH6R)
+ ICH6/ICH6M/ICH6R)
Intel 6300ESB
ITE IT8212F (RAID mode is not supported)
National Semiconductor PC87415
diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4
index 061f0902033..e1be46e3ba1 100644
--- a/share/man/man4/pciide.4
+++ b/share/man/man4/pciide.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pciide.4,v 1.45 2005/01/15 15:23:40 jsg Exp $
+.\" $OpenBSD: pciide.4,v 1.46 2005/04/10 00:45:41 jsg Exp $
.\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $
.\"
.\" Copyright (c) 1998 Manuel Bouyer.
@@ -80,7 +80,7 @@ HighPoint HPT366, HPT370, HPT372, HPT302, HPT371, HPT374
.It
Intel PIIX, PIIX3, and PIIX4
.It
-Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/ICH6/ICH6R)
+Intel 82801 (ICH/ICH0/ICH2/ICH3/ICH4/ICH4-M/ICH5/ICH5R/ICH6/ICH6M/ICH6R)
.It
Intel 6300ESB
.It
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index c99291ec66f..b049dfb4c34 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.186 2005/02/21 19:55:50 grange Exp $ */
+/* $OpenBSD: pciide.c,v 1.187 2005/04/10 00:45:41 jsg Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -367,6 +367,10 @@ const struct pciide_product_desc pciide_intel_products[] = {
IDE_PCI_CLASS_OVERRIDE,
piix_chip_map
},
+ { PCI_PRODUCT_INTEL_82801FBM_IDE, /* Intel 82801FBM (ICH6M) IDE */
+ IDE_PCI_CLASS_OVERRIDE,
+ piix_chip_map
+ },
{ PCI_PRODUCT_INTEL_82801FB_SATA, /* Intel 82801FB (ICH6) SATA */
IDE_PCI_CLASS_OVERRIDE,
piix_chip_map
@@ -1739,6 +1743,7 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
case PCI_PRODUCT_INTEL_6300ESB_SATA:
case PCI_PRODUCT_INTEL_6300ESB_SATA2:
case PCI_PRODUCT_INTEL_82801FB_IDE:
+ case PCI_PRODUCT_INTEL_82801FBM_IDE:
case PCI_PRODUCT_INTEL_82801FB_SATA:
case PCI_PRODUCT_INTEL_82801FR_SATA:
sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
@@ -1764,6 +1769,7 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
case PCI_PRODUCT_INTEL_6300ESB_SATA:
case PCI_PRODUCT_INTEL_6300ESB_SATA2:
case PCI_PRODUCT_INTEL_82801FB_IDE:
+ case PCI_PRODUCT_INTEL_82801FBM_IDE:
case PCI_PRODUCT_INTEL_82801FB_SATA:
case PCI_PRODUCT_INTEL_82801FR_SATA:
sc->sc_wdcdev.UDMA_cap = 5;
@@ -1820,7 +1826,8 @@ piix_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DBM_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE ||
- sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE) {
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE ||
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_IDE) {
WDCDEBUG_PRINT((", IDE_CONTROL 0x%x",
pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)),
DEBUG_PROBE);
@@ -1909,7 +1916,8 @@ next:
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DBM_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE ||
- sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE) {
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE ||
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_IDE) {
WDCDEBUG_PRINT((", IDE_CONTROL 0x%x",
pci_conf_read(sc->sc_pc, sc->sc_tag, PIIX_CONFIG)),
DEBUG_PROBE);
@@ -2075,7 +2083,8 @@ piix3_4_setup_channel(struct channel_softc *chp)
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DBM_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE ||
- sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE) {
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE ||
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_IDE) {
ideconf |= PIIX_CONFIG_PINGPONG;
}
if (sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801BAM_IDE ||
@@ -2086,7 +2095,8 @@ piix3_4_setup_channel(struct channel_softc *chp)
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801DBM_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801EB_IDE ||
sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_6300ESB_IDE ||
- sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE) {
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FB_IDE ||
+ sc->sc_pp->ide_product == PCI_PRODUCT_INTEL_82801FBM_IDE) {
/* setup Ultra/100 */
if (drvp->UDMA_mode > 2 &&
(ideconf & PIIX_CONFIG_CR(channel, drive)) == 0)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 12:35:29 +0000