Module Name: src
Committed By: chs
Date: Sun Jun 14 01:40:06 UTC 2020
Modified Files:
src/sys/arch/algor/dev: mainbus.c
src/sys/arch/amiga/pci: em4k.c empb.c mppb.c p5pb.c
src/sys/arch/arc/pci: necpb.c
src/sys/arch/arm/broadcom: bcm53xx_pax.c
src/sys/arch/arm/fdt: pcihost_fdt.c
src/sys/arch/arm/gemini: gemini_pci.c
src/sys/arch/arm/imx: imx6_pcie.c
src/sys/arch/arm/imx/fdt: imx6_pcie.c
src/sys/arch/arm/ixp12x0: ixp12x0_pci.c
src/sys/arch/arm/nvidia: tegra_pcie.c
src/sys/arch/arm/s3c2xx0: s3c2800_pci.c
src/sys/arch/arm/xscale: becc_pci.c i80312_pci.c i80321_pci.c
ixp425_pci.c
src/sys/arch/bebox/bebox: mainbus.c
src/sys/arch/cobalt/dev: gt.c
src/sys/arch/evbarm/ifpga: ifpga.c
src/sys/arch/evbmips/gdium: mainbus.c
src/sys/arch/evbmips/loongson: mainbus.c
src/sys/arch/evbmips/malta/dev: mainbus.c
src/sys/arch/evbppc/walnut/pci: pchb.c
src/sys/arch/hppa/dev: astro.c dino.c uturn.c
src/sys/arch/ibmnws/ibmnws: mainbus.c
src/sys/arch/mvmeppc/mvmeppc: mainbus.c
src/sys/arch/ofppc/pci: ofwpci.c
src/sys/arch/powerpc/ibm4xx/pci: pchb.c
src/sys/arch/prep/prep: mainbus.c
src/sys/arch/sandpoint/sandpoint: mainbus.c
src/sys/arch/sgimips/gio: pci_gio.c
src/sys/arch/sgimips/mace: pci_mace.c
src/sys/arch/sh3/dev: shpcic.c
src/sys/arch/sparc/dev: vme_machdep.c
src/sys/arch/sparc/sparc: iommu.c
src/sys/arch/sparc64/dev: sbus.c
src/sys/arch/vax/uba: qv.c
src/sys/arch/x68k/dev: intio.c
src/sys/dev/ic: cpc700.c
src/sys/dev/marvell: gtpci.c mvpex.c
Log Message:
replace EX_NOWAIT with EX_WAITOK in device attach methods.
remove checks for failures that can no longer occur.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/algor/dev/mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/pci/em4k.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/amiga/pci/empb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/pci/mppb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/pci/p5pb.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arc/pci/necpb.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/broadcom/bcm53xx_pax.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/fdt/pcihost_fdt.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/gemini/gemini_pci.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/imx/imx6_pcie.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/fdt/imx6_pcie.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/ixp12x0/ixp12x0_pci.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/nvidia/tegra_pcie.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/s3c2xx0/s3c2800_pci.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/xscale/becc_pci.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/xscale/i80312_pci.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/xscale/i80321_pci.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/xscale/ixp425_pci.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/bebox/bebox/mainbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/ifpga/ifpga.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/gdium/mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbmips/loongson/mainbus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/malta/dev/mainbus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbppc/walnut/pci/pchb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/dev/astro.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/dev/dino.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/dev/uturn.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ibmnws/ibmnws/mainbus.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mvmeppc/mvmeppc/mainbus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ofppc/pci/ofwpci.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/ibm4xx/pci/pchb.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/prep/prep/mainbus.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sandpoint/sandpoint/mainbus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sgimips/gio/pci_gio.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sgimips/mace/pci_mace.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sh3/dev/shpcic.c
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc/dev/vme_machdep.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/sparc/sparc/iommu.c
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/sparc64/dev/sbus.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/vax/uba/qv.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x68k/dev/intio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/cpc700.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/marvell/gtpci.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/marvell/mvpex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/algor/dev/mainbus.c
diff -u src/sys/arch/algor/dev/mainbus.c:1.26 src/sys/arch/algor/dev/mainbus.c:1.27
--- src/sys/arch/algor/dev/mainbus.c:1.26 Fri Jan 27 18:52:47 2012
+++ src/sys/arch/algor/dev/mainbus.c Sun Jun 14 01:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.26 2012/01/27 18:52:47 para Exp $ */
+/* $NetBSD: mainbus.c,v 1.27 2020/06/14 01:40:02 chs Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.26 2012/01/27 18:52:47 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.27 2020/06/14 01:40:02 chs Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -159,9 +159,9 @@ mainbus_attach(device_t parent, device_t
* Reserve the bottom 64K of the I/O space for ISA devices.
*/
ioext = extent_create("pciio", 0x00010000, 0x000effff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pc = &p4032_configuration.ac_pc;
#elif defined(ALGOR_P5064)
@@ -171,9 +171,9 @@ mainbus_attach(device_t parent, device_t
* a bug in the ISA bridge.
*/
ioext = extent_create("pciio", 0x00080000, 0x00ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x01000000, 0x07ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pc = &p5064_configuration.ac_pc;
#if defined(PCI_NETBSD_ENABLE_IDE)
@@ -184,9 +184,9 @@ mainbus_attach(device_t parent, device_t
* Reserve the bottom 64K of the I/O space for ISA devices.
*/
ioext = extent_create("pciio", 0x00010000, 0x000effff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x01000000, 0x0affffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pc = &p6032_configuration.ac_pc;
#if defined(PCI_NETBSD_ENABLE_IDE)
Index: src/sys/arch/amiga/pci/em4k.c
diff -u src/sys/arch/amiga/pci/em4k.c:1.4 src/sys/arch/amiga/pci/em4k.c:1.5
--- src/sys/arch/amiga/pci/em4k.c:1.4 Fri Oct 2 05:22:49 2015
+++ src/sys/arch/amiga/pci/em4k.c Sun Jun 14 01:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: em4k.c,v 1.4 2015/10/02 05:22:49 msaitoh Exp $ */
+/* $NetBSD: em4k.c,v 1.5 2020/06/14 01:40:02 chs Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -247,7 +247,7 @@ em4k_pci_configure(struct em4k_softc *sc
/* I/O addresses are relative to I/O space address. */
ioext = extent_create("em4kio", 0, EM4K_IO_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
/*
* Memory space addresses are absolute (and keep in mind that
@@ -255,7 +255,7 @@ em4k_pci_configure(struct em4k_softc *sc
*/
memext = extent_create("em4kmem", kvtop((void*) sc->pci_mem_win.base),
kvtop((void*) sc->pci_mem_win.base) + sc->pci_mem_win_size,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(&sc->apc, ioext, memext, NULL, 0, CACHELINE_SIZE);
Index: src/sys/arch/amiga/pci/empb.c
diff -u src/sys/arch/amiga/pci/empb.c:1.11 src/sys/arch/amiga/pci/empb.c:1.12
--- src/sys/arch/amiga/pci/empb.c:1.11 Fri Oct 2 05:22:49 2015
+++ src/sys/arch/amiga/pci/empb.c Sun Jun 14 01:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: empb.c,v 1.11 2015/10/02 05:22:49 msaitoh Exp $ */
+/* $NetBSD: empb.c,v 1.12 2020/06/14 01:40:02 chs Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -234,10 +234,10 @@ empb_callback(device_t self) {
#ifdef PCI_NETBSD_CONFIGURE
ioext = extent_create("empbio", 0, EMPB_BRIDGE_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("empbmem", EMPB_MEM_BASE, EMPB_MEM_END,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(pc, ioext, memext, NULL, 0, CACHELINE_SIZE);
Index: src/sys/arch/amiga/pci/mppb.c
diff -u src/sys/arch/amiga/pci/mppb.c:1.8 src/sys/arch/amiga/pci/mppb.c:1.9
--- src/sys/arch/amiga/pci/mppb.c:1.8 Fri Oct 2 05:22:49 2015
+++ src/sys/arch/amiga/pci/mppb.c Sun Jun 14 01:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mppb.c,v 1.8 2015/10/02 05:22:49 msaitoh Exp $ */
+/* $NetBSD: mppb.c,v 1.9 2020/06/14 01:40:02 chs Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -167,9 +167,9 @@ mppb_attach(device_t parent, device_t se
#ifdef PCI_NETBSD_CONFIGURE
ioext = extent_create("mppbio", MPPB_IO_BASE,
- MPPB_IO_BASE + MPPB_IO_SIZE, NULL, 0, EX_NOWAIT);
+ MPPB_IO_BASE + MPPB_IO_SIZE, NULL, 0, EX_WAITOK);
memext = extent_create("mppbmem", MPPB_MEM_BASE,
- MPPB_MEM_BASE + MPPB_MEM_SIZE, NULL, 0, EX_NOWAIT);
+ MPPB_MEM_BASE + MPPB_MEM_SIZE, NULL, 0, EX_WAITOK);
#ifdef MPPB_DEBUG
aprint_normal("mppb: reconfiguring the bus!\n");
Index: src/sys/arch/amiga/pci/p5pb.c
diff -u src/sys/arch/amiga/pci/p5pb.c:1.15 src/sys/arch/amiga/pci/p5pb.c:1.16
--- src/sys/arch/amiga/pci/p5pb.c:1.15 Fri Oct 30 12:14:32 2015
+++ src/sys/arch/amiga/pci/p5pb.c Sun Jun 14 01:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: p5pb.c,v 1.15 2015/10/30 12:14:32 phx Exp $ */
+/* $NetBSD: p5pb.c,v 1.16 2020/06/14 01:40:02 chs Exp $ */
/*-
* Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
@@ -495,14 +495,11 @@ p5pb_bus_reconfigure(struct p5pb_softc *
pc = &sc->apc;
ioext = extent_create("p5pbio", 0, P5BUS_PCI_IO_SIZE, NULL, 0,
- EX_NOWAIT);
+ EX_WAITOK);
memext = extent_create("p5pbmem", sc->pci_mem_lowest,
- sc->pci_mem_highest - 1, NULL, 0, EX_NOWAIT);
+ sc->pci_mem_highest - 1, NULL, 0, EX_WAITOK);
- if ( (!ioext) || (!memext) )
- return false;
-
#ifdef P5PB_DEBUG
aprint_normal("p5pb: reconfiguring the bus!\n");
#endif /* P5PB_DEBUG */
Index: src/sys/arch/arc/pci/necpb.c
diff -u src/sys/arch/arc/pci/necpb.c:1.43 src/sys/arch/arc/pci/necpb.c:1.44
--- src/sys/arch/arc/pci/necpb.c:1.43 Sun Nov 10 21:16:23 2019
+++ src/sys/arch/arc/pci/necpb.c Sun Jun 14 01:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: necpb.c,v 1.43 2019/11/10 21:16:23 chs Exp $ */
+/* $NetBSD: necpb.c,v 1.44 2020/06/14 01:40:02 chs Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.43 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.44 2020/06/14 01:40:02 chs Exp $");
#include "opt_pci.h"
@@ -244,9 +244,9 @@ necpbattach(device_t parent, device_t se
pc = &sc->sc_ncp->nc_pc;
#ifdef PCI_NETBSD_CONFIGURE
pc->pc_ioext = extent_create("necpbio", 0x00100000, 0x01ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pc->pc_memext = extent_create("necpbmem", 0x08000000, 0x3fffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0,
mips_cache_info.mci_dcache_align);
#endif
Index: src/sys/arch/arm/broadcom/bcm53xx_pax.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.17 src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.18
--- src/sys/arch/arm/broadcom/bcm53xx_pax.c:1.17 Fri Nov 16 15:06:21 2018
+++ src/sys/arch/arm/broadcom/bcm53xx_pax.c Sun Jun 14 01:40:02 2020
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.17 2018/11/16 15:06:21 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.18 2020/06/14 01:40:02 chs Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -347,7 +347,7 @@ bcmpax_ccb_attach(device_t parent, devic
}
struct extent *memext = extent_create("pcimem", base,
- base + size, NULL, 0, EX_NOWAIT);
+ base + size, NULL, 0, EX_WAITOK);
error = pci_configure_bus(&sc->sc_pc,
NULL, memext, NULL, 0, arm_pcache.dcache_line_size);
Index: src/sys/arch/arm/fdt/pcihost_fdt.c
diff -u src/sys/arch/arm/fdt/pcihost_fdt.c:1.15 src/sys/arch/arm/fdt/pcihost_fdt.c:1.16
--- src/sys/arch/arm/fdt/pcihost_fdt.c:1.15 Tue Jan 7 10:20:07 2020
+++ src/sys/arch/arm/fdt/pcihost_fdt.c Sun Jun 14 01:40:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pcihost_fdt.c,v 1.15 2020/01/07 10:20:07 skrll Exp $ */
+/* $NetBSD: pcihost_fdt.c,v 1.16 2020/06/14 01:40:02 chs Exp $ */
/*-
* Copyright (c) 2018 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.15 2020/01/07 10:20:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.16 2020/06/14 01:40:02 chs Exp $");
#include <sys/param.h>
@@ -301,7 +301,7 @@ pcihost_config(struct pcihost_softc *sc)
aprint_error_dev(sc->sc_dev, "ignoring duplicate IO space range\n");
continue;
}
- ioext = extent_create("pciio", bus_phys, bus_phys + size - 1, NULL, 0, EX_NOWAIT);
+ ioext = extent_create("pciio", bus_phys, bus_phys + size - 1, NULL, 0, EX_WAITOK);
aprint_verbose_dev(sc->sc_dev,
"IO: 0x%" PRIx64 "+0x%" PRIx64 "@0x%" PRIx64 "\n",
bus_phys, size, cpu_phys);
@@ -328,7 +328,7 @@ pcihost_config(struct pcihost_softc *sc)
aprint_error_dev(sc->sc_dev, "ignoring duplicate mem (prefetchable) range\n");
continue;
}
- pmemext = extent_create("pcipmem", bus_phys, bus_phys + size - 1, NULL, 0, EX_NOWAIT);
+ pmemext = extent_create("pcipmem", bus_phys, bus_phys + size - 1, NULL, 0, EX_WAITOK);
aprint_verbose_dev(sc->sc_dev,
"MMIO (%d-bit prefetchable): 0x%" PRIx64 "+0x%" PRIx64 "@0x%" PRIx64 "\n",
is64 ? 64 : 32, bus_phys, size, cpu_phys);
@@ -337,7 +337,7 @@ pcihost_config(struct pcihost_softc *sc)
aprint_error_dev(sc->sc_dev, "ignoring duplicate mem (non-prefetchable) range\n");
continue;
}
- memext = extent_create("pcimem", bus_phys, bus_phys + size - 1, NULL, 0, EX_NOWAIT);
+ memext = extent_create("pcimem", bus_phys, bus_phys + size - 1, NULL, 0, EX_WAITOK);
aprint_verbose_dev(sc->sc_dev,
"MMIO (%d-bit non-prefetchable): 0x%" PRIx64 "+0x%" PRIx64 "@0x%" PRIx64 "\n",
is64 ? 64 : 32, bus_phys, size, cpu_phys);
Index: src/sys/arch/arm/gemini/gemini_pci.c
diff -u src/sys/arch/arm/gemini/gemini_pci.c:1.20 src/sys/arch/arm/gemini/gemini_pci.c:1.21
--- src/sys/arch/arm/gemini/gemini_pci.c:1.20 Sun Nov 10 21:16:23 2019
+++ src/sys/arch/arm/gemini/gemini_pci.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_pci.c,v 1.20 2019/11/10 21:16:23 chs Exp $ */
+/* $NetBSD: gemini_pci.c,v 1.21 2020/06/14 01:40:03 chs Exp $ */
/* adapted from:
* NetBSD: i80312_pci.c,v 1.9 2005/12/11 12:16:51 christos Exp
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.20 2019/11/10 21:16:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_pci.c,v 1.21 2020/06/14 01:40:03 chs Exp $");
#include "opt_gemini.h"
#include "opt_pci.h"
@@ -205,7 +205,7 @@ gemini_pci_init(pci_chipset_tag_t pc, vo
ioext = extent_create("pciio",
GEMINI_PCIIO_BASE,
GEMINI_PCIIO_BASE + GEMINI_PCIIO_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
/*
* XXX PCI mem addr should be inherited ?
@@ -213,7 +213,7 @@ gemini_pci_init(pci_chipset_tag_t pc, vo
memext = extent_create("pcimem",
GEMINI_PCIMEM_BASE,
GEMINI_PCIMEM_BASE + GEMINI_PCIMEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(pc, ioext, memext, NULL, 0, arm_dcache_align);
Index: src/sys/arch/arm/imx/imx6_pcie.c
diff -u src/sys/arch/arm/imx/imx6_pcie.c:1.15 src/sys/arch/arm/imx/imx6_pcie.c:1.16
--- src/sys/arch/arm/imx/imx6_pcie.c:1.15 Wed Jan 15 01:09:56 2020
+++ src/sys/arch/arm/imx/imx6_pcie.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_pcie.c,v 1.15 2020/01/15 01:09:56 jmcneill Exp $ */
+/* $NetBSD: imx6_pcie.c,v 1.16 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2016 Genetec Corporation. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.15 2020/01/15 01:09:56 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.16 2020/06/14 01:40:03 chs Exp $");
#include "opt_pci.h"
@@ -194,10 +194,10 @@ imx6_pcie_configure(void *cookie)
ioext = extent_create("pciio", IMX6_PCIE_IO_BASE,
IMX6_PCIE_IO_BASE + IMX6_PCIE_IO_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", IMX6_PCIE_MEM_BASE,
IMX6_PCIE_MEM_BASE + IMX6_PCIE_MEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
error = pci_configure_bus(&sc->sc_pc, ioext, memext, NULL, 0,
arm_dcache_align);
Index: src/sys/arch/arm/imx/fdt/imx6_pcie.c
diff -u src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.6 src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.7
--- src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.6 Thu Dec 5 00:31:14 2019
+++ src/sys/arch/arm/imx/fdt/imx6_pcie.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_pcie.c,v 1.6 2019/12/05 00:31:14 hkenken Exp $ */
+/* $NetBSD: imx6_pcie.c,v 1.7 2020/06/14 01:40:03 chs Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.6 2019/12/05 00:31:14 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.7 2020/06/14 01:40:03 chs Exp $");
#include "opt_pci.h"
#include "opt_fdt.h"
@@ -233,10 +233,10 @@ imx6_pcie_configure(void *cookie)
ioext = extent_create("pciio", IMX6_PCIE_IO_BASE,
IMX6_PCIE_IO_BASE + IMX6_PCIE_IO_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", IMX6_PCIE_MEM_BASE,
IMX6_PCIE_MEM_BASE + IMX6_PCIE_MEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
error = pci_configure_bus(&sc->sc_pc, ioext, memext, NULL, 0,
arm_dcache_align);
Index: src/sys/arch/arm/ixp12x0/ixp12x0_pci.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_pci.c:1.15 src/sys/arch/arm/ixp12x0/ixp12x0_pci.c:1.16
--- src/sys/arch/arm/ixp12x0/ixp12x0_pci.c:1.15 Fri Oct 2 05:22:50 2015
+++ src/sys/arch/arm/ixp12x0/ixp12x0_pci.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_pci.c,v 1.15 2015/10/02 05:22:50 msaitoh Exp $ */
+/* $NetBSD: ixp12x0_pci.c,v 1.16 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.15 2015/10/02 05:22:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci.c,v 1.16 2020/06/14 01:40:03 chs Exp $");
/*
* PCI configuration support for IXP12x0 Network Processor chip.
@@ -99,12 +99,12 @@ ixp12x0_pci_init(pci_chipset_tag_t pc, v
#if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
ioext = extent_create("pciio", 0, IXP12X0_PCI_IO_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
/* PCI MEM space is mapped same address as real memory */
memext = extent_create("pcimem", IXP12X0_PCI_MEM_HWBASE,
IXP12X0_PCI_MEM_HWBASE +
IXP12X0_PCI_MEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
aprint_normal_dev(sc->sc_dev, "configuring PCI bus\n");
pci_configure_bus(pc, ioext, memext, NULL, 0 /* XXX bus = 0 */,
arm_dcache_align);
Index: src/sys/arch/arm/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.29 src/sys/arch/arm/nvidia/tegra_pcie.c:1.30
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.29 Tue Jan 7 10:20:07 2020
+++ src/sys/arch/arm/nvidia/tegra_pcie.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.29 2020/01/07 10:20:07 skrll Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.30 2020/06/14 01:40:03 chs Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.29 2020/01/07 10:20:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.30 2020/06/14 01:40:03 chs Exp $");
#include <sys/param.h>
@@ -230,13 +230,13 @@ tegra_pcie_attach(device_t parent, devic
ioext = extent_create("pciio", TEGRA_PCIE_IO_BASE,
TEGRA_PCIE_IO_BASE + TEGRA_PCIE_IO_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", TEGRA_PCIE_MEM_BASE,
TEGRA_PCIE_MEM_BASE + TEGRA_PCIE_MEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pmemext = extent_create("pcipmem", TEGRA_PCIE_PMEM_BASE,
TEGRA_PCIE_PMEM_BASE + TEGRA_PCIE_PMEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
error = pci_configure_bus(&sc->sc_pc, ioext, memext, pmemext, 0,
arm_dcache_align);
Index: src/sys/arch/arm/s3c2xx0/s3c2800_pci.c
diff -u src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.27 src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.28
--- src/sys/arch/arm/s3c2xx0/s3c2800_pci.c:1.27 Sun Nov 10 21:16:24 2019
+++ src/sys/arch/arm/s3c2xx0/s3c2800_pci.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c2800_pci.c,v 1.27 2019/11/10 21:16:24 chs Exp $ */
+/* $NetBSD: s3c2800_pci.c,v 1.28 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2002 Fujitsu Component Limited
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.27 2019/11/10 21:16:24 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.c,v 1.28 2020/06/14 01:40:03 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -296,10 +296,10 @@ sspci_attach(device_t parent, device_t s
#if defined(PCI_NETBSD_CONFIGURE)
ioext = extent_create("pciio", 0x100, S3C2800_PCI_IOSPACE_SIZE - 0x100,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0, S3C2800_PCI_MEMSPACE_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
sspci_chipset.pc_conf_v = (void *) sc;
sspci_chipset.pc_intr_v = (void *) sc;
Index: src/sys/arch/arm/xscale/becc_pci.c
diff -u src/sys/arch/arm/xscale/becc_pci.c:1.19 src/sys/arch/arm/xscale/becc_pci.c:1.20
--- src/sys/arch/arm/xscale/becc_pci.c:1.19 Fri Nov 16 15:06:22 2018
+++ src/sys/arch/arm/xscale/becc_pci.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: becc_pci.c,v 1.19 2018/11/16 15:06:22 jmcneill Exp $ */
+/* $NetBSD: becc_pci.c,v 1.20 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.19 2018/11/16 15:06:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v 1.20 2020/06/14 01:40:03 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -130,10 +130,10 @@ becc_pci_init(pci_chipset_tag_t pc, void
/* Reserve the bottom 32K of the PCI address space. */
ioext = extent_create("pciio", sc->sc_ioout_xlate + (32 * 1024),
sc->sc_ioout_xlate + (64 * 1024) - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", sc->sc_owin_xlate[0],
sc->sc_owin_xlate[0] + BECC_PCI_MEM1_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
aprint_normal("%s: configuring PCI bus\n", device_xname(sc->sc_dev));
pci_configure_bus(pc, ioext, memext, NULL, 0, arm_dcache_align);
Index: src/sys/arch/arm/xscale/i80312_pci.c
diff -u src/sys/arch/arm/xscale/i80312_pci.c:1.17 src/sys/arch/arm/xscale/i80312_pci.c:1.18
--- src/sys/arch/arm/xscale/i80312_pci.c:1.17 Fri Mar 1 09:25:59 2019
+++ src/sys/arch/arm/xscale/i80312_pci.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: i80312_pci.c,v 1.17 2019/03/01 09:25:59 msaitoh Exp $ */
+/* $NetBSD: i80312_pci.c,v 1.18 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.17 2019/03/01 09:25:59 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312_pci.c,v 1.18 2020/06/14 01:40:03 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -112,10 +112,10 @@ i80312_pci_init(pci_chipset_tag_t pc, vo
ioext = extent_create("pciio", sc->sc_sioout_base,
sc->sc_sioout_base + sc->sc_sioout_size - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", sc->sc_smemout_base,
sc->sc_smemout_base + sc->sc_smemout_size - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
aprint_normal_dev(sc->sc_dev, "configuring Secondary PCI bus\n");
pci_configure_bus(pc, ioext, memext, NULL, sbus, arm_dcache_align);
Index: src/sys/arch/arm/xscale/i80321_pci.c
diff -u src/sys/arch/arm/xscale/i80321_pci.c:1.16 src/sys/arch/arm/xscale/i80321_pci.c:1.17
--- src/sys/arch/arm/xscale/i80321_pci.c:1.16 Fri Oct 2 05:22:50 2015
+++ src/sys/arch/arm/xscale/i80321_pci.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_pci.c,v 1.16 2015/10/02 05:22:50 msaitoh Exp $ */
+/* $NetBSD: i80321_pci.c,v 1.17 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.16 2015/10/02 05:22:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_pci.c,v 1.17 2020/06/14 01:40:03 chs Exp $");
#include "opt_pci.h"
#include "opt_i80321.h"
@@ -114,16 +114,16 @@ i80321_pci_init(pci_chipset_tag_t pc, vo
ioext = extent_create("pciio",
sc->sc_ioout_xlate + sc->sc_ioout_xlate_offset,
sc->sc_ioout_xlate + VERDE_OUT_XLATE_IO_WIN_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
#ifdef I80321_USE_DIRECT_WIN
memext = extent_create("pcimem", VERDE_OUT_DIRECT_WIN_BASE + VERDE_OUT_DIRECT_WIN_SKIP,
VERDE_OUT_DIRECT_WIN_BASE + VERDE_OUT_DIRECT_WIN_SIZE- 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
#else
memext = extent_create("pcimem", sc->sc_owin[0].owin_xlate_lo,
sc->sc_owin[0].owin_xlate_lo + VERDE_OUT_XLATE_MEM_WIN_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
#endif
aprint_normal_dev(sc->sc_dev, "configuring PCI bus\n");
Index: src/sys/arch/arm/xscale/ixp425_pci.c
diff -u src/sys/arch/arm/xscale/ixp425_pci.c:1.12 src/sys/arch/arm/xscale/ixp425_pci.c:1.13
--- src/sys/arch/arm/xscale/ixp425_pci.c:1.12 Fri Oct 2 05:22:50 2015
+++ src/sys/arch/arm/xscale/ixp425_pci.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_pci.c,v 1.12 2015/10/02 05:22:50 msaitoh Exp $ */
+/* $NetBSD: ixp425_pci.c,v 1.13 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.12 2015/10/02 05:22:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c,v 1.13 2020/06/14 01:40:03 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,12 +91,12 @@ ixp425_pci_init(struct ixp425_softc *sc)
#if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
ioext = extent_create("pciio", 0, IXP425_PCI_IO_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
/* PCI MEM space is mapped same address as real memory */
memext = extent_create("pcimem", IXP425_PCI_MEM_HWBASE,
IXP425_PCI_MEM_HWBASE +
IXP425_PCI_MEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
aprint_normal_dev(sc->sc_dev, "configuring PCI bus\n");
pci_configure_bus(pc, ioext, memext, NULL, 0 /* XXX bus = 0 */,
arm_dcache_align);
Index: src/sys/arch/bebox/bebox/mainbus.c
diff -u src/sys/arch/bebox/bebox/mainbus.c:1.30 src/sys/arch/bebox/bebox/mainbus.c:1.31
--- src/sys/arch/bebox/bebox/mainbus.c:1.30 Sun Nov 10 21:16:25 2019
+++ src/sys/arch/bebox/bebox/mainbus.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.30 2019/11/10 21:16:25 chs Exp $ */
+/* $NetBSD: mainbus.c,v 1.31 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.30 2019/11/10 21:16:25 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.31 2020/06/14 01:40:03 chs Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -134,9 +134,9 @@ mainbus_attach(device_t parent, device_t
#ifdef PCI_NETBSD_CONFIGURE
ioext = extent_create("pciio", 0x00008000, 0x0000ffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
Index: src/sys/arch/cobalt/dev/gt.c
diff -u src/sys/arch/cobalt/dev/gt.c:1.30 src/sys/arch/cobalt/dev/gt.c:1.31
--- src/sys/arch/cobalt/dev/gt.c:1.30 Mon Mar 2 01:46:02 2020
+++ src/sys/arch/cobalt/dev/gt.c Sun Jun 14 01:40:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.30 2020/03/02 01:46:02 thorpej Exp $ */
+/* $NetBSD: gt.c,v 1.31 2020/06/14 01:40:03 chs Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.30 2020/03/02 01:46:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.31 2020/06/14 01:40:03 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -133,9 +133,9 @@ gt_attach(device_t parent, device_t self
#ifdef PCI_NETBSD_CONFIGURE
pc->pc_ioext = extent_create("pciio", 0x00001000, 0x01ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pc->pc_memext = extent_create("pcimem", 0x12000000, 0x13ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0,
mips_cache_info.mci_dcache_align);
#endif
Index: src/sys/arch/evbarm/ifpga/ifpga.c
diff -u src/sys/arch/evbarm/ifpga/ifpga.c:1.26 src/sys/arch/evbarm/ifpga/ifpga.c:1.27
--- src/sys/arch/evbarm/ifpga/ifpga.c:1.26 Tue Feb 19 10:57:10 2013
+++ src/sys/arch/evbarm/ifpga/ifpga.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpga.c,v 1.26 2013/02/19 10:57:10 skrll Exp $ */
+/* $NetBSD: ifpga.c,v 1.27 2020/06/14 01:40:04 chs Exp $ */
/*
* Copyright (c) 2001 ARM Ltd
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.26 2013/02/19 10:57:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.27 2020/06/14 01:40:04 chs Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -296,13 +296,13 @@ ifpga_attach(device_t parent, device_t s
#if defined(PCI_NETBSD_CONFIGURE)
ioext = extent_create("pciio", 0x00000000,
- 0x00000000 + IFPGA_PCI_IO_VSIZE, NULL, 0, EX_NOWAIT);
+ 0x00000000 + IFPGA_PCI_IO_VSIZE, NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", IFPGA_PCI_APP0_BASE,
IFPGA_PCI_APP0_BASE + IFPGA_PCI_APP0_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pmemext = extent_create("pcipmem", IFPGA_PCI_APP1_BASE,
IFPGA_PCI_APP1_BASE + IFPGA_PCI_APP1_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
ifpga_pci_chipset.pc_conf_v = (void *)pci_sc;
pci_configure_bus(&ifpga_pci_chipset, ioext, memext, pmemext, 0,
arm_dcache_align);
Index: src/sys/arch/evbmips/gdium/mainbus.c
diff -u src/sys/arch/evbmips/gdium/mainbus.c:1.5 src/sys/arch/evbmips/gdium/mainbus.c:1.6
--- src/sys/arch/evbmips/gdium/mainbus.c:1.5 Fri Aug 26 13:52:38 2016
+++ src/sys/arch/evbmips/gdium/mainbus.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2016/08/26 13:52:38 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.6 2020/06/14 01:40:04 chs Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2016/08/26 13:52:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2020/06/14 01:40:04 chs Exp $");
#include "opt_pci.h"
@@ -102,9 +102,9 @@ mainbus_attach(device_t parent, device_t
struct mips_cache_info * const mci = &mips_cache_info;
struct extent *ioext = extent_create("pciio", 0x00001000, 0x00003fff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
struct extent *memext = extent_create("pcimem", 0, BONITO_PCILO_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(&gdium_configuration.gc_pc, ioext, memext,
NULL, 0, mci->mci_dcache_align);
extent_destroy(ioext);
Index: src/sys/arch/evbmips/loongson/mainbus.c
diff -u src/sys/arch/evbmips/loongson/mainbus.c:1.2 src/sys/arch/evbmips/loongson/mainbus.c:1.3
--- src/sys/arch/evbmips/loongson/mainbus.c:1.2 Fri Aug 26 13:58:27 2016
+++ src/sys/arch/evbmips/loongson/mainbus.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.2 2016/08/26 13:58:27 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.3 2020/06/14 01:40:04 chs Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.2 2016/08/26 13:58:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2020/06/14 01:40:04 chs Exp $");
#include "opt_pci.h"
@@ -104,9 +104,9 @@ mainbus_attach(device_t parent, device_t
#if defined(PCI_NETBSD_CONFIGURE)
struct extent *ioext = extent_create("pciio", 0x00001000, 0x00003fff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
struct extent *memext = extent_create("pcimem", 0, BONITO_PCILO_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
struct mips_cache_info * const mci = &mips_cache_info;
pci_configure_bus(&bonito_pc, ioext, memext,
Index: src/sys/arch/evbmips/malta/dev/mainbus.c
diff -u src/sys/arch/evbmips/malta/dev/mainbus.c:1.13 src/sys/arch/evbmips/malta/dev/mainbus.c:1.14
--- src/sys/arch/evbmips/malta/dev/mainbus.c:1.13 Sun Aug 7 10:45:19 2016
+++ src/sys/arch/evbmips/malta/dev/mainbus.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.13 2016/08/07 10:45:19 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.14 2020/06/14 01:40:04 chs Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2016/08/07 10:45:19 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.14 2020/06/14 01:40:04 chs Exp $");
#include "opt_pci.h"
@@ -124,10 +124,10 @@ mainbus_attach(device_t parent, device_t
struct mips_cache_info * const mci = &mips_cache_info;
struct extent *ioext = extent_create("pciio", 0x00001000, 0x0000efff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
struct extent *memext = extent_create("pcimem", MALTA_PCIMEM1_BASE,
MALTA_PCIMEM1_BASE + MALTA_PCIMEM1_SIZE,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(pc, ioext, memext, NULL, 0, mci->mci_dcache_align);
extent_destroy(ioext);
Index: src/sys/arch/evbppc/walnut/pci/pchb.c
diff -u src/sys/arch/evbppc/walnut/pci/pchb.c:1.13 src/sys/arch/evbppc/walnut/pci/pchb.c:1.14
--- src/sys/arch/evbppc/walnut/pci/pchb.c:1.13 Wed Jun 22 18:06:33 2011
+++ src/sys/arch/evbppc/walnut/pci/pchb.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.13 2011/06/22 18:06:33 matt Exp $ */
+/* $NetBSD: pchb.c,v 1.14 2020/06/14 01:40:04 chs Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.13 2011/06/22 18:06:33 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.14 2020/06/14 01:40:04 chs Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -165,9 +165,9 @@ pchbattach(device_t parent, device_t sel
#ifdef PCI_NETBSD_CONFIGURE
memext = extent_create("pcimem", MIN_PCI_MEMADDR_NOPREFETCH,
MIN_PCI_MEMADDR_NOPREFETCH + 0x1fffffff, M_DEVBUF, NULL, 0,
- EX_NOWAIT);
+ EX_WAITOK);
ioext = extent_create("pciio", MIN_PCI_PCI_IOADDR,
- MIN_PCI_PCI_IOADDR + 0xffff, M_DEVBUF, NULL, 0, EX_NOWAIT);
+ MIN_PCI_PCI_IOADDR + 0xffff, M_DEVBUF, NULL, 0, EX_WAITOK);
pci_configure_bus(0, ioext, memext, NULL, 0, 32);
extent_destroy(memext);
extent_destroy(ioext);
Index: src/sys/arch/hppa/dev/astro.c
diff -u src/sys/arch/hppa/dev/astro.c:1.1 src/sys/arch/hppa/dev/astro.c:1.2
--- src/sys/arch/hppa/dev/astro.c:1.1 Mon Feb 24 07:23:42 2014
+++ src/sys/arch/hppa/dev/astro.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: astro.c,v 1.1 2014/02/24 07:23:42 skrll Exp $ */
+/* $NetBSD: astro.c,v 1.2 2020/06/14 01:40:04 chs Exp $ */
/* $OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $ */
@@ -328,7 +328,7 @@ astro_attach(device_t parent, device_t s
snprintf(sc->sc_dvmamapname, sizeof(sc->sc_dvmamapname),
"%s_dvma", device_xname(sc->sc_dv));
sc->sc_dvmamap = extent_create(sc->sc_dvmamapname, 0, (1 << iova_bits),
- 0, 0, EX_NOWAIT);
+ 0, 0, EX_WAITOK);
sc->sc_dmatag = astro_dmat;
sc->sc_dmatag._cookie = sc;
Index: src/sys/arch/hppa/dev/dino.c
diff -u src/sys/arch/hppa/dev/dino.c:1.5 src/sys/arch/hppa/dev/dino.c:1.6
--- src/sys/arch/hppa/dev/dino.c:1.5 Thu May 14 06:13:39 2020
+++ src/sys/arch/hppa/dev/dino.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.5 2020/05/14 06:13:39 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.6 2020/06/14 01:40:04 chs Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.5 2020/05/14 06:13:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6 2020/06/14 01:40:04 chs Exp $");
/* #include "cardbus.h" */
@@ -1645,12 +1645,8 @@ dinoattach(device_t parent, device_t sel
snprintf(sc->sc_ioexname, sizeof(sc->sc_ioexname),
"%s_io", device_xname(self));
- if ((sc->sc_ioex = extent_create(sc->sc_ioexname, 0, 0xffff,
- NULL, 0, EX_NOWAIT | EX_MALLOCOK)) == NULL) {
- aprint_error(": can't allocate I/O extent map\n");
- bus_space_unmap(sc->sc_bt, sc->sc_bh, PAGE_SIZE);
- return;
- }
+ sc->sc_ioex = extent_create(sc->sc_ioexname, 0, 0xffff,
+ NULL, 0, EX_WAITOK | EX_MALLOCOK);
/* interrupts guts */
s = splhigh();
Index: src/sys/arch/hppa/dev/uturn.c
diff -u src/sys/arch/hppa/dev/uturn.c:1.2 src/sys/arch/hppa/dev/uturn.c:1.3
--- src/sys/arch/hppa/dev/uturn.c:1.2 Mon Apr 15 20:40:37 2019
+++ src/sys/arch/hppa/dev/uturn.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uturn.c,v 1.2 2019/04/15 20:40:37 skrll Exp $ */
+/* $NetBSD: uturn.c,v 1.3 2020/06/14 01:40:04 chs Exp $ */
/* $OpenBSD: uturn.c,v 1.6 2007/12/29 01:26:14 kettenis Exp $ */
@@ -357,7 +357,7 @@ uturnattach(device_t parent, device_t se
snprintf(sc->sc_mapname, sizeof(sc->sc_mapname), "%s_map",
device_xname(sc->sc_dv));
sc->sc_map = extent_create(sc->sc_mapname, 0, (1 << iova_bits),
- 0, 0, EX_NOWAIT);
+ 0, 0, EX_WAITOK);
sc->sc_dmatag = uturn_dmat;
sc->sc_dmatag._cookie = sc;
Index: src/sys/arch/ibmnws/ibmnws/mainbus.c
diff -u src/sys/arch/ibmnws/ibmnws/mainbus.c:1.12 src/sys/arch/ibmnws/ibmnws/mainbus.c:1.13
--- src/sys/arch/ibmnws/ibmnws/mainbus.c:1.12 Sun Nov 10 21:16:29 2019
+++ src/sys/arch/ibmnws/ibmnws/mainbus.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2019/11/10 21:16:29 chs Exp $ */
+/* $NetBSD: mainbus.c,v 1.13 2020/06/14 01:40:04 chs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -124,9 +124,9 @@ mainbus_attach(device_t parent, device_t
#ifdef PCI_NETBSD_CONFIGURE
ioext = extent_create("pciio", 0x00008000, 0x0000ffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
Index: src/sys/arch/mvmeppc/mvmeppc/mainbus.c
diff -u src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.17 src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.18
--- src/sys/arch/mvmeppc/mvmeppc/mainbus.c:1.17 Sun Nov 10 21:16:30 2019
+++ src/sys/arch/mvmeppc/mvmeppc/mainbus.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2019/11/10 21:16:30 chs Exp $ */
+/* $NetBSD: mainbus.c,v 1.18 2020/06/14 01:40:04 chs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2019/11/10 21:16:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2020/06/14 01:40:04 chs Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -117,9 +117,9 @@ mainbus_attach(device_t parent, device_t
#ifdef PCI_NETBSD_CONFIGURE
ioext = extent_create("pciio", 0x00008000, 0x0000ffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
Index: src/sys/arch/ofppc/pci/ofwpci.c
diff -u src/sys/arch/ofppc/pci/ofwpci.c:1.15 src/sys/arch/ofppc/pci/ofwpci.c:1.16
--- src/sys/arch/ofppc/pci/ofwpci.c:1.15 Sun Nov 10 21:16:31 2019
+++ src/sys/arch/ofppc/pci/ofwpci.c Sun Jun 14 01:40:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwpci.c,v 1.15 2019/11/10 21:16:31 chs Exp $ */
+/* $NetBSD: ofwpci.c,v 1.16 2020/06/14 01:40:04 chs Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.15 2019/11/10 21:16:31 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwpci.c,v 1.16 2020/06/14 01:40:04 chs Exp $");
#include "opt_pci.h"
@@ -211,9 +211,9 @@ ofwpci_attach(device_t parent, device_t
ioext = extent_create("pciio",
modeldata.pciiodata[device_unit(self)].start,
modeldata.pciiodata[device_unit(self)].limit,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", sc->sc_memt.pbs_base,
- sc->sc_memt.pbs_limit-1, NULL, 0, EX_NOWAIT);
+ sc->sc_memt.pbs_limit-1, NULL, 0, EX_WAITOK);
if (pci_configure_bus(pc, ioext, memext, NULL, 0, CACHELINESIZE))
aprint_error("pci_configure_bus() failed\n");
Index: src/sys/arch/powerpc/ibm4xx/pci/pchb.c
diff -u src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.11 src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.12
--- src/sys/arch/powerpc/ibm4xx/pci/pchb.c:1.11 Fri Jan 27 18:53:00 2012
+++ src/sys/arch/powerpc/ibm4xx/pci/pchb.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pchb.c,v 1.11 2012/01/27 18:53:00 para Exp $ */
+/* $NetBSD: pchb.c,v 1.12 2020/06/14 01:40:05 chs Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.11 2012/01/27 18:53:00 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.12 2020/06/14 01:40:05 chs Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -162,10 +162,10 @@ pchbattach(device_t parent, device_t sel
struct extent *memext = extent_create("pcimem",
IBM405GP_PCI_MEM_START,
IBM405GP_PCI_MEM_START + 0x1fffffff, NULL, 0,
- EX_NOWAIT);
+ EX_WAITOK);
struct extent *ioext = extent_create("pciio",
IBM405GP_PCI_PCI_IO_START,
- IBM405GP_PCI_PCI_IO_START + 0xffff, NULL, 0, EX_NOWAIT);
+ IBM405GP_PCI_PCI_IO_START + 0xffff, NULL, 0, EX_WAITOK);
pci_configure_bus(pc, ioext, memext, NULL, 0, 32);
extent_destroy(ioext);
extent_destroy(memext);
Index: src/sys/arch/prep/prep/mainbus.c
diff -u src/sys/arch/prep/prep/mainbus.c:1.35 src/sys/arch/prep/prep/mainbus.c:1.36
--- src/sys/arch/prep/prep/mainbus.c:1.35 Sun Nov 10 21:16:32 2019
+++ src/sys/arch/prep/prep/mainbus.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.35 2019/11/10 21:16:32 chs Exp $ */
+/* $NetBSD: mainbus.c,v 1.36 2020/06/14 01:40:05 chs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.35 2019/11/10 21:16:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2020/06/14 01:40:05 chs Exp $");
#include "opt_pci.h"
#include "opt_residual.h"
@@ -146,9 +146,9 @@ mainbus_attach(device_t parent, device_t
#ifdef PCI_NETBSD_CONFIGURE
ioext = extent_create("pciio", 0x00008000, 0x0000ffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x00000000, 0x0fffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(genppc_pct, ioext, memext, NULL, 0, CACHELINESIZE);
Index: src/sys/arch/sandpoint/sandpoint/mainbus.c
diff -u src/sys/arch/sandpoint/sandpoint/mainbus.c:1.30 src/sys/arch/sandpoint/sandpoint/mainbus.c:1.31
--- src/sys/arch/sandpoint/sandpoint/mainbus.c:1.30 Mon Sep 7 23:00:08 2015
+++ src/sys/arch/sandpoint/sandpoint/mainbus.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.30 2015/09/07 23:00:08 phx Exp $ */
+/* $NetBSD: mainbus.c,v 1.31 2020/06/14 01:40:05 chs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.30 2015/09/07 23:00:08 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.31 2020/06/14 01:40:05 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -114,9 +114,9 @@ mainbus_attach(device_t parent, device_t
#if NPCI > 0
#if defined(PCI_NETBSD_CONFIGURE)
ioext = extent_create("pciio", 0x00001000, 0x0000ffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", 0x80000000, 0x8fffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(0, ioext, memext, NULL, 0, 32);
Index: src/sys/arch/sgimips/gio/pci_gio.c
diff -u src/sys/arch/sgimips/gio/pci_gio.c:1.15 src/sys/arch/sgimips/gio/pci_gio.c:1.16
--- src/sys/arch/sgimips/gio/pci_gio.c:1.15 Fri Oct 2 05:22:52 2015
+++ src/sys/arch/sgimips/gio/pci_gio.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_gio.c,v 1.15 2015/10/02 05:22:52 msaitoh Exp $ */
+/* $NetBSD: pci_gio.c,v 1.16 2020/06/14 01:40:05 chs Exp $ */
/*
* Copyright (c) 2006 Stephen M. Rumble
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.15 2015/10/02 05:22:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v 1.16 2020/06/14 01:40:05 chs Exp $");
/*
* Glue for PCI devices that are connected to the GIO bus by various little
@@ -221,7 +221,7 @@ giopci_attach(device_t parent, device_t
#ifdef PCI_NETBSD_CONFIGURE
pc->pc_memext = extent_create("giopcimem", m_start, m_end,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(pc, NULL, pc->pc_memext, NULL, 0,
mips_cache_info.mci_dcache_align);
#endif
Index: src/sys/arch/sgimips/mace/pci_mace.c
diff -u src/sys/arch/sgimips/mace/pci_mace.c:1.21 src/sys/arch/sgimips/mace/pci_mace.c:1.22
--- src/sys/arch/sgimips/mace/pci_mace.c:1.21 Fri Aug 5 20:21:58 2016
+++ src/sys/arch/sgimips/mace/pci_mace.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_mace.c,v 1.21 2016/08/05 20:21:58 macallan Exp $ */
+/* $NetBSD: pci_mace.c,v 1.22 2020/06/14 01:40:05 chs Exp $ */
/*
* Copyright (c) 2001,2003 Christopher Sekiya
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.21 2016/08/05 20:21:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v 1.22 2020/06/14 01:40:05 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -163,15 +163,15 @@ macepci_attach(device_t parent, device_t
#if NPCI > 0
#ifdef USE_HIGH_PCI
pc->pc_ioext = extent_create("macepciio", 0x00001000, 0x01ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pc->pc_memext = extent_create("macepcimem", 0x80000000, 0xffffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
#else
pc->pc_ioext = extent_create("macepciio", 0x00001000, 0x01ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
/* XXX no idea why we limit ourselves to only half of the 32MB window */
pc->pc_memext = extent_create("macepcimem", 0x80100000, 0x81ffffff,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
#endif /* USE_HIGH_PCI */
pci_configure_bus(pc, pc->pc_ioext, pc->pc_memext, NULL, 0,
mips_cache_info.mci_dcache_align);
Index: src/sys/arch/sh3/dev/shpcic.c
diff -u src/sys/arch/sh3/dev/shpcic.c:1.18 src/sys/arch/sh3/dev/shpcic.c:1.19
--- src/sys/arch/sh3/dev/shpcic.c:1.18 Fri Oct 2 05:22:52 2015
+++ src/sys/arch/sh3/dev/shpcic.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: shpcic.c,v 1.18 2015/10/02 05:22:52 msaitoh Exp $ */
+/* $NetBSD: shpcic.c,v 1.19 2020/06/14 01:40:05 chs Exp $ */
/*-
* Copyright (C) 2005 NONAKA Kimihiro <non...@netbsd.org>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.18 2015/10/02 05:22:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.19 2020/06/14 01:40:05 chs Exp $");
#include "opt_pci.h"
@@ -228,10 +228,10 @@ shpcic_attach(device_t parent, device_t
#ifdef PCI_NETBSD_CONFIGURE
ioext = extent_create("pciio",
SH4_PCIC_IO, SH4_PCIC_IO + SH4_PCIC_IO_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem",
SH4_PCIC_MEM, SH4_PCIC_MEM + SH4_PCIC_MEM_SIZE - 1,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(NULL, ioext, memext, NULL, 0, sh_cache_line_size);
Index: src/sys/arch/sparc/dev/vme_machdep.c
diff -u src/sys/arch/sparc/dev/vme_machdep.c:1.69 src/sys/arch/sparc/dev/vme_machdep.c:1.70
--- src/sys/arch/sparc/dev/vme_machdep.c:1.69 Sun Nov 10 21:16:32 2019
+++ src/sys/arch/sparc/dev/vme_machdep.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.69 2019/11/10 21:16:32 chs Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.70 2020/06/14 01:40:05 chs Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.69 2019/11/10 21:16:32 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.70 2020/06/14 01:40:05 chs Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@@ -315,9 +315,7 @@ vmeattach_mainbus(device_t parent, devic
sizeof(vmebus_translations)/sizeof(vmebus_translations[0]);
vme_dvmamap = extent_create("vmedvma", VME4_DVMA_BASE, VME4_DVMA_END,
- 0, 0, EX_NOWAIT);
- if (vme_dvmamap == NULL)
- panic("vme: unable to allocate DVMA map");
+ 0, 0, EX_WAITOK);
printf("\n");
(void)config_found(self, &vba, 0);
Index: src/sys/arch/sparc/sparc/iommu.c
diff -u src/sys/arch/sparc/sparc/iommu.c:1.95 src/sys/arch/sparc/sparc/iommu.c:1.96
--- src/sys/arch/sparc/sparc/iommu.c:1.95 Fri Jan 27 18:53:02 2012
+++ src/sys/arch/sparc/sparc/iommu.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: iommu.c,v 1.95 2012/01/27 18:53:02 para Exp $ */
+/* $NetBSD: iommu.c,v 1.96 2020/06/14 01:40:05 chs Exp $ */
/*
* Copyright (c) 1996
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.95 2012/01/27 18:53:02 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.96 2020/06/14 01:40:05 chs Exp $");
#include "opt_sparc_arch.h"
@@ -276,9 +276,7 @@ iommu_attach(device_t parent, device_t s
sc->sc_dvmamap = extent_create("iommudvma",
IOMMU_DVMA_BASE, IOMMU_DVMA_END,
- 0, 0, EX_NOWAIT);
- if (sc->sc_dvmamap == NULL)
- panic("iommu: unable to allocate DVMA map");
+ 0, 0, EX_WAITOK);
/*
* If we are attaching implicit iommu on JS1/OF we do not have
Index: src/sys/arch/sparc64/dev/sbus.c
diff -u src/sys/arch/sparc64/dev/sbus.c:1.98 src/sys/arch/sparc64/dev/sbus.c:1.99
--- src/sys/arch/sparc64/dev/sbus.c:1.98 Wed Jan 1 22:57:16 2020
+++ src/sys/arch/sparc64/dev/sbus.c Sun Jun 14 01:40:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.98 2020/01/01 22:57:16 thorpej Exp $ */
+/* $NetBSD: sbus.c,v 1.99 2020/06/14 01:40:05 chs Exp $ */
/*
* Copyright (c) 1999-2002 Eduardo Horvath
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.98 2020/01/01 22:57:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.99 2020/06/14 01:40:05 chs Exp $");
#include "opt_ddb.h"
@@ -273,7 +273,7 @@ sbus_attach(device_t parent, device_t se
if (extent_alloc_subregion(sc->sc_is.is_dvmamap,
sc->sc_is.is_dvmabase, sc->sc_is.is_dvmabase + PAGE_SIZE,
- PAGE_SIZE, PAGE_SIZE, 0, EX_NOWAIT|EX_BOUNDZERO,
+ PAGE_SIZE, PAGE_SIZE, 0, EX_WAITOK|EX_BOUNDZERO,
(u_long *)&dummy) != 0)
panic("sbus iommu: can't toss first dvma page");
}
Index: src/sys/arch/vax/uba/qv.c
diff -u src/sys/arch/vax/uba/qv.c:1.34 src/sys/arch/vax/uba/qv.c:1.35
--- src/sys/arch/vax/uba/qv.c:1.34 Thu Mar 14 23:49:38 2019
+++ src/sys/arch/vax/uba/qv.c Sun Jun 14 01:40:06 2020
@@ -1,4 +1,4 @@
-/*$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.34 2019/03/14 23:49:38 thorpej Exp $*/
+/* $NetBSD: qv.c,v 1.35 2020/06/14 01:40:06 chs Exp $ */
/*
* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from smg.c
@@ -31,7 +31,7 @@
/*3456789012345678901234567890123456789012345678901234567890123456789012345678*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$Header: /cvsroot/src/sys/arch/vax/uba/qv.c,v 1.34 2019/03/14 23:49:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qv.c,v 1.35 2020/06/14 01:40:06 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -428,7 +428,7 @@ qv_attach(device_t parent, device_t self
sc->sc_scanmap = (uint16_t *)&sc->sc_fb[QV_SCANMAP];
#if 0
if (extent_alloc_region(((struct uba_vsoftc*)uh)->uv_sgmap.aps_ex,
- sc->sc_fbphys & 0x3fffff, QVSIZE, EX_NOWAIT)) {
+ sc->sc_fbphys & 0x3fffff, QVSIZE, EX_WAITOK)) {
aprint_error_dev(self,
"Couldn't alloc graphics memory in sgmap.\n");
return;
Index: src/sys/arch/x68k/dev/intio.c
diff -u src/sys/arch/x68k/dev/intio.c:1.46 src/sys/arch/x68k/dev/intio.c:1.47
--- src/sys/arch/x68k/dev/intio.c:1.46 Sun Nov 10 21:16:33 2019
+++ src/sys/arch/x68k/dev/intio.c Sun Jun 14 01:40:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intio.c,v 1.46 2019/11/10 21:16:33 chs Exp $ */
+/* $NetBSD: intio.c,v 1.47 2020/06/14 01:40:06 chs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.46 2019/11/10 21:16:33 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio.c,v 1.47 2020/06/14 01:40:06 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,7 +162,7 @@ intio_attach(device_t parent, device_t s
sc->sc_map = extent_create("intiomap",
INTIOBASE,
INTIOBASE + 0x400000,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
intio_alloc_system_ports(sc);
sc->sc_bst = &intio_bus;
Index: src/sys/dev/ic/cpc700.c
diff -u src/sys/dev/ic/cpc700.c:1.19 src/sys/dev/ic/cpc700.c:1.20
--- src/sys/dev/ic/cpc700.c:1.19 Fri Jan 27 18:53:07 2012
+++ src/sys/dev/ic/cpc700.c Sun Jun 14 01:40:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc700.c,v 1.19 2012/01/27 18:53:07 para Exp $ */
+/* $NetBSD: cpc700.c,v 1.20 2020/06/14 01:40:06 chs Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.19 2012/01/27 18:53:07 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.20 2020/06/14 01:40:06 chs Exp $");
#include "pci.h"
#include "opt_pci.h"
@@ -191,9 +191,9 @@ cpc_attach(device_t self, pci_chipset_ta
#if NPCI > 0 && defined(PCI_NETBSD_CONFIGURE)
ioext = extent_create("pciio", CPC_PCI_IO_START, CPC_PCI_IO_END,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
memext = extent_create("pcimem", CPC_PCI_MEM_BASE, CPC_PCI_MEM_END,
- NULL, 0, EX_NOWAIT);
+ NULL, 0, EX_WAITOK);
pci_configure_bus(0, ioext, memext, NULL, 0, 32);
Index: src/sys/dev/marvell/gtpci.c
diff -u src/sys/dev/marvell/gtpci.c:1.32 src/sys/dev/marvell/gtpci.c:1.33
--- src/sys/dev/marvell/gtpci.c:1.32 Fri Oct 2 05:22:52 2015
+++ src/sys/dev/marvell/gtpci.c Sun Jun 14 01:40:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpci.c,v 1.32 2015/10/02 05:22:52 msaitoh Exp $ */
+/* $NetBSD: gtpci.c,v 1.33 2020/06/14 01:40:06 chs Exp $ */
/*
* Copyright (c) 2008, 2009 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.32 2015/10/02 05:22:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.33 2020/06/14 01:40:06 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -454,20 +454,14 @@ gtpci_pci_config(struct gtpci_softc *sc,
p2pc = GTPCI_READ(sc, GTPCI_P2PC);
#ifdef PCI_NETBSD_CONFIGURE
- ioext = extent_create("pciio", iostart, ioend, NULL, 0, EX_NOWAIT);
- memext = extent_create("pcimem", memstart, memend, NULL, 0, EX_NOWAIT);
- if (ioext != NULL && memext != NULL)
- pci_configure_bus(pc, ioext, memext, NULL,
- GTPCI_P2PC_BUSNUMBER(p2pc), cacheline_size);
- else
- aprint_error_dev(sc->sc_dev, "can't create extent %s%s%s\n",
- ioext == NULL ? "io" : "",
- ioext == NULL && memext == NULL ? " and " : "",
- memext == NULL ? "mem" : "");
- if (ioext != NULL)
- extent_destroy(ioext);
- if (memext != NULL)
- extent_destroy(memext);
+ ioext = extent_create("pciio", iostart, ioend, NULL, 0, EX_WAITOK);
+ memext = extent_create("pcimem", memstart, memend, NULL, 0, EX_WAITOK);
+
+ pci_configure_bus(pc, ioext, memext, NULL,
+ GTPCI_P2PC_BUSNUMBER(p2pc), cacheline_size);
+
+ extent_destroy(ioext);
+ extent_destroy(memext);
#endif
pba.pba_iot = iot;
Index: src/sys/dev/marvell/mvpex.c
diff -u src/sys/dev/marvell/mvpex.c:1.18 src/sys/dev/marvell/mvpex.c:1.19
--- src/sys/dev/marvell/mvpex.c:1.18 Sun Nov 10 21:16:35 2019
+++ src/sys/dev/marvell/mvpex.c Sun Jun 14 01:40:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mvpex.c,v 1.18 2019/11/10 21:16:35 chs Exp $ */
+/* $NetBSD: mvpex.c,v 1.19 2020/06/14 01:40:06 chs Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.18 2019/11/10 21:16:35 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.19 2020/06/14 01:40:06 chs Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -417,20 +417,14 @@ mvpex_pci_config(struct mvpex_softc *sc,
stat = bus_space_read_4(sc->sc_iot, sc->sc_ioh, MVPEX_STAT);
#ifdef PCI_NETBSD_CONFIGURE
- ioext = extent_create("pexio", iostart, ioend, NULL, 0, EX_NOWAIT);
- memext = extent_create("pexmem", memstart, memend, NULL, 0, EX_NOWAIT);
- if (ioext != NULL && memext != NULL)
- pci_configure_bus(pc, ioext, memext, NULL,
- MVPEX_STAT_PEXBUSNUM(stat), cacheline_size);
- else
- aprint_error_dev(sc->sc_dev, "can't create extent %s%s%s\n",
- ioext == NULL ? "io" : "",
- ioext == NULL && memext == NULL ? " and " : "",
- memext == NULL ? "mem" : "");
- if (ioext != NULL)
- extent_destroy(ioext);
- if (memext != NULL)
- extent_destroy(memext);
+ ioext = extent_create("pexio", iostart, ioend, NULL, 0, EX_WAITOK);
+ memext = extent_create("pexmem", memstart, memend, NULL, 0, EX_WAITOK);
+
+ pci_configure_bus(pc, ioext, memext, NULL,
+ MVPEX_STAT_PEXBUSNUM(stat), cacheline_size);
+
+ extent_destroy(ioext);
+ extent_destroy(memext);
#endif
pba.pba_iot = iot;
