diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2007-03-17 10:25:40 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2007-03-17 10:25:40 +0000 |
| commit | 84b61b06154a5c0ed7d680a67ec353576c23d43e (patch) | |
| tree | c39655cba128e0af48045ead575b4e1a65e2e79e /sys/dev | |
| parent | a0902cea783baca87e97b8b6e9265532814bb774 (diff) | |
replace the VMWARE quirk that restricts the bus width to 16 targets with
one for all SPI controllers. krw has a sun machine with a 1030 that gets
the bus width wrong too, so since vmware emulates that type of hardware
too, we can just limit the lot of them and forget about it.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/mpi.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/mpivar.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/mpi_pci.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c index 8e358a0cf84..f3555d48224 100644 --- a/sys/dev/ic/mpi.c +++ b/sys/dev/ic/mpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi.c,v 1.82 2006/11/28 23:59:45 dlg Exp $ */ +/* $OpenBSD: mpi.c,v 1.83 2007/03/17 10:25:39 dlg Exp $ */ /* * Copyright (c) 2005, 2006 David Gwynne <dlg@openbsd.org> @@ -1672,7 +1672,7 @@ mpi_iocfacts(struct mpi_softc *sc) sc->sc_maxcmds = letoh16(ifp.global_credits); sc->sc_maxchdepth = ifp.max_chain_depth; sc->sc_ioc_number = ifp.ioc_number; - if (sc->sc_flags & MPI_F_VMWARE) + if (sc->sc_flags & MPI_F_SPI) sc->sc_buswidth = 16; else sc->sc_buswidth = diff --git a/sys/dev/ic/mpivar.h b/sys/dev/ic/mpivar.h index c7681582f7c..bc34fb953ff 100644 --- a/sys/dev/ic/mpivar.h +++ b/sys/dev/ic/mpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpivar.h,v 1.21 2006/09/21 09:44:05 dlg Exp $ */ +/* $OpenBSD: mpivar.h,v 1.22 2007/03/17 10:25:39 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -101,7 +101,7 @@ struct mpi_softc { struct scsi_link sc_link; int sc_flags; -#define MPI_F_VMWARE (1<<0) +#define MPI_F_SPI (1<<0) #define MPI_F_RAID (1<<1) struct scsibus_softc *sc_scsibus; diff --git a/sys/dev/pci/mpi_pci.c b/sys/dev/pci/mpi_pci.c index a082e4f818a..8576fdc6d95 100644 --- a/sys/dev/pci/mpi_pci.c +++ b/sys/dev/pci/mpi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi_pci.c,v 1.13 2006/10/08 04:54:36 brad Exp $ */ +/* $OpenBSD: mpi_pci.c,v 1.14 2007/03/17 10:25:39 dlg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -139,9 +139,9 @@ mpi_pci_attach(struct device *parent, struct device *self, void *aux) } printf(": %s", intrstr); - /* vmware doesn't fill in the pci subsystem register */ - if (pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG) == 0x0) - sc->sc_flags |= MPI_F_VMWARE; + if (pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_ID_REG) == + PCI_ID_CODE(PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_1030)) + sc->sc_flags |= MPI_F_SPI; if (mpi_attach(sc) != 0) { /* error printed by mpi_attach */ |