xen: create a new PCI bus override

When running as a Xen PVH Dom0 we need to add custom buses that override
some of the functionality present in the ACPI PCI Bus and the PCI Bus. We
currently override the ACPI PCI Bus, but not the PCI Bus, so add a new
override for the PCI Bus and share the generic functions between them.

Reported by: David P. Discher <dpd@dpdtech.com>
Sponsored by: Citrix Systems R&D

conf/files.amd64:
 - Add the new files.

x86/xen/xen_pci_bus.c:
 - Generic file that contains the PCI overrides so they can be used by the
   several PCI specific buses.

xen/xen_pci.h:
 - Prototypes for the generic overried functions.

dev/xen/pci/xen_pci.c:
 - Xen specific override for the PCI bus.

dev/xen/pci/xen_acpi_pci.c:
 - Xen specific override for the ACPI PCI bus.

5 files changed, 212 insertions, 47 deletions

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index d8a3a632a5e2..8e529563f516 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -336,6 +336,8 @@ dev/viawd/viawd.c		optional	viawd
 dev/vmware/vmxnet3/if_vmx.c	optional	vmx
 dev/wbwd/wbwd.c			optional	wbwd
 dev/wpi/if_wpi.c		optional	wpi
+dev/xen/pci/xen_acpi_pci.c	optional	xenhvm
+dev/xen/pci/xen_pci.c		optional	xenhvm
 dev/isci/isci.c							optional isci
 dev/isci/isci_controller.c					optional isci
 dev/isci/isci_domain.c						optional isci
@@ -572,4 +574,4 @@ x86/xen/xen_apic.c		optional	xenhvm
 x86/xen/xenpv.c			optional	xenhvm
 x86/xen/xen_nexus.c		optional	xenhvm
 x86/xen/xen_msi.c		optional	xenhvm
-x86/xen/xen_pci.c		optional	xenhvm
+x86/xen/xen_pci_bus.c		optional	xenhvm
diff --git a/sys/dev/xen/pci/xen_acpi_pci.c b/sys/dev/xen/pci/xen_acpi_pci.c
new file mode 100644
index 000000000000..0eadd4ae6ca9
--- /dev/null
+++ b/sys/dev/xen/pci/xen_acpi_pci.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR 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 OR CONTRIBUTORS 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>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+
+#include <dev/acpica/acpivar.h>
+
+#include <sys/pciio.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pci_private.h>
+
+#include <xen/xen-os.h>
+#include <xen/hypervisor.h>
+#include <xen/xen_pci.h>
+
+#include "pcib_if.h"
+#include "pci_if.h"
+
+static int
+xen_acpi_pci_probe(device_t dev)
+{
+
+	if (!xen_pv_domain())
+		return (ENXIO);
+	if (acpi_get_handle(dev) == NULL)
+		return (ENXIO);
+
+	device_set_desc(dev, "Xen ACPI PCI bus");
+
+	return (BUS_PROBE_SPECIFIC);
+}
+
+static device_method_t xen_acpi_pci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		xen_acpi_pci_probe),
+
+	/* PCI interface overwrites */
+	DEVMETHOD(pci_enable_msi,	xen_pci_enable_msi_method),
+	DEVMETHOD(pci_disable_msi,	xen_pci_disable_msi_method),
+	DEVMETHOD(pci_child_added,	xen_pci_child_added_method),
+
+	DEVMETHOD_END
+};
+
+static devclass_t pci_devclass;
+
+DECLARE_CLASS(acpi_pci_driver);
+DEFINE_CLASS_1(pci, xen_acpi_pci_driver, xen_acpi_pci_methods,
+    sizeof(struct pci_softc), acpi_pci_driver);
+DRIVER_MODULE(xen_acpi_pci, pcib, xen_acpi_pci_driver, pci_devclass, 0, 0);
+MODULE_DEPEND(xen_acpi_pci, pci, 1, 1, 1);
+MODULE_DEPEND(xen_acpi_pci, acpi, 1, 1, 1);
+MODULE_VERSION(xen_acpi_pci, 1);
diff --git a/sys/dev/xen/pci/xen_pci.c b/sys/dev/xen/pci/xen_pci.c
new file mode 100644
index 000000000000..2637d6305bd0
--- /dev/null
+++ b/sys/dev/xen/pci/xen_pci.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR 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 OR CONTRIBUTORS 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>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+
+#include <sys/pciio.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pci_private.h>
+
+#include <xen/xen-os.h>
+#include <xen/hypervisor.h>
+#include <xen/xen_pci.h>
+
+#include "pcib_if.h"
+#include "pci_if.h"
+
+static int
+xen_pci_probe(device_t dev)
+{
+
+	if (!xen_pv_domain())
+		return (ENXIO);
+
+	device_set_desc(dev, "Xen PCI bus");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+static device_method_t xen_pci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		xen_pci_probe),
+
+	/* PCI interface overwrites */
+	DEVMETHOD(pci_enable_msi,	xen_pci_enable_msi_method),
+	DEVMETHOD(pci_disable_msi,	xen_pci_disable_msi_method),
+	DEVMETHOD(pci_child_added,	xen_pci_child_added_method),
+
+	DEVMETHOD_END
+};
+
+static devclass_t pci_devclass;
+
+DECLARE_CLASS(pci_driver);
+DEFINE_CLASS_1(pci, xen_pci_driver, xen_pci_methods, sizeof(struct pci_softc),
+    pci_driver);
+DRIVER_MODULE(xen_pci, pcib, xen_pci_driver, pci_devclass, 0, 0);
+MODULE_DEPEND(xen_pci, pci, 1, 1, 1);
+MODULE_VERSION(xen_pci, 1);
diff --git a/sys/x86/xen/xen_pci.c b/sys/x86/xen/xen_pci_bus.c
index d4a427d4cf96..e75463fa0249 100644
--- a/sys/x86/xen/xen_pci.c
+++ b/sys/x86/xen/xen_pci_bus.c
@@ -31,8 +31,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
 
 #include <sys/pciio.h>
 #include <dev/pci/pcireg.h>
