| Message ID | 1405059585-10620-22-git-send-email-jiang.liu@linux.intel.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Fri, Jul 11, 2014 at 12:19 AM, Jiang Liu <jiang.liu@linux.intel.com> wrote: > Finally enhance pci_root driver to support DMAR device hotplug when > hot-plugging PCI host bridges. > > Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> I assume you'll merge this along with the rest of the series via some non-PCI tree. > --- > drivers/acpi/pci_root.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index d388f13d48b4..99c2b9761c12 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -33,6 +33,7 @@ > #include <linux/pci.h> > #include <linux/pci-acpi.h> > #include <linux/pci-aspm.h> > +#include <linux/dmar.h> > #include <linux/acpi.h> > #include <linux/slab.h> > #include <acpi/apei.h> /* for acpi_hest_init() */ > @@ -511,6 +512,7 @@ static int acpi_pci_root_add(struct acpi_device *device, > struct acpi_pci_root *root; > acpi_handle handle = device->handle; > int no_aspm = 0, clear_aspm = 0; > + bool hotadd = system_state != SYSTEM_BOOTING; > > root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL); > if (!root) > @@ -557,6 +559,11 @@ static int acpi_pci_root_add(struct acpi_device *device, > strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); > device->driver_data = root; > > + if (hotadd && dmar_device_add(handle)) { > + result = -ENXIO; > + goto end; > + } > + > pr_info(PREFIX "%s [%s] (domain %04x %pR)\n", > acpi_device_name(device), acpi_device_bid(device), > root->segment, &root->secondary); > @@ -583,7 +590,7 @@ static int acpi_pci_root_add(struct acpi_device *device, > root->segment, (unsigned int)root->secondary.start); > device->driver_data = NULL; > result = -ENODEV; > - goto end; > + goto remove_dmar; > } > > if (clear_aspm) { > @@ -597,7 +604,7 @@ static int acpi_pci_root_add(struct acpi_device *device, > if (device->wakeup.flags.run_wake) > device_set_run_wake(root->bus->bridge, true); > > - if (system_state != SYSTEM_BOOTING) { > + if (hotadd) { > pcibios_resource_survey_bus(root->bus); > pci_assign_unassigned_root_bus_resources(root->bus); > } > @@ -607,6 +614,9 @@ static int acpi_pci_root_add(struct acpi_device *device, > pci_unlock_rescan_remove(); > return 1; > > +remove_dmar: > + if (hotadd) > + dmar_device_remove(handle); > end: > kfree(root); > return result; > @@ -625,6 +635,8 @@ static void acpi_pci_root_remove(struct acpi_device *device) > > pci_remove_root_bus(root->bus); > > + dmar_device_remove(device->handle); > + > pci_unlock_rescan_remove(); > > kfree(root); > -- > 1.7.10.4 > -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index d388f13d48b4..99c2b9761c12 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -33,6 +33,7 @@ #include <linux/pci.h> #include <linux/pci-acpi.h> #include <linux/pci-aspm.h> +#include <linux/dmar.h> #include <linux/acpi.h> #include <linux/slab.h> #include <acpi/apei.h> /* for acpi_hest_init() */ @@ -511,6 +512,7 @@ static int acpi_pci_root_add(struct acpi_device *device, struct acpi_pci_root *root; acpi_handle handle = device->handle; int no_aspm = 0, clear_aspm = 0; + bool hotadd = system_state != SYSTEM_BOOTING; root = kzalloc(sizeof(struct acpi_pci_root), GFP_KERNEL); if (!root) @@ -557,6 +559,11 @@ static int acpi_pci_root_add(struct acpi_device *device, strcpy(acpi_device_class(device), ACPI_PCI_ROOT_CLASS); device->driver_data = root; + if (hotadd && dmar_device_add(handle)) { + result = -ENXIO; + goto end; + } + pr_info(PREFIX "%s [%s] (domain %04x %pR)\n", acpi_device_name(device), acpi_device_bid(device), root->segment, &root->secondary); @@ -583,7 +590,7 @@ static int acpi_pci_root_add(struct acpi_device *device, root->segment, (unsigned int)root->secondary.start); device->driver_data = NULL; result = -ENODEV; - goto end; + goto remove_dmar; } if (clear_aspm) { @@ -597,7 +604,7 @@ static int acpi_pci_root_add(struct acpi_device *device, if (device->wakeup.flags.run_wake) device_set_run_wake(root->bus->bridge, true); - if (system_state != SYSTEM_BOOTING) { + if (hotadd) { pcibios_resource_survey_bus(root->bus); pci_assign_unassigned_root_bus_resources(root->bus); } @@ -607,6 +614,9 @@ static int acpi_pci_root_add(struct acpi_device *device, pci_unlock_rescan_remove(); return 1; +remove_dmar: + if (hotadd) + dmar_device_remove(handle); end: kfree(root); return result; @@ -625,6 +635,8 @@ static void acpi_pci_root_remove(struct acpi_device *device) pci_remove_root_bus(root->bus); + dmar_device_remove(device->handle); + pci_unlock_rescan_remove(); kfree(root);
Finally enhance pci_root driver to support DMAR device hotplug when hot-plugging PCI host bridges. Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> --- drivers/acpi/pci_root.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)