[Xen-devel] [PATCH 6a/7] PCI device register/unregister + pci_dev cleanups

[Espen Skoglund <espen.skoglund@xxxxxxxxxxxxx>]

Option 1: Hook Linux's PCI probe and remove callbacks

Hijack the pci_bus_type probe and remove callbacks.  This option only
requires modification to the Xen specific part of Linux.

Signed-off-by: Joshua LeVasseur <joshua.levasseur@xxxxxxxxxxxxx>


--
 b/drivers/xen/core/pci.c  |   61 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/xen/core/Makefile |    1 
 2 files changed, 62 insertions(+)
--
--- a/drivers/xen/core/Makefile Fri Jul 04 14:52:40 2008 +0100
+++ b/drivers/xen/core/Makefile Fri Jul 04 14:54:57 2008 +0100
@@ -4,6 +4,7 @@
 
 obj-y := evtchn.o gnttab.o features.o reboot.o machine_reboot.o firmware.o
 
+obj-$(CONFIG_PCI)              += pci.o
 obj-$(CONFIG_PROC_FS)          += xen_proc.o
 obj-$(CONFIG_SYS_HYPERVISOR)   += hypervisor_sysfs.o
 obj-$(CONFIG_HOTPLUG_CPU)      += cpu_hotplug.o
diff -r 535aecec5599 drivers/xen/core/pci.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/drivers/xen/core/pci.c    Fri Jul 04 14:54:57 2008 +0100
@@ -0,0 +1,61 @@
+/*
+ * vim:shiftwidth=8:noexpandtab
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <xen/interface/physdev.h>
+
+static int (*pci_bus_probe)(struct device *dev);
+static int (*pci_bus_remove)(struct device *dev);
+
+static int pci_bus_probe_wrapper(struct device *dev)
+{
+       int r;
+       struct pci_dev *pci_dev = to_pci_dev(dev);
+       struct physdev_manage_pci manage_pci;
+       manage_pci.bus = pci_dev->bus->number;
+       manage_pci.devfn = pci_dev->devfn;
+
+       r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add, &manage_pci);
+       if (r)
+               return r;
+
+       r = pci_bus_probe(dev);
+       if (r)
+               HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove, &manage_pci);
+
+       return r;
+}
+
+static int pci_bus_remove_wrapper(struct device *dev)
+{
+       int r;
+       struct pci_dev *pci_dev = to_pci_dev(dev);
+       struct physdev_manage_pci manage_pci;
+       manage_pci.bus = pci_dev->bus->number;
+       manage_pci.devfn = pci_dev->devfn;
+
+       r = pci_bus_remove(dev);
+       /* dev and pci_dev are no longer valid!! */
+
+       HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_remove, &manage_pci);
+       return r;
+}
+
+static int __init hook_pci_bus(void)
+{
+       if (!is_running_on_xen() || !is_initial_xendomain())
+               return 0;
+
+       pci_bus_probe = pci_bus_type.probe;
+       pci_bus_type.probe = pci_bus_probe_wrapper;
+
+       pci_bus_remove = pci_bus_type.remove;
+       pci_bus_type.remove = pci_bus_remove_wrapper;
+
+       return 0;
+}
+
+core_initcall(hook_pci_bus);

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel