Module Name:    src
Committed By:   jmcneill
Date:           Sun Jun 16 19:19:30 UTC 2019

Modified Files:
        src/sys/arch/arm/cortex: gicv3_its.c

Log Message:
Pass correct event ID with MOVI commands


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/cortex/gicv3_its.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/arm/cortex/gicv3_its.c
diff -u src/sys/arch/arm/cortex/gicv3_its.c:1.13 src/sys/arch/arm/cortex/gicv3_its.c:1.14
--- src/sys/arch/arm/cortex/gicv3_its.c:1.13	Sun Jun 16 11:05:58 2019
+++ src/sys/arch/arm/cortex/gicv3_its.c	Sun Jun 16 19:19:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.13 2019/06/16 11:05:58 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.14 2019/06/16 19:19:30 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.13 2019/06/16 11:05:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.14 2019/06/16 19:19:30 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -754,7 +754,7 @@ gicv3_its_cpu_init(void *priv, struct cp
 		KASSERT(pa != NULL);
 
 		const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
-		gits_command_movi(its, devid, devid, cpu_index(ci));
+		gits_command_movi(its, devid, irq + its->its_pic->pic_irqbase, cpu_index(ci));
 		gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
 	}
 
@@ -793,7 +793,7 @@ gicv3_its_set_affinity(void *priv, size_
 
 	if (its->its_cpuonline[cpu_index(ci)] == true) {
 		const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
-		gits_command_movi(its, devid, devid, cpu_index(ci));
+		gits_command_movi(its, devid, irq + its->its_pic->pic_irqbase, cpu_index(ci));
 		gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
 	}
 

Reply via email to