x86 PICs as devices

sys/amd64/acpica/acpi_wakeup.c

@@ -45,7 +45,7 @@
 
 #include <machine/clock.h>
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <x86/mca.h>
 #include <machine/pcb.h>

sys/amd64/amd64/fpu.c

@@ -51,7 +51,7 @@
 
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>

sys/amd64/amd64/machdep.c

@@ -119,7 +119,7 @@
 #include <machine/cpu.h>
 #include <machine/cputypes.h>
 #include <machine/frame.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>

sys/amd64/amd64/pmap.c

@@ -153,7 +153,7 @@
 #include <vm/uma.h>
 
 #include <machine/asan.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <x86/apicvar.h>
 #include <x86/ifunc.h>
 #include <machine/cpu.h>

sys/amd64/amd64/trap.c

@@ -83,7 +83,7 @@ PMC_SOFT_DEFINE( , , page_fault, write);
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <x86/mca.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>

sys/amd64/ia32/ia32_syscall.c

@@ -75,7 +75,7 @@
 #include <vm/vm_extern.h>
 
 #include <machine/cpu.h>
-#include <machine/intr_machdep.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 
 #include <compat/freebsd32/freebsd32_signal.h>

sys/amd64/include/intr_machdep.h → sys/amd64/include/interrupt.h

@@ -25,10 +25,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __MACHINE_INTR_MACHDEP_H__
-#define	__MACHINE_INTR_MACHDEP_H__
+#ifndef __MACHINE_INTERRUPT_H__
+#define	__MACHINE_INTERRUPT_H__
 
-#include <x86/intr_machdep.h>
+#include <x86/interrupt.h>
 
 /*
  * The following data structure holds per-cpu data, and is placed just
@@ -44,4 +44,4 @@ struct nmi_pcpu {
 #define	MCE_STACK_SIZE		PAGE_SIZE
 #define	DBG_STACK_SIZE		PAGE_SIZE
 
-#endif	/* !__MACHINE_INTR_MACHDEP_H__ */
+#endif	/* !__MACHINE_INTERRUPT_H__ */

sys/arm/allwinner/a10/a10_intc.c

@@ -44,7 +44,7 @@
 #include <sys/systm.h>
 #include <sys/sched.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
@@ -366,21 +366,21 @@ static device_method_t a10_aintc_methods[] = {
 	DEVMETHOD(device_probe,		a10_aintc_probe),
 	DEVMETHOD(device_attach,	a10_aintc_attach),
 
+	/* Interrupt event interface */
+	DEVMETHOD(intr_event_pre_ithread,	a10_intr_pre_ithread),
+	DEVMETHOD(intr_event_post_ithread,	a10_intr_post_ithread),
+	DEVMETHOD(intr_event_post_filter,	a10_intr_post_filter),
+
 	/* Interrupt controller interface */
 	DEVMETHOD(pic_disable_intr,	a10_intr_disable_intr),
 	DEVMETHOD(pic_enable_intr,	a10_intr_enable_intr),
 	DEVMETHOD(pic_map_intr,		a10_intr_map_intr),
-	DEVMETHOD(pic_post_filter,	a10_intr_post_filter),
-	DEVMETHOD(pic_post_ithread,	a10_intr_post_ithread),
-	DEVMETHOD(pic_pre_ithread,	a10_intr_pre_ithread),
-	{ 0, 0 }
-};
 
-static driver_t a10_aintc_driver = {
-	"aintc",
-	a10_aintc_methods,
-	sizeof(struct a10_aintc_softc),
+	DEVMETHOD_END
 };
 
+DEFINE_CLASS_1(aintc, a10_aintc_driver, a10_aintc_methods,
+    sizeof(struct a10_aintc_softc), pic_base_class);
+
 EARLY_DRIVER_MODULE(aintc, simplebus, a10_aintc_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_FIRST);

sys/arm/allwinner/a10_sramc.c

@@ -39,7 +39,7 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/frame.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

sys/arm/allwinner/a10_timer.c

@@ -35,7 +35,7 @@
 #include <sys/timetc.h>
 #include <sys/watchdog.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 
 #include <dev/ofw/openfirm.h>

sys/arm/allwinner/a20/a20_cpu_cfg.c

@@ -40,7 +40,7 @@
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

sys/arm/allwinner/aw_gpio.c

