summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/conf/options1
-rw-r--r--sys/dev/pci/pci_pci.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 066911f..ef111b5 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -417,6 +417,7 @@ MSGBUF_SIZE opt_msgbuf.h
# PCI related options
PCI_QUIET opt_pci.h
PCI_ENABLE_IO_MODES opt_pci.h
+PCI_ALLOW_UNSUPPORTED_IO_RANGE opt_pci.h
# NFS options
NFS_MINATTRTIMO opt_nfs.h
diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
index 0a4be2d..166f490 100644
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -45,6 +45,7 @@
#include <pci/pcireg.h>
#include "pcib_if.h"
+#include "opt_pci.h"
/*
* Bridge-specific data.
@@ -281,6 +282,10 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
*/
switch (type) {
case SYS_RES_IOPORT:
+ if (start < sc->iobase)
+ start = sc->iobase;
+ if (end > sc->iolimit && start < end)
+ end = sc->iolimit;
if ((start < sc->iobase) || (end > sc->iolimit)) {
device_printf(dev, "device %s%d requested unsupported I/O range 0x%lx-0x%lx"
" (decoding 0x%x-0x%x)\n",
OpenPOWER on IntegriCloud