Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c b/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c
- index 1f25037c9ae1..3f8c5c66936f 100644
- --- a/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c
- +++ b/sys/dev/hyperv/vmbus/aarch64/vmbus_aarch64.c
- @@ -116,7 +116,7 @@ vmbus_setup_intr1(struct vmbus_softc *sc)
- dev = devclass_get_device(devclass_find("vmbus_res"), 0);
- sc->ires = bus_alloc_resource_any(dev,
- - SYS_RES_IRQ, &sc->vector, RF_ACTIVE | RF_SHAREABLE);
- + SYS_RES_IRQ, &sc->vector, RF_ACTIVE);
- if (sc->ires == NULL) {
- device_printf(sc->vmbus_dev, "bus_alloc_resouce_any failed\n");
- return (ENXIO);
- diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c
- index c349f862d378..d3379c02bfb5 100644
- --- a/sys/dev/hyperv/vmbus/vmbus.c
- +++ b/sys/dev/hyperv/vmbus/vmbus.c
- @@ -113,7 +113,7 @@ 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);
- -#if defined(EARLY_AP_STARTUP) || defined(__aarch64__)
- +#if defined(EARLY_AP_STARTUP) //|| defined(__aarch64__)
- static void vmbus_intrhook(void *);
- #endif
- @@ -668,7 +668,7 @@ vmbus_handle_intr1(struct vmbus_softc *sc, struct trapframe *frame, int cpu)
- {
- volatile struct vmbus_message *msg;
- struct vmbus_message *msg_base;
- -
- + device_printf(sc->vmbus_dev,"vmbus_handle_intr1 for cpu %d\n", cpu);
- msg_base = VMBUS_PCPU_GET(sc, message, cpu);
- /*
- @@ -1488,7 +1488,7 @@ vmbus_event_proc_dummy(struct vmbus_softc *sc __unused, int cpu __unused)
- {
- }
- -#if defined(EARLY_AP_STARTUP) || defined(__aarch64__)
- +#if defined(EARLY_AP_STARTUP) //|| defined(__aarch64__)
- static void
- vmbus_intrhook(void *xsc)
- @@ -1517,7 +1517,7 @@ vmbus_attach(device_t dev)
- */
- vmbus_sc->vmbus_event_proc = vmbus_event_proc_dummy;
- -#if defined(EARLY_AP_STARTUP) || defined(__aarch64__)
- +#if defined(EARLY_AP_STARTUP) //|| defined(__aarch64__)
- /*
- * Defer the real attach until the pause(9) works as expected.
- */
- @@ -1531,8 +1531,8 @@ vmbus_attach(device_t dev)
- * cold set to zero, we just call the driver
- * initialization directly.
- */
- - if (!cold)
- - vmbus_doattach(vmbus_sc);
- +// if (!cold)
- +// vmbus_doattach(vmbus_sc);
- #endif /* EARLY_AP_STARTUP and aarch64 */
- return (0);
- @@ -1578,7 +1578,7 @@ vmbus_detach(device_t dev)
- return (0);
- }
- -#if !defined(EARLY_AP_STARTUP) && !defined(__aarch64__)
- +#if !defined(EARLY_AP_STARTUP) //&& !defined(__aarch64__)
- static void
- vmbus_sysinit(void *arg __unused)
- @@ -1602,5 +1602,5 @@ vmbus_sysinit(void *arg __unused)
- * We have to start as the last step of SI_SUB_SMP, i.e. after SMP is
- * initialized.
- */
- -SYSINIT(vmbus_initialize, SI_SUB_SMP, SI_ORDER_ANY, vmbus_sysinit, NULL);
- +SYSINIT(vmbus_initialize, SI_SUB_SMP + 1, SI_ORDER_FIRST, vmbus_sysinit, NULL);
- #endif /* !EARLY_AP_STARTUP */
- diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c
- index 032e06c47c95..a5349196cd50 100644
- --- a/sys/dev/hyperv/vmbus/vmbus_chan.c
- +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c
- @@ -1097,7 +1097,7 @@ vmbus_chan_send(struct vmbus_channel *chan, uint16_t type, uint16_t flags,
- pad_pktlen = VMBUS_CHANPKT_TOTLEN(pktlen);
- KASSERT(pad_pktlen <= vmbus_txbr_maxpktsz(&chan->ch_txbr),
- ("invalid packet size %d", pad_pktlen));
- -
- + device_printf(chan->ch_dev,"chan id %d and cp %d\n",chan->ch_id, chan->ch_vcpuid);
- pkt.cp_hdr.cph_type = type;
- pkt.cp_hdr.cph_flags = flags;
- VMBUS_CHANPKT_SETLEN(pkt.cp_hdr.cph_hlen, hlen);
Advertisement
Add Comment
Please, Sign In to add comment