From d7e3b05b0de118e6940c032f0c207c452028f253 Mon Sep 17 00:00:00 2001
From: Elliott Mitchell <ehem+freebsd@m5p.com>
Date: Wed, 14 Dec 2022 13:59:17 -0800
Subject: [PATCH] arm: remove passing trapframe to intr_ipi_dispatch()

This was needed before INTRNG was in place and handling the push of
curthread->td_intr_frame.  Since INTRNG now handles this, there is no
longer and need for playing around with the frame inside IPI interrupts.
---
 sys/arm/arm/gic.c                  | 2 +-
 sys/arm/arm/machdep_intr.c         | 2 +-
 sys/arm/broadcom/bcm2835/bcm2836.c | 2 +-
 sys/arm/include/intr.h             | 2 +-
 sys/arm64/arm64/gic_v3.c           | 2 +-
 sys/arm64/arm64/mp_machdep.c       | 2 +-
 sys/arm64/include/intr.h           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index d2d88237935e..a6f81254fe7d 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -573,7 +573,7 @@ arm_gic_intr(void *arg)
 #ifdef SMP
 		/* Call EOI for all IPI before dispatch. */
 		gic_c_write_4(sc, GICC_EOIR, irq_active_reg);
-		intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq], tf);
+		intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq]);
 		goto next_irq;
 #else
 		device_printf(sc->gic_dev, "SGI %u on UP system detected\n",
diff --git a/sys/arm/arm/machdep_intr.c b/sys/arm/arm/machdep_intr.c
index cd92dd5f79ad..ab7cd76261d7 100644
--- a/sys/arm/arm/machdep_intr.c
+++ b/sys/arm/arm/machdep_intr.c
@@ -141,7 +141,7 @@ intr_ipi_lookup(u_int ipi)
 }
 
 void
-intr_ipi_dispatch(u_int ipi, struct trapframe *tf)
+intr_ipi_dispatch(u_int ipi)
 {
 	struct intr_ipi *ii;
 
diff --git a/sys/arm/broadcom/bcm2835/bcm2836.c b/sys/arm/broadcom/bcm2835/bcm2836.c
index 50759cd45b6f..38247398a192 100644
--- a/sys/arm/broadcom/bcm2835/bcm2836.c
+++ b/sys/arm/broadcom/bcm2835/bcm2836.c
@@ -369,7 +369,7 @@ bcm_lintc_ipi_dispatch(struct bcm_lintc_softc *sc, u_int cpu,
 #else
 		dsb();
 #endif
-		intr_ipi_dispatch(ipi, tf);
+		intr_ipi_dispatch(ipi);
 	}
 }
 #endif
diff --git a/sys/arm/include/intr.h b/sys/arm/include/intr.h
index c783c41fd35d..3215008adb0c 100644
--- a/sys/arm/include/intr.h
+++ b/sys/arm/include/intr.h
@@ -55,7 +55,7 @@
 typedef void intr_ipi_send_t(void *, cpuset_t, u_int);
 typedef void intr_ipi_handler_t(void *);
 
-void intr_ipi_dispatch(u_int, struct trapframe *);
+void intr_ipi_dispatch(u_int);
 void intr_ipi_send(cpuset_t, u_int);
 
 void intr_ipi_setup(u_int, const char *, intr_ipi_handler_t *, void *,
diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c
index 07ef8454afcf..dfa0f6c7cad1 100644
--- a/sys/arm64/arm64/gic_v3.c
+++ b/sys/arm64/arm64/gic_v3.c
@@ -631,7 +631,7 @@ arm_gic_v3_intr(void *arg)
 			/* Call EOI for all IPI before dispatch. */
 			gic_icc_write(EOIR1, (uint64_t)active_irq);
 #ifdef SMP
-			intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq], tf);
+			intr_ipi_dispatch(sgi_to_ipi[gi->gi_irq]);
 #else
 			device_printf(sc->dev, "SGI %ju on UP system detected\n",
 			    (uintmax_t)(active_irq - GIC_FIRST_SGI));
diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c
index 0e39b27557ea..5e4c035586a5 100644
--- a/sys/arm64/arm64/mp_machdep.c
+++ b/sys/arm64/arm64/mp_machdep.c
@@ -915,7 +915,7 @@ intr_ipi_lookup(u_int ipi)
  *  source mapped.
  */
 void
-intr_ipi_dispatch(u_int ipi, struct trapframe *tf)
+intr_ipi_dispatch(u_int ipi)
 {
 	struct intr_ipi *ii;
 
diff --git a/sys/arm64/include/intr.h b/sys/arm64/include/intr.h
index 30805d4f4a91..b088de827dbf 100644
--- a/sys/arm64/include/intr.h
+++ b/sys/arm64/include/intr.h
@@ -45,7 +45,7 @@ arm_irq_memory_barrier(uintptr_t irq)
 }
 
 #ifdef SMP
-void intr_ipi_dispatch(u_int, struct trapframe *);
+void intr_ipi_dispatch(u_int);
 #endif
 
 #ifdef DEV_ACPI