Module Name: src
Committed By: macallan
Date: Thu May 26 17:38:06 UTC 2016
Modified Files:
src/sys/arch/powerpc/pic: intr.c ipi_openpic.c pic_openpic.c
Log Message:
treat IPIs like regular interrupts at IPL_HIGH
should fix port-powerpc/44387
tested by chuq
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/pic/intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/pic/ipi_openpic.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/pic_openpic.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/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.23 src/sys/arch/powerpc/pic/intr.c:1.24
--- src/sys/arch/powerpc/pic/intr.c:1.23 Fri Aug 31 13:12:52 2012
+++ src/sys/arch/powerpc/pic/intr.c Thu May 26 17:38:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.23 2012/08/31 13:12:52 macallan Exp $ */
+/* $NetBSD: intr.c,v 1.24 2016/05/26 17:38:05 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.23 2012/08/31 13:12:52 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.24 2016/05/26 17:38:05 macallan Exp $");
#include "opt_interrupt.h"
#include "opt_multiprocessor.h"
@@ -548,18 +548,8 @@ pic_handle_intr(void *cookie)
const int pcpl = ci->ci_cpl;
do {
-#ifdef MULTIPROCESSOR
- /* THIS IS WRONG XXX */
- if (picirq == ipiops.ppc_ipi_vector) {
- ci->ci_cpl = IPL_HIGH;
- ipi_intr(NULL);
- ci->ci_cpl = pcpl;
- pic->pic_ack_irq(pic, picirq);
- continue;
- }
-#endif
-
const int virq = virq_map[picirq + pic->pic_intrbase];
+
KASSERT(virq != 0);
KASSERT(picirq < pic->pic_numintrs);
imask_t v_imen = PIC_VIRQ_TO_MASK(virq);
Index: src/sys/arch/powerpc/pic/ipi_openpic.c
diff -u src/sys/arch/powerpc/pic/ipi_openpic.c:1.7 src/sys/arch/powerpc/pic/ipi_openpic.c:1.8
--- src/sys/arch/powerpc/pic/ipi_openpic.c:1.7 Wed Feb 1 09:54:03 2012
+++ src/sys/arch/powerpc/pic/ipi_openpic.c Thu May 26 17:38:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi_openpic.c,v 1.7 2012/02/01 09:54:03 matt Exp $ */
+/* $NetBSD: ipi_openpic.c,v 1.8 2016/05/26 17:38:05 macallan Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.7 2012/02/01 09:54:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi_openpic.c,v 1.8 2016/05/26 17:38:05 macallan Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
@@ -103,15 +103,7 @@ openpic_send_ipi(cpuid_t target, uint32_
static void
openpic_establish_ipi(int type, int level, void *ih_args)
{
-/*
- * XXX
- * for now we catch IPIs early in pic_handle_intr() so no need to do anything
- * here
- */
-#if 0
- intr_establish(ipiops.ppc_ipi_vector, type, level, ppcipi_intr,
- ih_args);
-#endif
+ intr_establish(ipiops.ppc_ipi_vector, type, level, ipi_intr, ih_args);
}
#endif /*MULTIPROCESSOR*/
Index: src/sys/arch/powerpc/pic/pic_openpic.c
diff -u src/sys/arch/powerpc/pic/pic_openpic.c:1.8 src/sys/arch/powerpc/pic/pic_openpic.c:1.9
--- src/sys/arch/powerpc/pic/pic_openpic.c:1.8 Wed Feb 1 09:54:03 2012
+++ src/sys/arch/powerpc/pic/pic_openpic.c Thu May 26 17:38:05 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_openpic.c,v 1.8 2012/02/01 09:54:03 matt Exp $ */
+/* $NetBSD: pic_openpic.c,v 1.9 2016/05/26 17:38:05 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.8 2012/02/01 09:54:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.9 2016/05/26 17:38:05 macallan Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -67,7 +67,7 @@ setup_openpic(void *addr, int passthroug
"Supports %d CPUs and %d interrupt sources.\n",
x & 0xff, ((x & 0x1f00) >> 8) + 1, ((x & 0x07ff0000) >> 16) + 1);
- pic->pic_numintrs = ((x & 0x07ff0000) >> 16) + 1;
+ pic->pic_numintrs = ((x & 0x07ff0000) >> 16) + 2; /* one more slot for IPI */
pic->pic_cookie = addr;
pic->pic_enable_irq = opic_enable_irq;
pic->pic_reenable_irq = opic_enable_irq;
