upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

hyperv: Unbreak EARLY_AP_STARUP Hyper-V bootstrap by using intrhook

Browse source 
Properly working pause and friends are required.

MFC after:	3 days
Sponsored by:	Microsoft
This commit is contained in:
Sepherosa Ziehau 2016-12-21 03:23:35 +00:00
parent 39f0182303
commit be53a2fa1b
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sys/dev/hyperv/vmbus/vmbus.c
View file

@ -99,6 +99,9 @@ static uint32_t vmbus_get_vcpu_id_method(device_t bus,
device_t dev, int cpu);
static struct taskqueue *vmbus_get_eventtq_method(device_t, device_t,
int);
#ifdef EARLY_AP_STARTUP
static void vmbus_intrhook(void *);
#endif
static int vmbus_init(struct vmbus_softc *);
static int vmbus_connect(struct vmbus_softc *, uint32_t);
@ -1402,6 +1405,21 @@ vmbus_event_proc_dummy(struct vmbus_softc *sc __unused, int cpu __unused)
{
}
#ifdef EARLY_AP_STARTUP
static void
vmbus_intrhook(void *xsc)
{
struct vmbus_softc *sc = xsc;
if (bootverbose)
device_printf(sc->vmbus_dev, "intrhook\n");
vmbus_doattach(sc);
config_intrhook_disestablish(&sc->vmbus_intrhook);
}
#endif /* EARLY_AP_STARTUP */
static int
vmbus_attach(device_t dev)
{
@ -1416,7 +1434,14 @@ vmbus_attach(device_t dev)
*/
vmbus_sc->vmbus_event_proc = vmbus_event_proc_dummy;
#ifndef EARLY_AP_STARTUP
#ifdef EARLY_AP_STARTUP
/*
* Defer the real attach until the pause(9) works as expected.
*/
vmbus_sc->vmbus_intrhook.ich_func = vmbus_intrhook;
vmbus_sc->vmbus_intrhook.ich_arg = vmbus_sc;
config_intrhook_establish(&vmbus_sc->vmbus_intrhook);
#else /* !EARLY_AP_STARTUP */
/*
* If the system has already booted and thread
* scheduling is possible indicated by the global
@ -1424,8 +1449,8 @@ vmbus_attach(device_t dev)
* initialization directly.
*/
if (!cold)
#endif
vmbus_doattach(vmbus_sc);
#endif /* EARLY_AP_STARTUP */
return (0);
}

3
sys/dev/hyperv/vmbus/vmbus_var.h
View file

@ -30,6 +30,7 @@
#define _VMBUS_VAR_H_
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/taskqueue.h>
#include <sys/rman.h>
@ -128,6 +129,8 @@ struct vmbus_softc {
struct mtx vmbus_chan_lock;
TAILQ_HEAD(, vmbus_channel) vmbus_chans;
struct intr_config_hook vmbus_intrhook;
#ifdef NEW_PCIB
/* The list of usable MMIO ranges for PCIe pass-through */
struct pcib_host_resources vmbus_mmio_res;