diff options
| author |   drahn <drahn@openbsd.org> | 2003-06-11 20:33:08 +0000 |
|---|---|---|
| committer | drahn <drahn@openbsd.org> | 2003-06-11 20:33:08 +0000 |
| commit | 6f49053386e99127bf314eb42ed030ce5c27896f (patch) | |
| tree | b0f37b452993fba4eec36b21e5ce7624c5e3e9c3 | |
| parent | Manpages for some missing macppc pieces. (diff) | |
| download | wireguard-openbsd-6f49053386e99127bf314eb42ed030ce5c27896f.tar.xz wireguard-openbsd-6f49053386e99127bf314eb42ed030ce5c27896f.zip | |
Previously DMA/UDMA was disabled on macppc RAMDISK kernels, I have not
heard of any DMA related failures on these machines. Remove the code
(and the flag) which was previously used to enable DMA/UDMA modes on
wdc_obio now it will default to always being on for known systems.
| -rw-r--r-- | sys/arch/macppc/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/conf/RAMDISK | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/wdc_obio.c | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 9d3378cae13..09cb28a3149 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.45 2003/06/05 22:40:48 drahn Exp $g +# $OpenBSD: GENERIC,v 1.46 2003/06/11 20:33:08 drahn Exp $g # # PPC GENERIC config file # @@ -55,7 +55,7 @@ ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI #pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI pciide* at pci? dev ? function ? kauaiata* at pci? dev ? function ? # Apple ATA 100 -wdc* at kauaiata? flags 0x1 +wdc* at kauaiata? macobio0 at pci? dev ? function ? gem* at pci? dev ? function ? # GMAC ethernet hme* at pci? dev ? function ? # HME ethernet @@ -153,7 +153,7 @@ scsibus* at iopsp? scsibus* at siop? #scsibus* at fwscsi? -wdc* at macobio? flags 0x1 +wdc* at macobio? wd* at wdc? drive ? flags 0x0000 wd* at pciide? drive ? flags 0x0000 atapiscsi* at wdc? channel ? flags 0x0000 diff --git a/sys/arch/macppc/conf/RAMDISK b/sys/arch/macppc/conf/RAMDISK index ed699eea6a6..9dfd0adda70 100644 --- a/sys/arch/macppc/conf/RAMDISK +++ b/sys/arch/macppc/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.25 2003/06/11 03:49:37 miod Exp $ +# $OpenBSD: RAMDISK,v 1.26 2003/06/11 20:33:08 drahn Exp $ # # PPC GENERIC config file # @@ -55,7 +55,7 @@ ahc* at pci? dev ? function ? # Adaptec 294x, aic78x0 SCSI #pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI SCSI pciide* at pci? dev ? function ? kauaiata* at pci? dev ? function ? # Apple ATA 100 -wdc* at kauaiata? flags 0x1 +wdc* at kauaiata? macobio0 at pci? dev ? function ? gem* at pci? dev ? function ? # GMAC ethernet hme* at pci? dev ? function ? # HME ethernet @@ -114,7 +114,7 @@ scsibus* at ahc? #scsibus* at mesh? #scsibus* at pcscp? -wdc* at macobio? flags 0x0 +wdc* at macobio? wd* at wdc? drive ? flags 0x0000 wd* at pciide? channel ? drive ? atapiscsi* at wdc? channel ? flags 0x0000 diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c index f21e1709dc3..1815ccd5da3 100644 --- a/sys/arch/macppc/dev/wdc_obio.c +++ b/sys/arch/macppc/dev/wdc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_obio.c,v 1.11 2003/06/06 16:36:51 drahn Exp $ */ +/* $OpenBSD: wdc_obio.c,v 1.12 2003/06/11 20:33:08 drahn Exp $ */ /* $NetBSD: wdc_obio.c,v 1.15 2001/07/25 20:26:33 bouyer Exp $ */ /*- @@ -144,10 +144,8 @@ wdc_obio_attach(parent, self, aux) bus_addr_t cmdbase; bus_size_t cmdsize; - if (sc->sc_wdcdev.sc_dev.dv_cfdata->cf_flags & WDC_OPTIONS_DMA) { - if (ca->ca_nreg >= 16 || ca->ca_nintr == -1) - use_dma = 1; /* XXX Don't work yet. */ - } + if (ca->ca_nreg >= 16 || ca->ca_nintr == -1) + use_dma = 1; /* Enable dma */ sc->sc_dmat = ca->ca_dmat; if ((error = bus_dmamap_create(sc->sc_dmat, |