summaryrefslogtreecommitdiffstats
path: root/sys/dev/xen/xenpci/xenpci.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/xen/xenpci/xenpci.c')
-rw-r--r--sys/dev/xen/xenpci/xenpci.c226
1 files changed, 65 insertions, 161 deletions
diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c
index 2d74676..0b1762d 100644
--- a/sys/dev/xen/xenpci/xenpci.c
+++ b/sys/dev/xen/xenpci/xenpci.c
@@ -32,40 +32,25 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/module.h>
-#include <sys/proc.h>
-#include <sys/systm.h>
-#include <sys/time.h>
#include <machine/bus.h>
#include <machine/resource.h>
#include <sys/rman.h>
#include <machine/stdarg.h>
-#include <machine/xen/xen-os.h>
+
+#include <xen/xen-os.h>
#include <xen/features.h>
#include <xen/hypervisor.h>
-#include <xen/gnttab.h>
-#include <xen/xen_intr.h>
-#include <xen/interface/memory.h>
-#include <xen/interface/hvm/params.h>
+#include <xen/hvm.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_kern.h>
-#include <vm/pmap.h>
-
#include <dev/xen/xenpci/xenpcivar.h>
-/*
- * These variables are used by the rest of the kernel to access the
- * hypervisor.
- */
-char *hypercall_stubs;
-shared_info_t *HYPERVISOR_shared_info;
-static vm_paddr_t shared_info_pa;
+extern void xen_intr_handle_upcall(struct trapframe *trap_frame);
+
static device_t nexus;
/*
@@ -73,103 +58,42 @@ static device_t nexus;
*/
static devclass_t xenpci_devclass;
-/*
- * Return the CPUID base address for Xen functions.
- */
-static uint32_t
-xenpci_cpuid_base(void)
+static int
+xenpci_intr_filter(void *trap_frame)
{
- uint32_t base, regs[4];
-
- for (base = 0x40000000; base < 0x40010000; base += 0x100) {
- do_cpuid(base, regs);
- if (!memcmp("XenVMMXenVMM", &regs[1], 12)
- && (regs[0] - base) >= 2)
- return (base);
- }
- return (0);
+ xen_intr_handle_upcall(trap_frame);
+ return (FILTER_HANDLED);
}
-/*
- * Allocate and fill in the hypcall page.
- */
static int
-xenpci_init_hypercall_stubs(device_t dev, struct xenpci_softc * scp)
+xenpci_irq_init(device_t device, struct xenpci_softc *scp)
{
- uint32_t base, regs[4];
- int i;
-
- base = xenpci_cpuid_base();
- if (!base) {
- device_printf(dev, "Xen platform device but not Xen VMM\n");
- return (EINVAL);
- }
+ int error;
- if (bootverbose) {
- do_cpuid(base + 1, regs);
- device_printf(dev, "Xen version %d.%d.\n",
- regs[0] >> 16, regs[0] & 0xffff);
- }
+ error = BUS_SETUP_INTR(device_get_parent(device), device,
+ scp->res_irq, INTR_MPSAFE|INTR_TYPE_MISC,
+ xenpci_intr_filter, NULL, /*trap_frame*/NULL,
+ &scp->intr_cookie);
+ if (error)
+ return error;
/*
- * Find the hypercall pages.
+ * When using the PCI event delivery callback we cannot assign
+ * events to specific vCPUs, so all events are delivered to vCPU#0 by
+ * Xen. Since the PCI interrupt can fire on any CPU by default, we
+ * need to bind it to vCPU#0 in order to ensure that
+ * xen_intr_handle_upcall always gets called on vCPU#0.
*/
- do_cpuid(base + 2, regs);
-
- hypercall_stubs = malloc(regs[0] * PAGE_SIZE, M_TEMP, M_WAITOK);
-
- for (i = 0; i < regs[0]; i++) {
- wrmsr(regs[1], vtophys(hypercall_stubs + i * PAGE_SIZE) + i);
- }
+ error = BUS_BIND_INTR(device_get_parent(device), device,
+ scp->res_irq, 0);
+ if (error)
+ return error;
+ xen_hvm_set_callback(device);
return (0);
}
/*
- * After a resume, re-initialise the hypercall page.
- */
-static void
-xenpci_resume_hypercall_stubs(device_t dev, struct xenpci_softc * scp)
-{
- uint32_t base, regs[4];
- int i;
-
- base = xenpci_cpuid_base();
-
- do_cpuid(base + 2, regs);
- for (i = 0; i < regs[0]; i++) {
- wrmsr(regs[1], vtophys(hypercall_stubs + i * PAGE_SIZE) + i);
- }
-}
-
-/*
- * Tell the hypervisor how to contact us for event channel callbacks.
- */
-static void
-xenpci_set_callback(device_t dev)
-{
- int irq;
- uint64_t callback;
- struct xen_hvm_param xhp;
-
- irq = pci_get_irq(dev);
- if (irq < 16) {
- callback = irq;
- } else {
- callback = (pci_get_intpin(dev) - 1) & 3;
- callback |= pci_get_slot(dev) << 11;
- callback |= 1ull << 56;
- }
-
- xhp.domid = DOMID_SELF;
- xhp.index = HVM_PARAM_CALLBACK_IRQ;
- xhp.value = callback;
- if (HYPERVISOR_hvm_op(HVMOP_set_param, &xhp))
- panic("Can't set evtchn callback");
-}
-
-
-/*
* Deallocate anything allocated by xenpci_allocate_resources.
*/
static int
@@ -293,35 +217,6 @@ xenpci_deactivate_resource(device_t dev, device_t child, int type,
}
/*
- * Called very early in the resume sequence - reinitialise the various
- * bits of Xen machinery including the hypercall page and the shared
- * info page.
- */
-void
-xenpci_resume()
-{
- device_t dev = devclass_get_device(xenpci_devclass, 0);
- struct xenpci_softc *scp = device_get_softc(dev);
- struct xen_add_to_physmap xatp;
-
- xenpci_resume_hypercall_stubs(dev, scp);
-
- xatp.domid = DOMID_SELF;
- xatp.idx = 0;
- xatp.space = XENMAPSPACE_shared_info;
- xatp.gpfn = shared_info_pa >> PAGE_SHIFT;
- if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
- panic("HYPERVISOR_memory_op failed");
-
- pmap_kenter((vm_offset_t) HYPERVISOR_shared_info, shared_info_pa);
-
- xenpci_set_callback(dev);
-
- gnttab_resume();
- irq_resume();
-}
-
-/*
* Probe - just check device ID.
*/
static int
@@ -341,11 +236,9 @@ xenpci_probe(device_t dev)
static int
xenpci_attach(device_t dev)
{
- int error;
struct xenpci_softc *scp = device_get_softc(dev);
- struct xen_add_to_physmap xatp;
- vm_offset_t shared_va;
devclass_t dc;
+ int error;
/*
* Find and record nexus0. Since we are not really on the
@@ -365,33 +258,15 @@ xenpci_attach(device_t dev)
goto errexit;
}
- error = xenpci_init_hypercall_stubs(dev, scp);
- if (error) {
- device_printf(dev, "xenpci_init_hypercall_stubs failed(%d).\n",
- error);
- goto errexit;
- }
-
- setup_xen_features();
-
- xenpci_alloc_space_int(scp, PAGE_SIZE, &shared_info_pa);
-
- xatp.domid = DOMID_SELF;
- xatp.idx = 0;
- xatp.space = XENMAPSPACE_shared_info;
- xatp.gpfn = shared_info_pa >> PAGE_SHIFT;
- if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
- panic("HYPERVISOR_memory_op failed");
-
- shared_va = kva_alloc(PAGE_SIZE);
- pmap_kenter(shared_va, shared_info_pa);
- HYPERVISOR_shared_info = (void *) shared_va;
-
/*
* Hook the irq up to evtchn
*/
- xenpci_irq_init(dev, scp);
- xenpci_set_callback(dev);
+ error = xenpci_irq_init(dev, scp);
+ if (error) {
+ device_printf(dev, "xenpci_irq_init failed(%d).\n",
+ error);
+ goto errexit;
+ }
return (bus_generic_attach(dev));
@@ -431,13 +306,42 @@ xenpci_detach(device_t dev)
return (xenpci_deallocate_resources(dev));
}
+static int
+xenpci_suspend(device_t dev)
+{
+ struct xenpci_softc *scp = device_get_softc(dev);
+ device_t parent = device_get_parent(dev);
+
+ if (scp->intr_cookie != NULL) {
+ if (BUS_TEARDOWN_INTR(parent, dev, scp->res_irq,
+ scp->intr_cookie) != 0)
+ printf("intr teardown failed.. continuing\n");
+ scp->intr_cookie = NULL;
+ }
+
+ return (bus_generic_suspend(dev));
+}
+
+static int
+xenpci_resume(device_t dev)
+{
+ struct xenpci_softc *scp = device_get_softc(dev);
+ device_t parent = device_get_parent(dev);
+
+ BUS_SETUP_INTR(parent, dev, scp->res_irq,
+ INTR_MPSAFE|INTR_TYPE_MISC, xenpci_intr_filter, NULL,
+ /*trap_frame*/NULL, &scp->intr_cookie);
+ xen_hvm_set_callback(dev);
+ return (bus_generic_resume(dev));
+}
+
static device_method_t xenpci_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, xenpci_probe),
DEVMETHOD(device_attach, xenpci_attach),
DEVMETHOD(device_detach, xenpci_detach),
- DEVMETHOD(device_suspend, bus_generic_suspend),
- DEVMETHOD(device_resume, bus_generic_resume),
+ DEVMETHOD(device_suspend, xenpci_suspend),
+ DEVMETHOD(device_resume, xenpci_resume),
/* Bus interface */
DEVMETHOD(bus_add_child, bus_generic_add_child),
OpenPOWER on IntegriCloud