Author: sephe
Date: Fri Jun 24 01:20:33 2016
New Revision: 302165
URL: https://svnweb.freebsd.org/changeset/base/302165
Log:
MFC 301015
hyperv/vmbus: Rename ISR functions
MFC after: 1 week
Sponsored by: Microsoft OSTC
Differential Revision: https://reviews.freebsd.org/D6601
Modified:
stable/10/sys/amd64/include/apicvar.h
stable/10/sys/dev/hyperv/vmbus/amd64/hv_vector.S
stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
stable/10/sys/dev/hyperv/vmbus/i386/hv_vector.S
stable/10/sys/dev/hyperv/vmbus/vmbus_var.h
stable/10/sys/i386/include/apicvar.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/amd64/include/apicvar.h
==============================================================================
--- stable/10/sys/amd64/include/apicvar.h Fri Jun 24 00:05:45 2016
(r302164)
+++ stable/10/sys/amd64/include/apicvar.h Fri Jun 24 01:20:33 2016
(r302165)
@@ -216,7 +216,6 @@ int lapic_set_lvt_triggermode(u_int apic
void lapic_set_tpr(u_int vector);
void lapic_setup(int boot);
void xen_intr_handle_upcall(struct trapframe *frame);
-void hv_vector_handler(struct trapframe *frame);
#endif /* !LOCORE */
#endif /* _MACHINE_APICVAR_H_ */
Modified: stable/10/sys/dev/hyperv/vmbus/amd64/hv_vector.S
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/amd64/hv_vector.S Fri Jun 24 00:05:45
2016 (r302164)
+++ stable/10/sys/dev/hyperv/vmbus/amd64/hv_vector.S Fri Jun 24 01:20:33
2016 (r302165)
@@ -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
Modified: stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Fri Jun 24
00:05:45 2016 (r302164)
+++ stable/10/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Fri Jun 24
01:20:33 2016 (r302165)
@@ -72,7 +72,7 @@ struct vmbus_softc *vmbus_sc;
static char *vmbus_ids[] = { "VMBUS", NULL };
-extern inthand_t IDTVEC(rsvd), IDTVEC(hv_vmbus_callback);
+extern inthand_t IDTVEC(rsvd), 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, str
}
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
*/
(*VMBUS_PCPU_GET(sc, intr_cnt, cpu))++;
- hv_vmbus_isr(sc, trap_frame, cpu);
+ vmbus_handle_intr1(sc, trap_frame, cpu);
/*
* Enable preemption.
@@ -389,10 +389,10 @@ vmbus_vector_alloc(void)
func = ((long)ip->gd_hioffset << 16 | ip->gd_looffset);
if (func == (uintptr_t)&IDTVEC(rsvd)) {
#ifdef __i386__
- setidt(vector , IDTVEC(hv_vmbus_callback),
SDT_SYS386IGT,
+ setidt(vector , IDTVEC(vmbus_isr), SDT_SYS386IGT,
SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
#else
- setidt(vector , IDTVEC(hv_vmbus_callback), SDT_SYSIGT,
+ setidt(vector , IDTVEC(vmbus_isr), SDT_SYSIGT,
SEL_KPL, 0);
#endif
Modified: stable/10/sys/dev/hyperv/vmbus/i386/hv_vector.S
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/i386/hv_vector.S Fri Jun 24 00:05:45
2016 (r302164)
+++ stable/10/sys/dev/hyperv/vmbus/i386/hv_vector.S Fri Jun 24 01:20:33
2016 (r302165)
@@ -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
Modified: stable/10/sys/dev/hyperv/vmbus/vmbus_var.h
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/vmbus_var.h Fri Jun 24 00:05:45 2016
(r302164)
+++ stable/10/sys/dev/hyperv/vmbus/vmbus_var.h Fri Jun 24 01:20:33 2016
(r302165)
@@ -96,6 +96,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 *);
Modified: stable/10/sys/i386/include/apicvar.h
==============================================================================
--- stable/10/sys/i386/include/apicvar.h Fri Jun 24 00:05:45 2016
(r302164)
+++ stable/10/sys/i386/include/apicvar.h Fri Jun 24 01:20:33 2016
(r302165)
@@ -215,7 +215,6 @@ int lapic_set_lvt_triggermode(u_int apic
void lapic_set_tpr(u_int vector);
void lapic_setup(int boot);
void xen_intr_handle_upcall(struct trapframe *frame);
-void hv_vector_handler(struct trapframe *frame);
#endif /* !LOCORE */
#endif /* _MACHINE_APICVAR_H_ */
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
