Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 864b94ad authored by Jiang Liu's avatar Jiang Liu Committed by Joerg Roedel
Browse files

pci, ACPI, iommu: Enhance pci_root to support DMAR device hotplug 



Finally enhance pci_root driver to support DMAR device hotplug when
hot-plugging PCI host bridges.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Reviewed-by: default avatarYijing Wang <wangyijing@huawei.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent ffebeb46

drivers/acpi/pci_root.c

+14 −2
Original line number Diff line number Diff line
@@ -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 <linux/dmi.h>
@@ -525,6 +526,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)
@@ -571,6 +573,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);
@@ -597,7 +604,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) {
@@ -611,7 +618,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);

	}
@@ -621,6 +628,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;
@@ -639,6 +649,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);