Module Name:    src
Committed By:   jmcneill
Date:           Wed Jun 12 22:47:03 UTC 2019

Modified Files:
        src/sys/arch/arm/fdt: pcihost_fdt.c

Log Message:
Support configuring ranges where only prefetchable memory is defined


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/pcihost_fdt.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/arm/fdt/pcihost_fdt.c
diff -u src/sys/arch/arm/fdt/pcihost_fdt.c:1.9 src/sys/arch/arm/fdt/pcihost_fdt.c:1.10
--- src/sys/arch/arm/fdt/pcihost_fdt.c:1.9	Wed Jun 12 10:13:44 2019
+++ src/sys/arch/arm/fdt/pcihost_fdt.c	Wed Jun 12 22:47:03 2019
@@ -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 <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__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 <sys/param.h>
 #include <sys/bus.h>
@@ -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)

Reply via email to