From a896fd552047fd667af65927fa7ed7502d6193d2 Mon Sep 17 00:00:00 2001 From: jmcneill Date: Wed, 12 Jun 2019 22:47:03 +0000 Subject: [PATCH] Support configuring ranges where only prefetchable memory is defined --- sys/arch/arm/fdt/pcihost_fdt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/arch/arm/fdt/pcihost_fdt.c b/sys/arch/arm/fdt/pcihost_fdt.c index 331979c5faa8..ef0875d1ae03 100644 --- a/sys/arch/arm/fdt/pcihost_fdt.c +++ b/sys/arch/arm/fdt/pcihost_fdt.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcihost_fdt.c,v 1.9 2019/06/12 10:13:44 jmcneill Exp $ */ +/* $NetBSD: pcihost_fdt.c,v 1.10 2019/06/12 22:47:03 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.9 2019/06/12 10:13:44 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.10 2019/06/12 22:47:03 jmcneill Exp $"); #include #include @@ -347,6 +347,11 @@ pcihost_config(struct pcihost_softc *sc) } } + if (memext == NULL && pmemext != NULL) { + memext = pmemext; + pmemext = NULL; + } + error = pci_configure_bus(&sc->sc_pc, ioext, memext, pmemext, sc->sc_bus_min, PCIHOST_CACHELINE_SIZE); if (ioext)