Module Name: src
Committed By: jakllsch
Date: Tue Nov 13 01:06:37 UTC 2018
Modified Files:
src/sys/dev/fdt: fdt_intr.c
Log Message:
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@
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/fdt/fdt_intr.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/dev/fdt/fdt_intr.c
diff -u src/sys/dev/fdt/fdt_intr.c:1.19 src/sys/dev/fdt/fdt_intr.c:1.20
--- src/sys/dev/fdt/fdt_intr.c:1.19 Sun Oct 21 05:32:39 2018
+++ src/sys/dev/fdt/fdt_intr.c Tue Nov 13 01:06:37 2018
@@ -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 <[email protected]>
@@ -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 @@ fdtbus_get_interrupt_parent(int phandle)
* 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;
/*
