[src/trunk]: src/sys/arch/arm/fdt Read the linux,pci-probe-only property from...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/54088c5464c1
branches:  trunk
changeset: 944752:54088c5464c1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Oct 10 09:58:16 2020 +0000

description:
Read the linux,pci-probe-only property from the /chosen node, not the PCI host controller node

diffstat:

 sys/arch/arm/fdt/pcihost_fdt.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r c05b7348d48e -r 54088c5464c1 sys/arch/arm/fdt/pcihost_fdt.c
--- a/sys/arch/arm/fdt/pcihost_fdt.c    Sat Oct 10 09:17:33 2020 +0000
+++ b/sys/arch/arm/fdt/pcihost_fdt.c    Sat Oct 10 09:58:16 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcihost_fdt.c,v 1.17 2020/07/07 03:38:45 thorpej Exp $ */
+/* $NetBSD: pcihost_fdt.c,v 1.18 2020/10/10 09:58:16 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.17 2020/07/07 03:38:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.18 2020/10/10 09:58:16 jmcneill Exp $");
 
 #include <sys/param.h>
 
@@ -245,7 +245,8 @@
        /*
         * If this flag is set, skip configuration of the PCI bus and use existing config.
         */
-       if (of_getprop_uint32(sc->sc_phandle, "linux,pci-probe-only", &probe_only))
+       const int chosen = OF_finddevice("/chosen");
+       if (chosen <= 0 || of_getprop_uint32(chosen, "linux,pci-probe-only", &probe_only))
                probe_only = 0;
        if (probe_only)
                return 0;