@@ -41,52 +39,12 @@ __FBSDID("$FreeBSD$");
 
 #include <xen/xen-os.h>
 #include <xen/hypervisor.h>
+#include <xen/xen_pci.h>
 
 #include "pcib_if.h"
 #include "pci_if.h"
 
-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_child_added_method(device_t dev, device_t child);
-
-static device_method_t xen_pci_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		xen_pci_probe),
-
-	/* PCI interface overwrites */
-	DEVMETHOD(pci_enable_msi,	xen_pci_enable_msi_method),
-	DEVMETHOD(pci_disable_msi,	xen_pci_disable_msi_method),
-	DEVMETHOD(pci_child_added,	xen_pci_child_added_method),
-
-	DEVMETHOD_END
-};
-
-static devclass_t pci_devclass;
-
-DECLARE_CLASS(acpi_pci_driver);
-DEFINE_CLASS_1(pci, xen_pci_driver, xen_pci_methods, sizeof(struct pci_softc),
-    acpi_pci_driver);
-DRIVER_MODULE(xen_pci, pcib, xen_pci_driver, pci_devclass, 0, 0);
-MODULE_DEPEND(xen_pci, pci, 1, 1, 1);
-MODULE_DEPEND(xen_pci, acpi, 1, 1, 1);
-MODULE_VERSION(xen_pci, 1);
-
-static int
-xen_pci_probe(device_t dev)
-{
-
-	device_set_desc(dev, "Xen PCI bus");
-
-	if (!xen_pv_domain())
-		return (ENXIO);
-
-	return (BUS_PROBE_SPECIFIC);
-}
-
-static void
+void
 xen_pci_enable_msi_method(device_t dev, device_t child, uint64_t address,
      uint16_t data)
 {
@@ -99,7 +57,7 @@ xen_pci_enable_msi_method(device_t dev, device_t child, uint64_t address,
 	    msi->msi_ctrl, 2);
 }
 
-static void
+void
 xen_pci_disable_msi_method(device_t dev, device_t child)
 {
 	struct pci_devinfo *dinfo = device_get_ivars(child);
@@ -110,7 +68,7 @@ xen_pci_disable_msi_method(device_t dev, device_t child)
 	    msi->msi_ctrl, 2);
 }
 
-static void
+void
 xen_pci_child_added_method(device_t dev, device_t child)
 {
 	struct pci_devinfo *dinfo;
diff --git a/sys/xen/xen_pci.h b/sys/xen/xen_pci.h
new file mode 100644
index 000000000000..f19168e0598d
--- /dev/null
+++ b/sys/xen/xen_pci.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
+ * All rights reserved.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS AS IS'' AND
+ * ANY EXPRESS OR 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 OR CONTRIBUTORS 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef __XEN_PCI_H__
+#define __XEN_PCI_H__
+
+void xen_pci_enable_msi_method(device_t dev, device_t child, uint64_t address,
+     uint16_t data);
+void xen_pci_disable_msi_method(device_t dev, device_t child);
+void xen_pci_child_added_method(device_t dev, device_t child);
+
+#endif /* !__XEN_PCI_H__ */