 @@ -1,14 +1,14 @@
-/* $NetBSD: hypervisor.c,v 1.73.2.8 2020/04/20 11:29:01 bouyer Exp $ */
+/* $NetBSD: hypervisor.c,v 1.73.2.9 2020/04/22 20:49:08 bouyer Exp $ */
 /*
  * Copyright (c) 2005 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -43,27 +43,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.73.2.8 2020/04/20 11:29:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.73.2.9 2020/04/22 20:49:08 bouyer Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/sysctl.h>
 #include "xenbus.h"
 #include "xencons.h"
 #include "isa.h"
 #include "pci.h"
 #include "acpica.h"
 #include "opt_xen.h"
 @@ -389,28 +389,26 @@ xen_hvm_init_cpu(struct cpu_info *ci)
 	if (vm_guest != VM_GUEST_XENPVHVM)
 		return 0;
 	KASSERT(ci == curcpu());
 	descs[0] = 0;
 	x86_cpuid(XEN_CPUID_LEAF(4), descs);
 	if (!(descs[0] & XEN_HVM_CPUID_VCPU_ID_PRESENT)) {
 		aprint_error_dev(ci->ci_dev, "Xen HVM: can't get VCPU id\n");
 		vm_guest = VM_GUEST_XENHVM;
 		return 0;
+	}
 	printf("cpu %s ci_acpiid %d vcpuid %d domid %d\n",
 	    device_xname(ci->ci_dev), ci->ci_acpiid, descs[1], descs[2]);
 	ci->ci_vcpuid = descs[1];
 	ci->ci_vcpu = &HYPERVISOR_shared_info->vcpu_info[ci->ci_vcpuid];
 	/* Register event callback handler. */
 	xen_hvm_param.domid = DOMID_SELF;
 	xen_hvm_param.index = HVM_PARAM_CALLBACK_IRQ;
 	/* val[63:56] = 2, val[7:0] = vec */
 	xen_hvm_param.value = ((int64_t)0x2 << 56) | xen_hvm_vec;
 	/* First try to set up a per-cpu vector. */
 @@ -424,29 +422,29 @@ xen_hvm_init_cpu(struct cpu_info *ci)
 		    HVMOP_set_evtchn_upcall_vector, &xen_hvm_uvec);
 		if (error < 0) {
 			aprint_error_dev(ci->ci_dev,
 			    "failed to set event upcall vector: %d\n", error);
 			if (again)
 				panic("event upcall vector");
 			aprint_error_dev(ci->ci_dev,
 			    "falling back to global vector\n");
 		} else {
 			/*
 			 * From FreeBSD:
 			 * Trick toolstack to think we are enlightened
 			 */
 			xen_hvm_param.value = 1;
 			aprint_verbose_dev(ci->ci_dev,
 			    "using event upcall vector: %d\n", xen_hvm_vec );
 			xen_hvm_param.value = 1;
+		}
+	}
 	if (again)
 		return 1;
 	if (HYPERVISOR_hvm_op(HVMOP_set_param, &xen_hvm_param) < 0) {
 		aprint_error_dev(ci->ci_dev,
 		    "Xen HVM: Unable to register event callback vector\n");
 		vm_guest = VM_GUEST_XENHVM;
 		return 0;
+	}
 	again = 1;
 @@ -466,34 +464,34 @@ hypervisor_match(device_t parent, cfdata
 	/* Attach path sanity check */
 	if (strncmp(haa->haa_busname, "hypervisor", sizeof("hypervisor")) != 0)
 		return 0;
 #ifdef XENPVHVM
 	if (vm_guest != VM_GUEST_XENPVHVM)
 		return 0;
 #endif
 	/* If we got here, it must mean we matched */
 	return 1;
+}
-#ifdef MULTIPROCESSOR
+#if defined(MULTIPROCESSOR) && defined(XENPV)
 static int
 hypervisor_vcpu_print(void *aux, const char *parent)
+{
 	/* Unconfigured cpus are ignored quietly. */
 	return (QUIET);
+}
-#endif /* MULTIPROCESSOR */
+#endif /* MULTIPROCESSOR && XENPV */
 /*
  * Attach the hypervisor.
  */
 void
 hypervisor_attach(device_t parent, device_t self, void *aux)
+{
 #if NPCI >0
 #ifdef PCI_BUS_FIXUP
 	int pci_maxbus = 0;
 #endif
 #endif /* NPCI */
 @@ -581,26 +579,27 @@ hypervisor_attach(device_t parent, devic
 	XEN_TST_F(pae_pgdir_above_4gb);
 	XEN_TST_F(mmu_pt_update_preserve_ad);
 	XEN_TST_F(highmem_assist);
 	XEN_TST_F(gnttab_map_avail_bits);
 	XEN_TST_F(hvm_callback_vector);
 	XEN_TST_F(hvm_safe_pvclock);
 	XEN_TST_F(hvm_pirqs);
 #undef XEN_TST_F
 	aprint_verbose("\n");
 	xengnt_init();
 	events_init();
 #ifdef XENPV
 	memset(&hac, 0, sizeof(hac));
 	hac.hac_vcaa.vcaa_name = "vcpu";
 	hac.hac_vcaa.vcaa_caa.cpu_number = 0;
 	hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_BP;
 	hac.hac_vcaa.vcaa_caa.cpu_func = NULL; /* See xen/x86/cpu.c:vcpu_attach() */
 	config_found_ia(self, "xendevbus", &hac.hac_vcaa, hypervisor_print);
 #ifdef MULTIPROCESSOR
 	/*
 	 * The xenstore contains the configured number of vcpus.
 	 * The xenstore however, is not accessible until much later in
 	 * the boot sequence. We therefore bruteforce check for
 @@ -612,26 +611,27 @@ hypervisor_attach(device_t parent, devic
 	for (vcpuid = 1; vcpuid < maxcpus; vcpuid++) {
 		memset(&hac, 0, sizeof(hac));
 		hac.hac_vcaa.vcaa_name = "vcpu";
 		hac.hac_vcaa.vcaa_caa.cpu_number = vcpuid;
 		hac.hac_vcaa.vcaa_caa.cpu_role = CPU_ROLE_AP;
 		hac.hac_vcaa.vcaa_caa.cpu_func = NULL; /* See xen/x86/cpu.c:vcpu_attach() */
 		if (NULL == config_found_ia(self, "xendevbus", &hac.hac_vcaa,
 			hypervisor_vcpu_print)) {
 			break;
+		}
+	}
 #endif /* MULTIPROCESSOR */
 #endif /* XENPV */
 #if NXENBUS > 0
 	extern struct x86_bus_dma_tag xenbus_bus_dma_tag;
 	memset(&hac, 0, sizeof(hac));
 	hac.hac_xenbus.xa_device = "xenbus";
 	hac.hac_xenbus.xa_dmat = &xenbus_bus_dma_tag;
 	config_found_ia(self, "xendevbus", &hac.hac_xenbus, hypervisor_print);
 #endif
 #if NXENCONS > 0
 	memset(&hac, 0, sizeof(hac));
 	hac.hac_xencons.xa_device = "xencons";
 	config_found_ia(self, "xendevbus", &hac.hac_xencons, hypervisor_print);
 #endif