Module Name:    src
Committed By:   jakllsch
Date:           Thu Nov 22 20:47:38 UTC 2018

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

Log Message:
use correct interrupt index

fixes intrctl list

from jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 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.4 src/sys/arch/arm/cortex/gicv3_its.c:1.5
--- src/sys/arch/arm/cortex/gicv3_its.c:1.4	Wed Nov 21 11:44:26 2018
+++ src/sys/arch/arm/cortex/gicv3_its.c	Thu Nov 22 20:47:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.4 2018/11/21 11:44:26 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.5 2018/11/22 20:47:37 jakllsch 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.4 2018/11/21 11:44:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.5 2018/11/22 20:47:37 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -693,7 +693,7 @@ gicv3_its_get_affinity(void *priv, size_
 	struct cpu_info *ci;
 
 	kcpuset_zero(affinity);
-	ci = its->its_targets[irq - its->its_pic->pic_irqbase];
+	ci = its->its_targets[irq];
 	if (ci)
 		kcpuset_set(affinity, cpu_index(ci));
 }
@@ -709,7 +709,7 @@ gicv3_its_set_affinity(void *priv, size_
 	if (set != 1)
 		return EINVAL;
 
-	pa = its->its_pa[irq - its->its_pic->pic_irqbase];
+	pa = its->its_pa[irq];
 	if (pa == NULL)
 		return EINVAL;
 
@@ -719,7 +719,7 @@ gicv3_its_set_affinity(void *priv, size_
 	gits_command_movi(its, devid, devid, cpu_index(ci));
 	gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
 
-	its->its_targets[irq - its->its_pic->pic_irqbase] = ci;
+	its->its_targets[irq] = ci;
 
 	return 0;
 }

Reply via email to