@@ -43,8 +43,8 @@
 #include <sys/proc.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
 
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
@@ -1530,15 +1530,17 @@ static device_method_t aw_gpio_methods[] = {
 	DEVMETHOD(device_attach,	aw_gpio_attach),
 	DEVMETHOD(device_detach,	aw_gpio_detach),
 
+	/* Interrupt event interface */
+	DEVMETHOD(intr_event_pre_ithread,	aw_gpio_pic_pre_ithread),
+	DEVMETHOD(intr_event_post_ithread,	aw_gpio_pic_post_ithread),
+	DEVMETHOD(intr_event_post_filter,	aw_gpio_pic_post_filter),
+
 	/* Interrupt controller interface */
 	DEVMETHOD(pic_disable_intr,	aw_gpio_pic_disable_intr),
 	DEVMETHOD(pic_enable_intr,	aw_gpio_pic_enable_intr),
 	DEVMETHOD(pic_map_intr,		aw_gpio_pic_map_intr),
 	DEVMETHOD(pic_setup_intr,	aw_gpio_pic_setup_intr),
 	DEVMETHOD(pic_teardown_intr,	aw_gpio_pic_teardown_intr),
-	DEVMETHOD(pic_post_filter,	aw_gpio_pic_post_filter),
-	DEVMETHOD(pic_post_ithread,	aw_gpio_pic_post_ithread),
-	DEVMETHOD(pic_pre_ithread,	aw_gpio_pic_pre_ithread),
 
 	/* GPIO protocol */
 	DEVMETHOD(gpio_get_bus,		aw_gpio_get_bus),
@@ -1563,11 +1565,8 @@ static device_method_t aw_gpio_methods[] = {
 	DEVMETHOD_END
 };
 
-static driver_t aw_gpio_driver = {
-	"gpio",
-	aw_gpio_methods,
-	sizeof(struct aw_gpio_softc),
-};
+DEFINE_CLASS_1(gpio, aw_gpio_driver, aw_gpio_methods,
+    sizeof(struct aw_gpio_softc), pic_base_class);
 
 EARLY_DRIVER_MODULE(aw_gpio, simplebus, aw_gpio_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);

sys/arm/allwinner/aw_mp.c

@@ -38,7 +38,7 @@
 #include <machine/cpu.h>
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/platformvar.h>
 
 #include <arm/allwinner/aw_mp.h>

sys/arm/allwinner/aw_nmi.c

@@ -34,7 +34,7 @@
 #include <sys/proc.h>
 #include <sys/rman.h>
 #include <machine/bus.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/fdt/fdt_intr.h>
 #include <dev/ofw/openfirm.h>
@@ -393,24 +393,23 @@ static device_method_t aw_nmi_methods[] = {
 	DEVMETHOD(device_probe,		aw_nmi_probe),
 	DEVMETHOD(device_attach,	aw_nmi_attach),
 
+	/* Interrupt event interface */
+	DEVMETHOD(intr_event_pre_ithread,	aw_nmi_pre_ithread),
+	DEVMETHOD(intr_event_post_ithread,	aw_nmi_post_ithread),
+	DEVMETHOD(intr_event_post_filter,	aw_nmi_post_filter),
+
 	/* Interrupt controller interface */
 	DEVMETHOD(pic_disable_intr,	aw_nmi_disable_intr),
 	DEVMETHOD(pic_enable_intr,	aw_nmi_enable_intr),
 	DEVMETHOD(pic_map_intr,		aw_nmi_map_intr),
 	DEVMETHOD(pic_setup_intr,	aw_nmi_setup_intr),
 	DEVMETHOD(pic_teardown_intr,	aw_nmi_teardown_intr),
-	DEVMETHOD(pic_post_filter,	aw_nmi_post_filter),
-	DEVMETHOD(pic_post_ithread,	aw_nmi_post_ithread),
-	DEVMETHOD(pic_pre_ithread,	aw_nmi_pre_ithread),
 
-	{0, 0},
+	DEVMETHOD_END
 };
 
-static driver_t aw_nmi_driver = {
-	"aw_nmi",
-	aw_nmi_methods,
-	sizeof(struct aw_nmi_softc),
-};
+DEFINE_CLASS_1(aw_nmi, aw_nmi_driver, aw_nmi_methods,
+    sizeof(struct aw_nmi_softc), pic_base_class);
 
 EARLY_DRIVER_MODULE(aw_nmi, simplebus, aw_nmi_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);

sys/arm/allwinner/aw_r_intc.c

@@ -30,7 +30,7 @@
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>
@@ -189,7 +189,7 @@ aw_r_intc_gicp_map_intr(device_t dev, struct intr_map_data *data,
 		return (EINVAL);
 
 	ret = PIC_MAP_INTR(sc->parent, data, isrcp);
-	(*isrcp)->isrc_dev = sc->dev;
+	(*isrcp)->isrc_event.ie_pic = sc->dev;
 	return(ret);
 }
 
@@ -243,7 +243,7 @@ aw_r_intc_gicp_pre_ithread(device_t dev, struct intr_irqsrc *isrc)
 
 	sc = device_get_softc(dev);
 
-	PIC_PRE_ITHREAD(sc->parent, isrc);
+	INTR_EVENT_PRE_ITHREAD(sc->parent, isrc);
 }
 
 static void
