[src/trunk]: src/sys/dev/fdt Avoid using the "interrupt-map" table on our own...

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

details:   https://anonhg.NetBSD.org/src/rev/5a03c953f9f6
branches:  trunk
changeset: 445793:5a03c953f9f6
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Tue Nov 13 01:06:37 2018 +0000

description:
Avoid using the "interrupt-map" table on our own interrupts.

This is needed by the rk3399.dtsi's pcie0 node, which needs to map its
interrupts an entity other than itself.

Suggested by jmcneill@

diffstat:

 sys/dev/fdt/fdt_intr.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r f884c03c1df6 -r 5a03c953f9f6 sys/dev/fdt/fdt_intr.c
--- a/sys/dev/fdt/fdt_intr.c    Mon Nov 12 20:54:03 2018 +0000
+++ b/sys/dev/fdt/fdt_intr.c    Tue Nov 13 01:06:37 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_intr.c,v 1.19 2018/10/21 05:32:39 skrll Exp $ */
+/* $NetBSD: fdt_intr.c,v 1.20 2018/11/13 01:06:37 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.19 2018/10/21 05:32:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.20 2018/11/13 01:06:37 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -91,7 +91,7 @@
                 * If the node has an interrupt-map, use it. The caller is responsible
                 * for parsing the interrupt-map and finding the real interrupt parent.
                 */
-               if (of_hasprop(iparent, "interrupt-map"))
+               if (phandle != iparent && of_hasprop(iparent, "interrupt-map"))
                        return iparent;
 
                /*