d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hyperv/vmbus: Rename ISR functions

Browse Source 
MFC after:	1 week
Sponsored by:	Microsoft OSTC
Differential Revision:	https://reviews.freebsd.org/D6601
This commit is contained in:
sephe 2016-05-31 04:47:53 +00:00
parent 05a793aa96
commit 1d0f0760f8
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/hyperv/vmbus/amd64/hv_vector.S
View File

@ -37,10 +37,10 @@
*/
.text
SUPERALIGN_TEXT
IDTVEC(hv_vmbus_callback)
IDTVEC(vmbus_isr)
PUSH_FRAME
FAKE_MCOUNT(TF_RIP(%rsp))
movq %rsp, %rdi
call hv_vector_handler
call vmbus_handle_intr
MEXITCOUNT
jmp doreti

12
sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
View File

@ -72,7 +72,7 @@ struct vmbus_softc *vmbus_sc;
static char *vmbus_ids[] = { "VMBUS", NULL };
extern inthand_t IDTVEC(hv_vmbus_callback);
extern inthand_t IDTVEC(vmbus_isr);
static void
vmbus_msg_task(void *xsc, int pending __unused)
@ -124,8 +124,8 @@ handled:
}
}
static inline int
hv_vmbus_isr(struct vmbus_softc *sc, struct trapframe *frame, int cpu)
static __inline int
vmbus_handle_intr1(struct vmbus_softc *sc, struct trapframe *frame, int cpu)
{
hv_vmbus_message *msg, *msg_base;
@ -186,7 +186,7 @@ hv_vmbus_isr(struct vmbus_softc *sc, struct trapframe *frame, int cpu)
}
void
hv_vector_handler(struct trapframe *trap_frame)
vmbus_handle_intr(struct trapframe *trap_frame)
{
struct vmbus_softc *sc = vmbus_get_softc();
int cpu = curcpu;
@ -201,7 +201,7 @@ hv_vector_handler(struct trapframe *trap_frame)
*/
(*VMBUS_PCPU_GET(sc, intr_cnt, cpu))++;
hv_vmbus_isr(sc, trap_frame, cpu);
vmbus_handle_intr1(sc, trap_frame, cpu);
/*
* Enable preemption.
@ -411,7 +411,7 @@ vmbus_intr_setup(struct vmbus_softc *sc)
* All Hyper-V ISR required resources are setup, now let's find a
* free IDT vector for Hyper-V ISR and set it up.
*/
sc->vmbus_idtvec = lapic_ipi_alloc(IDTVEC(hv_vmbus_callback));
sc->vmbus_idtvec = lapic_ipi_alloc(IDTVEC(vmbus_isr));
if (sc->vmbus_idtvec < 0) {
device_printf(sc->vmbus_dev, "cannot find free IDT vector\n");
return ENXIO;

4
sys/dev/hyperv/vmbus/i386/hv_vector.S
View File

@ -37,13 +37,13 @@
*/
.text
SUPERALIGN_TEXT
IDTVEC(hv_vmbus_callback)
IDTVEC(vmbus_isr)
PUSH_FRAME
SET_KERNEL_SREGS
cld
FAKE_MCOUNT(TF_EIP(%esp))
pushl %esp
call hv_vector_handler
call vmbus_handle_intr
add $4, %esp
MEXITCOUNT
jmp doreti

1
sys/dev/hyperv/vmbus/vmbus_var.h
View File

@ -97,6 +97,7 @@ struct trapframe;
void vmbus_on_channel_open(const struct hv_vmbus_channel *);
void vmbus_event_proc(struct vmbus_softc *, int);
void vmbus_event_proc_compat(struct vmbus_softc *, int);
void vmbus_handle_intr(struct trapframe *);
void vmbus_et_intr(struct trapframe *);

1
sys/x86/include/apicvar.h
View File

@ -455,7 +455,6 @@ void lapic_handle_cmc(void);
void lapic_handle_error(void);
void lapic_handle_intr(int vector, struct trapframe *frame);
void lapic_handle_timer(struct trapframe *frame);
void hv_vector_handler(struct trapframe *frame);
extern int x2apic_mode;
extern int lapic_eoi_suppression;