Author: andrew
Date: Fri Mar 18 16:18:29 2016
New Revision: 297028
URL: https://svnweb.freebsd.org/changeset/base/297028
Log:
Reduce the diff with intrng by renaming similar functions. This is a noop,
but will help move to use the common interrupt handling code later.
Obtained from: ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/arm64/arm64/exception.S
head/sys/arm64/arm64/intr_machdep.c
head/sys/arm64/arm64/nexus.c
head/sys/arm64/include/intr.h
Modified: head/sys/arm64/arm64/exception.S
==============================================================================
--- head/sys/arm64/arm64/exception.S Fri Mar 18 15:44:21 2016
(r297027)
+++ head/sys/arm64/arm64/exception.S Fri Mar 18 16:18:29 2016
(r297028)
@@ -150,7 +150,7 @@ END(handle_el1h_sync)
ENTRY(handle_el1h_irq)
save_registers 1
mov x0, sp
- bl arm_cpu_intr
+ bl intr_irq_handler
restore_registers 1
eret
END(handle_el1h_irq)
@@ -171,7 +171,7 @@ END(handle_el0_sync)
ENTRY(handle_el0_irq)
save_registers 0
mov x0, sp
- bl arm_cpu_intr
+ bl intr_irq_handler
do_ast
restore_registers 0
eret
Modified: head/sys/arm64/arm64/intr_machdep.c
==============================================================================
--- head/sys/arm64/arm64/intr_machdep.c Fri Mar 18 15:44:21 2016
(r297027)
+++ head/sys/arm64/arm64/intr_machdep.c Fri Mar 18 16:18:29 2016
(r297028)
@@ -408,7 +408,7 @@ arm_setup_intr(const char *name, driver_
}
int
-arm_teardown_intr(void *cookie)
+intr_irq_remove_handler(device_t dev, u_int irq, void *cookie)
{
struct arm64_intr_entry *intr;
int error;
@@ -426,7 +426,7 @@ arm_teardown_intr(void *cookie)
}
int
-arm_config_intr(u_int hw_irq, enum intr_trigger trig, enum intr_polarity pol)
+intr_irq_config(u_int hw_irq, enum intr_trigger trig, enum intr_polarity pol)
{
struct arm64_intr_entry *intr;
@@ -476,7 +476,7 @@ stray:
}
void
-arm_cpu_intr(struct trapframe *tf)
+intr_irq_handler(struct trapframe *tf)
{
critical_enter();
@@ -512,7 +512,7 @@ SYSINIT(arm_intr_smp_init, SI_SUB_SMP, S
/* Attempt to bind the specified IRQ to the specified CPU. */
int
-arm_intr_bind(u_int hw_irq, int cpu)
+intr_irq_bind(u_int hw_irq, int cpu)
{
struct arm64_intr_entry *intr;
Modified: head/sys/arm64/arm64/nexus.c
==============================================================================
--- head/sys/arm64/arm64/nexus.c Fri Mar 18 15:44:21 2016
(r297027)
+++ head/sys/arm64/arm64/nexus.c Fri Mar 18 16:18:29 2016
(r297028)
@@ -271,7 +271,7 @@ nexus_config_intr(device_t dev, int irq,
enum intr_polarity pol)
{
- return (arm_config_intr(irq, trig, pol));
+ return (intr_irq_config(irq, trig, pol));
}
static int
@@ -298,7 +298,7 @@ static int
nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
{
- return (arm_teardown_intr(ih));
+ return (intr_irq_remove_handler(child, rman_get_start(r), ih));
}
#ifdef SMP
@@ -306,7 +306,7 @@ static int
nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
{
- return (arm_intr_bind(rman_get_start(irq), cpu));
+ return (intr_irq_bind(rman_get_start(irq), cpu));
}
#endif
Modified: head/sys/arm64/include/intr.h
==============================================================================
--- head/sys/arm64/include/intr.h Fri Mar 18 15:44:21 2016
(r297027)
+++ head/sys/arm64/include/intr.h Fri Mar 18 16:18:29 2016
(r297028)
@@ -29,8 +29,10 @@
#ifndef _MACHINE_INTR_H_
#define _MACHINE_INTR_H_
-int arm_config_intr(u_int, enum intr_trigger, enum intr_polarity);
-void arm_cpu_intr(struct trapframe *);
+int intr_irq_config(u_int, enum intr_trigger, enum intr_polarity);
+void intr_irq_handler(struct trapframe *);
+int intr_irq_remove_handler(device_t, u_int, void *);
+
void arm_dispatch_intr(u_int, struct trapframe *);
int arm_enable_intr(void);
void arm_mask_irq(u_int);
@@ -44,12 +46,12 @@ int arm_map_msi(device_t, device_t, int,
int arm_map_msix(device_t, device_t, int, uint64_t *, uint32_t *);
int arm_setup_intr(const char *, driver_filter_t *, driver_intr_t,
void *, u_int, enum intr_type, void **);
-int arm_teardown_intr(void *);
void arm_unmask_irq(u_int);
#ifdef SMP
+int intr_irq_bind(u_int, int);
+
void arm_init_secondary(void);
-int arm_intr_bind(u_int, int);
void arm_setup_ipihandler(driver_filter_t *, u_int);
void arm_unmask_ipi(u_int);
#endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
