[src/trunk]: src/sys/arch/arm/cortex Ensure that the "size" parameter of MAPD...

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

details:   https://anonhg.NetBSD.org/src/rev/a51dcc586027
branches:  trunk
changeset: 452238:a51dcc586027
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jun 23 16:03:30 2019 +0000

description:
Ensure that the "size" parameter of MAPD matches the size of the ITT being
mapped and subtract the LPI base from EventID. Fixes multi-vector MSI/MSI-X
on RK3399.

diffstat:

 sys/arch/arm/cortex/gicv3_its.c |  28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diffs (93 lines):

diff -r 6baecfa845a0 -r a51dcc586027 sys/arch/arm/cortex/gicv3_its.c
--- a/sys/arch/arm/cortex/gicv3_its.c   Sun Jun 23 11:47:08 2019 +0000
+++ b/sys/arch/arm/cortex/gicv3_its.c   Sun Jun 23 16:03:30 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.14 2019/06/16 19:19:30 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.15 2019/06/23 16:03: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.14 2019/06/16 19:19:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.15 2019/06/23 16:03:30 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/kmem.h>
@@ -148,16 +148,17 @@
 }
 
 static inline void
-gits_command_mapi(struct gicv3_its *its, uint32_t deviceid, uint32_t eventid, uint16_t icid)
+gits_command_mapti(struct gicv3_its *its, uint32_t deviceid, uint32_t eventid, uint32_t pintid, uint16_t icid)
 {
        struct gicv3_its_command cmd;
 
        /*
-        * Map the event defined by EventID and DeviceID into an ITT entry with ICID and pINTID = EventID
+        * Map the event defined by EventID and DeviceID to its associated ITE, defined by ICID and pINTID
+        * in the ITT associated with DeviceID.
         */
        memset(&cmd, 0, sizeof(cmd));
-       cmd.dw[0] = GITS_CMD_MAPI | ((uint64_t)deviceid << 32);
-       cmd.dw[1] = eventid;
+       cmd.dw[0] = GITS_CMD_MAPTI | ((uint64_t)deviceid << 32);
+       cmd.dw[1] = eventid | ((uint64_t)pintid << 32);
        cmd.dw[2] = icid;
 
        gits_command(its, &cmd);
@@ -329,7 +330,8 @@
        /*
         * Map the device to the ITT
         */
-       gits_command_mapd(its, devid, dev->dev_itt.segs[0].ds_addr, id_bits - 1, true);
+       const u_int size = ilog2(vectors) - 1;
+       gits_command_mapd(its, devid, dev->dev_itt.segs[0].ds_addr, size, true);
        gits_wait(its);
 
        return 0;
@@ -363,11 +365,13 @@
                    addr & 0xffffffff);
                pci_conf_write(pc, tag, off + PCI_MSI_MADDR64_HI,
                    (addr >> 32) & 0xffffffff);
-               pci_conf_write(pc, tag, off + PCI_MSI_MDATA64, lpi);
+               pci_conf_write(pc, tag, off + PCI_MSI_MDATA64,
+                   lpi - its->its_pic->pic_irqbase);
        } else {
                pci_conf_write(pc, tag, off + PCI_MSI_MADDR,
                    addr & 0xffffffff);
-               pci_conf_write(pc, tag, off + PCI_MSI_MDATA, lpi);
+               pci_conf_write(pc, tag, off + PCI_MSI_MDATA,
+                   lpi - its->its_pic->pic_irqbase);
        }
        ctl |= PCI_MSI_CTL_MSI_ENABLE;
        pci_conf_write(pc, tag, off + PCI_MSI_CTL, ctl);
@@ -411,7 +415,7 @@
        const uint64_t entry_base = PCI_MSIX_TABLE_ENTRY_SIZE * msix_vec;
        bus_space_write_4(bst, bsh, entry_base + PCI_MSIX_TABLE_ENTRY_ADDR_LO, (uint32_t)addr);
        bus_space_write_4(bst, bsh, entry_base + PCI_MSIX_TABLE_ENTRY_ADDR_HI, (uint32_t)(addr >> 32));
-       bus_space_write_4(bst, bsh, entry_base + PCI_MSIX_TABLE_ENTRY_DATA, lpi);
+       bus_space_write_4(bst, bsh, entry_base + PCI_MSIX_TABLE_ENTRY_DATA, lpi - its->its_pic->pic_irqbase);
        bus_space_write_4(bst, bsh, entry_base + PCI_MSIX_TABLE_ENTRY_VECTCTL, 0);
 
        ctl = pci_conf_read(pc, tag, off + PCI_MSIX_CTL);
@@ -477,7 +481,7 @@
                /*
                 * Map event
                 */
-               gits_command_mapi(its, devid, lpi, cpu_index(ci));
+               gits_command_mapti(its, devid, lpi - its->its_pic->pic_irqbase, lpi, cpu_index(ci));
                gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
        }
        gits_wait(its);
@@ -546,7 +550,7 @@
                /*
                 * Map event
                 */
-               gits_command_mapi(its, devid, lpi, cpu_index(ci));
+               gits_command_mapti(its, devid, lpi - its->its_pic->pic_irqbase, lpi, cpu_index(ci));
                gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
        }
        gits_wait(its);