From f88afdb8a845fecaf5a76180a551c1efcf779d6a Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 10 Dec 2015 15:51:02 +0000 Subject: Remove pic_map_msix from ARM64, it is unneeded as all mappings happen through pic_map_msi (without the x). Sponsored by: ABT Systems Ltd --- sys/arm64/arm64/gic_v3_its.c | 5 ++--- sys/arm64/arm64/gic_v3_var.h | 2 +- sys/arm64/arm64/intr_machdep.c | 7 ------- sys/arm64/arm64/pic_if.m | 8 -------- 4 files changed, 3 insertions(+), 19 deletions(-) (limited to 'sys') diff --git a/sys/arm64/arm64/gic_v3_its.c b/sys/arm64/arm64/gic_v3_its.c index 4903a51..1200f9c 100644 --- a/sys/arm64/arm64/gic_v3_its.c +++ b/sys/arm64/arm64/gic_v3_its.c @@ -74,10 +74,9 @@ static device_method_t gic_v3_its_methods[] = { */ /* MSI-X */ DEVMETHOD(pic_alloc_msix, gic_v3_its_alloc_msix), - DEVMETHOD(pic_map_msix, gic_v3_its_map_msix), /* MSI */ DEVMETHOD(pic_alloc_msi, gic_v3_its_alloc_msi), - DEVMETHOD(pic_map_msi, gic_v3_its_map_msix), + DEVMETHOD(pic_map_msi, gic_v3_its_map_msi), /* End */ DEVMETHOD_END @@ -1658,7 +1657,7 @@ gic_v3_its_alloc_msi(device_t dev, device_t pci_dev, int count, int *irqs) } int -gic_v3_its_map_msix(device_t dev, device_t pci_dev, int irq, uint64_t *addr, +gic_v3_its_map_msi(device_t dev, device_t pci_dev, int irq, uint64_t *addr, uint32_t *data) { struct gic_v3_its_softc *sc; diff --git a/sys/arm64/arm64/gic_v3_var.h b/sys/arm64/arm64/gic_v3_var.h index 7bcd068..8ebd144 100644 --- a/sys/arm64/arm64/gic_v3_var.h +++ b/sys/arm64/arm64/gic_v3_var.h @@ -253,7 +253,7 @@ int gic_v3_its_detach(device_t); int gic_v3_its_alloc_msix(device_t, device_t, int *); int gic_v3_its_alloc_msi(device_t, device_t, int, int *); -int gic_v3_its_map_msix(device_t, device_t, int, uint64_t *, uint32_t *); +int gic_v3_its_map_msi(device_t, device_t, int, uint64_t *, uint32_t *); int its_init_cpu(struct gic_v3_its_softc *); diff --git a/sys/arm64/arm64/intr_machdep.c b/sys/arm64/arm64/intr_machdep.c index 1ae91a7..e297ff9 100644 --- a/sys/arm64/arm64/intr_machdep.c +++ b/sys/arm64/arm64/intr_machdep.c @@ -252,13 +252,6 @@ arm_release_msix(device_t pci, device_t child, int irq) } -int -arm_map_msix(device_t pci, device_t child, int irq, uint64_t *addr, uint32_t *data) -{ - - return (PIC_MAP_MSIX(msi_pic, child, irq, addr, data)); -} - /* * Finalize interrupts bring-up (should be called from configure_final()). * Enables all interrupts registered by bus_setup_intr() during boot diff --git a/sys/arm64/arm64/pic_if.m b/sys/arm64/arm64/pic_if.m index f05c31b..fe358c6 100644 --- a/sys/arm64/arm64/pic_if.m +++ b/sys/arm64/arm64/pic_if.m @@ -158,14 +158,6 @@ METHOD int map_msi { uint32_t *data; }; -METHOD int map_msix { - device_t dev; - device_t pci_dev; - int irq; - uint64_t *addr; - uint32_t *data; -}; - METHOD int release_msi { device_t dev; device_t pci_dev; -- cgit v1.1