@@ -253,7 +253,7 @@ aw_r_intc_gicp_post_ithread(device_t dev, struct intr_irqsrc *isrc)
 
 	sc = device_get_softc(dev);
 
-	PIC_POST_ITHREAD(sc->parent, isrc);
+	INTR_EVENT_POST_ITHREAD(sc->parent, isrc);
 }
 
 static void
@@ -263,7 +263,7 @@ aw_r_intc_gicp_post_filter(device_t dev, struct intr_irqsrc *isrc)
 
 	sc = device_get_softc(dev);
 
-	PIC_POST_FILTER(sc->parent, isrc);
+	INTR_EVENT_POST_FILTER(sc->parent, isrc);
 }
 
 static device_method_t aw_r_intc_gicp_methods[] = {
@@ -272,6 +272,11 @@ static device_method_t aw_r_intc_gicp_methods[] = {
 	DEVMETHOD(device_attach,	aw_r_intc_gicp_attach),
 	DEVMETHOD(device_detach,	aw_r_intc_gicp_detach),
 
+	/* Interrupt event interface */
+	DEVMETHOD(intr_event_pre_ithread,	aw_r_intc_gicp_pre_ithread),
+	DEVMETHOD(intr_event_post_ithread,	aw_r_intc_gicp_post_ithread),
+	DEVMETHOD(intr_event_post_filter,	aw_r_intc_gicp_post_filter),
+
 	/* Interrupt controller interface */
 	DEVMETHOD(pic_activate_intr,	aw_r_intc_gicp_activate_intr),
 	DEVMETHOD(pic_disable_intr,	aw_r_intc_gicp_disable_intr),
@@ -280,18 +285,12 @@ static device_method_t aw_r_intc_gicp_methods[] = {
 	DEVMETHOD(pic_deactivate_intr,	aw_r_intc_gicp_deactivate_intr),
 	DEVMETHOD(pic_setup_intr,	aw_r_intc_gicp_setup_intr),
 	DEVMETHOD(pic_teardown_intr,	aw_r_intc_gicp_teardown_intr),
-	DEVMETHOD(pic_post_filter,	aw_r_intc_gicp_post_filter),
-	DEVMETHOD(pic_post_ithread,	aw_r_intc_gicp_post_ithread),
-	DEVMETHOD(pic_pre_ithread,	aw_r_intc_gicp_pre_ithread),
 
 	DEVMETHOD_END
 };
 
-static driver_t aw_r_intc_gicp_driver = {
-	"aw_r_intc_gicp",
-	aw_r_intc_gicp_methods,
-	sizeof(struct aw_r_intc_gicp_softc),
-};
+DEFINE_CLASS_1(aw_r_intc_gicp, aw_r_intc_gicp_driver, aw_r_intc_gicp_methods,
+    sizeof(struct aw_r_intc_gicp_softc), pic_base_class);
 
 EARLY_DRIVER_MODULE(aw_r_intc_gicp, simplebus, aw_r_intc_gicp_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);

sys/arm/allwinner/if_emac.c

@@ -43,8 +43,8 @@
 #include <sys/gpio.h>
 
 #include <machine/bus.h>
+#include <machine/interrupt.h>
 #include <machine/resource.h>
-#include <machine/intr.h>
 
 #include <net/if.h>
 #include <net/if_var.h>

sys/arm/annapurna/alpine/alpine_machdep_mp.c

@@ -39,7 +39,7 @@
 
 #include <machine/smp.h>
 #include <machine/fdt.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/cpu.h>
 #include <machine/platformvar.h>
 

sys/arm/annapurna/alpine/alpine_pci.c

@@ -36,7 +36,6 @@
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/rman.h>
-#include <sys/intr.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_bus.h>

sys/arm/arm/busdma_machdep.c

@@ -38,7 +38,6 @@
 #include <sys/bus.h>
 #include <sys/busdma_bufalloc.h>
 #include <sys/counter.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
@@ -59,6 +58,7 @@
 #include <machine/atomic.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
+#include <machine/interrupt.h>
 #include <machine/md_var.h>
 
 //#define ARM_BUSDMA_MAPLOAD_STATS

sys/arm/arm/exception.S

@@ -51,8 +51,8 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/asmacros.h>
+#include <machine/interrupt.h>
 #include <machine/trap.h>
-#include <sys/intr.h>
 
 #ifdef KDTRACE_HOOKS
 	.bss

sys/arm/arm/generic_timer.c

@@ -54,7 +54,7 @@
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/intr.h>
+#include <machine/interrupt.h>
 #include <machine/machdep.h>
 #include <machine/md_var.h>