diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-11-04 01:38:55 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-11-04 01:38:55 +0000 |
| commit | 9725606455a33bcf03ffa133a5a3ec14e7c9d1e0 (patch) | |
| tree | 3f4ad92d2f0b14d04de087a80cdc581eb099d4c6 | |
| parent | 50f05e3aadd76fa205105d054adcebe9e2e0635c (diff) | |
when the ati ahci stuff is in the ide compat mode, it can sometimes cause
a wdc(4) controller to appear. this code disables the compat mode using
some magic niklas gleaned from the linux driver.
| -rw-r--r-- | sys/dev/pci/ahci.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c index cec67243263..5073b9ab092 100644 --- a/sys/dev/pci/ahci.c +++ b/sys/dev/pci/ahci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci.c,v 1.130 2007/10/27 10:51:21 dlg Exp $ */ +/* $OpenBSD: ahci.c,v 1.131 2007/11/04 01:38:54 dlg Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -555,6 +555,25 @@ ahci_vt8251_attach(struct ahci_softc *sc, struct pci_attach_args *pa) int ahci_ati_ixp600_attach(struct ahci_softc *sc, struct pci_attach_args *pa) { + pcireg_t magic; + + if (PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_MASS_STORAGE_IDE) { + magic = pci_conf_read(pa->pa_pc, pa->pa_tag, + AHCI_PCI_ATI_IXP600_MAGIC); + pci_conf_write(pa->pa_pc, pa->pa_tag, + AHCI_PCI_ATI_IXP600_MAGIC, + magic | AHCI_PCI_ATI_IXP600_LOCKED); + + pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_CLASS_REG, + PCI_CLASS_MASS_STORAGE << PCI_CLASS_SHIFT | + PCI_SUBCLASS_MASS_STORAGE_SATA << PCI_SUBCLASS_SHIFT | + AHCI_PCI_INTERFACE << PCI_INTERFACE_SHIFT | + PCI_REVISION(pa->pa_class) << PCI_REVISION_SHIFT); + + pci_conf_write(pa->pa_pc, pa->pa_tag, + AHCI_PCI_ATI_IXP600_MAGIC, magic); + } + sc->sc_flags |= AHCI_F_NO_FER; return (0); |