From b68b82e43f5f5fb32f8d85c4e64731ffb5324795 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Thu, 19 Jun 2014 13:05:58 +0200 Subject: [PATCH v5 13/29] xen: add the Xen implementation of pci_add_child Add the Xen specific implementation of pci_add_child to the Xen PCI bus. This is needed so FreeBSD can register the devices it finds with the hypervisor. Approved by: xxx Sponsored by: Citrix Systems R&D x86/xen/xen_pci.c: - Add the Xen pci_add_child method. --- sys/x86/xen/xen_pci.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/sys/x86/xen/xen_pci.c b/sys/x86/xen/xen_pci.c index 5a186c5..29002ad 100644 --- a/sys/x86/xen/xen_pci.c +++ b/sys/x86/xen/xen_pci.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include "pcib_if.h" #include "pci_if.h" @@ -49,6 +50,7 @@ static int xen_pci_probe(device_t dev); static void xen_pci_enable_msi_method(device_t dev, device_t child, uint64_t address, uint16_t data); static void xen_pci_disable_msi_method(device_t dev, device_t child); +static void xen_pci_add_child_method(device_t dev, device_t child); static device_method_t xen_pci_methods[] = { /* Device interface */ @@ -57,6 +59,7 @@ static device_method_t xen_pci_methods[] = { /* PCI interface overwrites */ DEVMETHOD(pci_enable_msi, xen_pci_enable_msi_method), DEVMETHOD(pci_disable_msi, xen_pci_disable_msi_method), + DEVMETHOD(pci_add_child, xen_pci_add_child_method), DEVMETHOD_END }; @@ -106,3 +109,26 @@ xen_pci_disable_msi_method(device_t dev, device_t child) pci_write_config(child, msi->msi_location + PCIR_MSI_CTRL, msi->msi_ctrl, 2); } + +static void +xen_pci_add_child_method(device_t dev, device_t child) +{ + struct pci_devinfo *dinfo; + struct physdev_pci_device_add add_pci; + int error; + + dinfo = device_get_ivars(child); + KASSERT((dinfo != NULL), + ("xen_pci_add_child_method called with NULL dinfo")); + + bzero(&add_pci, sizeof(add_pci)); + add_pci.seg = dinfo->cfg.domain; + add_pci.bus = dinfo->cfg.bus; + add_pci.devfn = (dinfo->cfg.slot << 3) | dinfo->cfg.func; + error = HYPERVISOR_physdev_op(PHYSDEVOP_pci_device_add, &add_pci); + if (error) + panic("unable to add device bus %u devfn %u error: %d\n", + add_pci.bus, add_pci.devfn, error); + + pci_add_child_method(dev, child); +} -- 1.7.7.5 (Apple Git-26)