[src/trunk]: src/sys/arch/arm/cortex Pass correct EventID to MOVI and INV com...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8c7cd13a9958
branches:  trunk
changeset: 457416:8c7cd13a9958
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jun 23 16:19:51 2019 +0000

description:
Pass correct EventID to MOVI and INV commands

diffstat:

 sys/arch/arm/cortex/gicv3_its.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 5c83d66e58c8 -r 8c7cd13a9958 sys/arch/arm/cortex/gicv3_its.c
--- a/sys/arch/arm/cortex/gicv3_its.c   Sun Jun 23 16:15:43 2019 +0000
+++ b/sys/arch/arm/cortex/gicv3_its.c   Sun Jun 23 16:19:51 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.16 2019/06/23 16:04:52 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.17 2019/06/23 16:19:51 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.16 2019/06/23 16:04:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.17 2019/06/23 16:19:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -579,7 +579,7 @@
        pa = its->its_pa[lpi - its->its_pic->pic_irqbase];
        KASSERT(pa != NULL);
        const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
-       gits_command_inv(its, devid, lpi);
+       gits_command_inv(its, devid, lpi - its->its_pic->pic_irqbase);
 
        return intrh;
 }
@@ -757,7 +757,7 @@
                KASSERT(pa != NULL);
 
                const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
-               gits_command_movi(its, devid, irq + its->its_pic->pic_irqbase, cpu_index(ci));
+               gits_command_movi(its, devid, irq, cpu_index(ci));
                gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
        }
 
@@ -796,7 +796,7 @@
 
        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, irq + its->its_pic->pic_irqbase, cpu_index(ci));
+               gits_command_movi(its, devid, irq, cpu_index(ci));
                gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
        }