[src/trunk]: src/sys/arch/arm/cortex Fix ITT size, only need to MAPD once per...

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

details:   https://anonhg.NetBSD.org/src/rev/dd4ff5169bd1
branches:  trunk
changeset: 837200:dd4ff5169bd1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Nov 23 11:48:12 2018 +0000

description:
Fix ITT size, only need to MAPD once per device.

diffstat:

 sys/arch/arm/cortex/gicv3_its.c |  34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diffs (98 lines):

diff -r 0306f398500b -r dd4ff5169bd1 sys/arch/arm/cortex/gicv3_its.c
--- a/sys/arch/arm/cortex/gicv3_its.c   Fri Nov 23 11:38:07 2018 +0000
+++ b/sys/arch/arm/cortex/gicv3_its.c   Fri Nov 23 11:48:12 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.5 2018/11/22 20:47:37 jakllsch Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.6 2018/11/23 11:48:12 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.5 2018/11/22 20:47:37 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.6 2018/11/23 11:48:12 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -281,26 +281,30 @@
        return (b << 8) | (d << 3) | f;
 }
 
-static struct gicv3_its_device *
-gicv3_its_device_lookup(struct gicv3_its *its, uint32_t devid)
+static void
+gicv3_its_device_map(struct gicv3_its *its, uint32_t devid)
 {
        struct gicv3_its_device *dev;
 
        LIST_FOREACH(dev, &its->its_devices, dev_list)
                if (dev->dev_id == devid)
-                       return dev;
+                       return;
 
        const uint64_t typer = gits_read_8(its, GITS_TYPER);
        const u_int id_bits = __SHIFTOUT(typer, GITS_TYPER_ID_bits) + 1;
        const u_int itt_entry_size = __SHIFTOUT(typer, GITS_TYPER_ITT_entry_size) + 1;
-       const u_int itt_size = roundup2(itt_entry_size * (1 << id_bits), GITS_ITT_ALIGN);
+       const u_int itt_size = roundup2((itt_entry_size * (1 << id_bits)) / NBBY, GITS_ITT_ALIGN);
 
        dev = kmem_alloc(sizeof(*dev), KM_SLEEP);
        dev->dev_id = devid;
        gicv3_dma_alloc(its->its_gic, &dev->dev_itt, itt_size, GITS_ITT_ALIGN);
        LIST_INSERT_HEAD(&its->its_devices, dev, dev_list);
 
-       return dev;
+       /*
+        * Map the device to the ITT
+        */
+       gits_command_mapd(its, devid, dev->dev_itt.segs[0].ds_addr, id_bits - 1, true);
+       gits_wait(its);
 }
 
 static void
@@ -397,7 +401,6 @@
 {
        struct gicv3_its * const its = msi->msi_priv;
        struct cpu_info * const ci = cpu_lookup(0);
-       struct gicv3_its_device *dev;
        pci_intr_handle_t *vectors;
        int n, off;
 
@@ -411,12 +414,7 @@
 
        const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
 
-       /*
-        * Map device
-        */
-       dev = gicv3_its_device_lookup(its, devid);
-       gits_command_mapd(its, devid, dev->dev_itt.segs[0].ds_addr, id_bits - 1, true);
-       gits_wait(its);
+       gicv3_its_device_map(its, devid);
 
        vectors = kmem_alloc(sizeof(*vectors) * *count, KM_SLEEP);
        for (n = 0; n < *count; n++) {
@@ -450,7 +448,6 @@
 {
        struct gicv3_its * const its = msi->msi_priv;
        struct cpu_info *ci = cpu_lookup(0);
-       struct gicv3_its_device *dev;
        pci_intr_handle_t *vectors;
        bus_space_tag_t bst;
        bus_space_handle_t bsh;
@@ -482,12 +479,7 @@
 
        const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
 
-       /*
-        * Map device
-        */
-       dev = gicv3_its_device_lookup(its, devid);
-       gits_command_mapd(its, devid, dev->dev_itt.segs[0].ds_addr, id_bits - 1, true);
-       gits_wait(its);
+       gicv3_its_device_map(its, devid);
 
        vectors = kmem_alloc(sizeof(*vectors) * *count, KM_SLEEP);
        for (n = 0; n < *count; n++) {