Module Name: src
Committed By: jmcneill
Date: Sun Feb 16 09:55:00 UTC 2025
Modified Files:
src/sys/arch/powerpc/pic: intr.c
Log Message:
powerpc: Mask interrupts after returning from handler.
Now that we are explicitly masking interrupts on entry of pic_handle_intr,
we need to disable (instead of store) interrupts after calling
intr_deliver.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/powerpc/pic/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/arch/powerpc/pic/intr.c
diff -u src/sys/arch/powerpc/pic/intr.c:1.35 src/sys/arch/powerpc/pic/intr.c:1.36
--- src/sys/arch/powerpc/pic/intr.c:1.35 Sat Feb 15 00:30:49 2025
+++ src/sys/arch/powerpc/pic/intr.c Sun Feb 16 09:55:00 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.35 2025/02/15 00:30:49 jmcneill Exp $ */
+/* $NetBSD: intr.c,v 1.36 2025/02/16 09:55:00 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -29,7 +29,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.35 2025/02/15 00:30:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.36 2025/02/16 09:55:00 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_interrupt.h"
@@ -590,7 +590,7 @@ pic_handle_intr(void *cookie)
splraise(is->is_ipl);
mtmsr(msr | PSL_EE);
intr_deliver(is, virq);
- mtmsr(msr);
+ mtmsr(msr & ~PSL_EE);
ci->ci_cpl = pcpl;
ci->ci_data.cpu_nintr++;
