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

Commit 18d63c35 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next

parents 168ae6a0 cd4faf9c

drivers/acpi/pci_root.c

+58 −43
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/spinlock.h>

#include <linux/mutex.h>

#include <linux/pm.h>

#include <linux/pm_runtime.h>

#include <linux/pci.h>
@@ -71,9 +71,11 @@ static struct acpi_driver acpi_pci_root_driver = { 
		},

};



/* Lock to protect both acpi_pci_roots and acpi_pci_drivers lists */

static DEFINE_MUTEX(acpi_pci_root_lock);

static LIST_HEAD(acpi_pci_roots);

static LIST_HEAD(acpi_pci_drivers);



static struct acpi_pci_driver *sub_driver;

static DEFINE_MUTEX(osc_lock);



int acpi_pci_register_driver(struct acpi_pci_driver *driver)
@@ -81,55 +83,46 @@ int acpi_pci_register_driver(struct acpi_pci_driver *driver) 
	int n = 0;

	struct acpi_pci_root *root;



	struct acpi_pci_driver **pptr = &sub_driver;

	while (*pptr)

		pptr = &(*pptr)->next;

	*pptr = driver;



	if (!driver->add)

		return 0;



	mutex_lock(&acpi_pci_root_lock);

	list_add_tail(&driver->node, &acpi_pci_drivers);

	if (driver->add)

		list_for_each_entry(root, &acpi_pci_roots, node) {

		driver->add(root->device->handle);

			driver->add(root);

			n++;

		}

	mutex_unlock(&acpi_pci_root_lock);



	return n;

}



EXPORT_SYMBOL(acpi_pci_register_driver);



void acpi_pci_unregister_driver(struct acpi_pci_driver *driver)

{

	struct acpi_pci_root *root;



	struct acpi_pci_driver **pptr = &sub_driver;

	while (*pptr) {

		if (*pptr == driver)

			break;

		pptr = &(*pptr)->next;

	}

	BUG_ON(!*pptr);

	*pptr = (*pptr)->next;



	if (!driver->remove)

		return;



	mutex_lock(&acpi_pci_root_lock);

	list_del(&driver->node);

	if (driver->remove)

		list_for_each_entry(root, &acpi_pci_roots, node)

		driver->remove(root->device->handle);

			driver->remove(root);

	mutex_unlock(&acpi_pci_root_lock);

}



EXPORT_SYMBOL(acpi_pci_unregister_driver);



acpi_handle acpi_get_pci_rootbridge_handle(unsigned int seg, unsigned int bus)

{

	struct acpi_pci_root *root;

	acpi_handle handle = NULL;

	

	mutex_lock(&acpi_pci_root_lock);

	list_for_each_entry(root, &acpi_pci_roots, node)

		if ((root->segment == (u16) seg) &&

		    (root->secondary.start == (u16) bus))

			return root->device->handle;

	return NULL;		

		    (root->secondary.start == (u16) bus)) {

			handle = root->device->handle;

			break;

		}

	mutex_unlock(&acpi_pci_root_lock);

	return handle;

}



EXPORT_SYMBOL_GPL(acpi_get_pci_rootbridge_handle);
@@ -277,12 +270,15 @@ static acpi_status acpi_pci_osc_support(struct acpi_pci_root *root, u32 flags) 
struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)

{

	struct acpi_pci_root *root;

	struct acpi_device *device;



	list_for_each_entry(root, &acpi_pci_roots, node) {

		if (root->device->handle == handle)

			return root;

	}

	if (acpi_bus_get_device(handle, &device) ||

	    acpi_match_device_ids(device, root_device_ids))

		return NULL;



	root = acpi_driver_data(device);



	return root;

}

EXPORT_SYMBOL_GPL(acpi_pci_find_root);
@@ -518,8 +514,9 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) 
	 * TBD: Need PCI interface for enumeration/configuration of roots.

	 */



	/* TBD: Locking */

	mutex_lock(&acpi_pci_root_lock);

	list_add_tail(&root->node, &acpi_pci_roots);

	mutex_unlock(&acpi_pci_root_lock);



	printk(KERN_INFO PREFIX "%s [%s] (domain %04x %pR)\n",

	       acpi_device_name(device), acpi_device_bid(device),
@@ -538,7 +535,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) 
			    "Bus %04x:%02x not present in PCI namespace\n",

			    root->segment, (unsigned int)root->secondary.start);

		result = -ENODEV;

		goto end;

		goto out_del_root;

	}



	/*
@@ -548,7 +545,7 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) 
	 */

	result = acpi_pci_bind_root(device);

	if (result)

		goto end;

		goto out_del_root;



	/*

	 * PCI Routing Table
@@ -633,9 +630,11 @@ static int __devinit acpi_pci_root_add(struct acpi_device *device) 


	return 0;



end:

	if (!list_empty(&root->node))

out_del_root:

	mutex_lock(&acpi_pci_root_lock);

	list_del(&root->node);

	mutex_unlock(&acpi_pci_root_lock);

end:

	kfree(root);

	return result;

}
@@ -643,18 +642,34 @@ end: 
static int acpi_pci_root_start(struct acpi_device *device)

{

	struct acpi_pci_root *root = acpi_driver_data(device);

	struct acpi_pci_driver *driver;



	mutex_lock(&acpi_pci_root_lock);

	list_for_each_entry(driver, &acpi_pci_drivers, node)

		if (driver->add)

			driver->add(root);

	mutex_unlock(&acpi_pci_root_lock);



	pci_bus_add_devices(root->bus);



	return 0;

}



static int acpi_pci_root_remove(struct acpi_device *device, int type)

{

	struct acpi_pci_root *root = acpi_driver_data(device);

	struct acpi_pci_driver *driver;



	mutex_lock(&acpi_pci_root_lock);

	list_for_each_entry(driver, &acpi_pci_drivers, node)

		if (driver->remove)

			driver->remove(root);



	device_set_run_wake(root->bus->bridge, false);

	pci_acpi_remove_bus_pm_notifier(device);



	list_del(&root->node);

	mutex_unlock(&acpi_pci_root_lock);

	kfree(root);

	return 0;

}

drivers/acpi/pci_slot.c

+10 −34
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ struct acpi_pci_slot { 
	struct list_head list;		/* node in the list of slots */

};



static int acpi_pci_slot_add(acpi_handle handle);

static void acpi_pci_slot_remove(acpi_handle handle);

static int acpi_pci_slot_add(struct acpi_pci_root *root);

static void acpi_pci_slot_remove(struct acpi_pci_root *root);



static LIST_HEAD(slot_list);

static DEFINE_MUTEX(slot_list_lock);
@@ -233,45 +233,20 @@ out: 


/*

 * walk_root_bridge - generic root bridge walker

 * @handle: points to an acpi_pci_root

 * @root: poiner of an acpi_pci_root

 * @user_function: user callback for slot objects

 *

 * Call user_function for all objects underneath this root bridge.

 * Walk p2p bridges underneath us and call user_function on those too.

 */

static int

walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function)

walk_root_bridge(struct acpi_pci_root *root, acpi_walk_callback user_function)

{

	int seg, bus;

	unsigned long long tmp;

	acpi_status status;

	acpi_handle dummy_handle;

	struct pci_bus *pci_bus;

	acpi_handle handle = root->device->handle;

	struct pci_bus *pci_bus = root->bus;

	struct callback_args context;



	/* If the bridge doesn't have _STA, we assume it is always there */

	status = acpi_get_handle(handle, "_STA", &dummy_handle);

	if (ACPI_SUCCESS(status)) {

		status = acpi_evaluate_integer(handle, "_STA", NULL, &tmp);

		if (ACPI_FAILURE(status)) {

			info("%s: _STA evaluation failure\n", __func__);

			return 0;

		}

		if ((tmp & ACPI_STA_DEVICE_FUNCTIONING) == 0)

			/* don't register this object */

			return 0;

	}



	status = acpi_evaluate_integer(handle, "_SEG", NULL, &tmp);

	seg = ACPI_SUCCESS(status) ? tmp : 0;



	status = acpi_evaluate_integer(handle, "_BBN", NULL, &tmp);

	bus = ACPI_SUCCESS(status) ? tmp : 0;



	pci_bus = pci_find_bus(seg, bus);

	if (!pci_bus)

		return 0;



	context.pci_bus = pci_bus;

	context.user_function = user_function;

	context.root_handle = handle;
@@ -295,11 +270,11 @@ walk_root_bridge(acpi_handle handle, acpi_walk_callback user_function) 
 * @handle: points to an acpi_pci_root

 */

static int

acpi_pci_slot_add(acpi_handle handle)

acpi_pci_slot_add(struct acpi_pci_root *root)

{

	acpi_status status;



	status = walk_root_bridge(handle, register_slot);

	status = walk_root_bridge(root, register_slot);

	if (ACPI_FAILURE(status))

		err("%s: register_slot failure - %d\n", __func__, status);
@@ -311,10 +286,11 @@ acpi_pci_slot_add(acpi_handle handle) 
 * @handle: points to an acpi_pci_root

 */

static void

acpi_pci_slot_remove(acpi_handle handle)

acpi_pci_slot_remove(struct acpi_pci_root *root)

{

	struct acpi_pci_slot *slot, *tmp;

	struct pci_bus *pbus;

	acpi_handle handle = root->device->handle;



	mutex_lock(&slot_list_lock);

	list_for_each_entry_safe(slot, tmp, &slot_list, list) {

drivers/pci/hotplug/acpiphp_glue.c

+7 −5
Original line number Diff line number Diff line
@@ -382,10 +382,10 @@ static inline void config_p2p_bridge_flags(struct acpiphp_bridge *bridge) 




/* allocate and initialize host bridge data structure */

static void add_host_bridge(acpi_handle *handle)

static void add_host_bridge(struct acpi_pci_root *root)

{

	struct acpiphp_bridge *bridge;

	struct acpi_pci_root *root = acpi_pci_find_root(handle);

	acpi_handle handle = root->device->handle;



	bridge = kzalloc(sizeof(struct acpiphp_bridge), GFP_KERNEL);

	if (bridge == NULL)
@@ -468,11 +468,12 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) 




/* find hot-pluggable slots, and then find P2P bridge */

static int add_bridge(acpi_handle handle)

static int add_bridge(struct acpi_pci_root *root)

{

	acpi_status status;

	unsigned long long tmp;

	acpi_handle dummy_handle;

	acpi_handle handle = root->device->handle;



	/* if the bridge doesn't have _STA, we assume it is always there */

	status = acpi_get_handle(handle, "_STA", &dummy_handle);
@@ -490,7 +491,7 @@ static int add_bridge(acpi_handle handle) 
	/* check if this bridge has ejectable slots */

	if (detect_ejectable_slots(handle) > 0) {

		dbg("found PCI host-bus bridge with hot-pluggable slots\n");

		add_host_bridge(handle);

		add_host_bridge(root);

	}



	/* search P2P bridges under this host bridge */
@@ -588,9 +589,10 @@ cleanup_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv) 
	return AE_OK;

}



static void remove_bridge(acpi_handle handle)

static void remove_bridge(struct acpi_pci_root *root)

{

	struct acpiphp_bridge *bridge;

	acpi_handle handle = root->device->handle;



	/* cleanup p2p bridges under this host bridge

	   in a depth-first manner */

include/linux/acpi.h

+3 −3
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ void acpi_penalize_isa_irq(int irq, int active); 
void acpi_pci_irq_disable (struct pci_dev *dev);



struct acpi_pci_driver {

	struct acpi_pci_driver *next;

	int (*add)(acpi_handle handle);

	void (*remove)(acpi_handle handle);

	struct list_head node;

	int (*add)(struct acpi_pci_root *root);

	void (*remove)(struct acpi_pci_root *root);

};



int acpi_pci_register_driver(struct acpi_pci_driver *driver);

include/linux/pci-acpi.h

+11 −6
Original line number Diff line number Diff line
@@ -22,19 +22,24 @@ extern phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle); 
static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)

{

	struct pci_bus *pbus = pdev->bus;



	/* Find a PCI root bus */

	while (!pci_is_root_bus(pbus))

		pbus = pbus->parent;

	return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),

					      pbus->number);



	return DEVICE_ACPI_HANDLE(pbus->bridge);

}



static inline acpi_handle acpi_pci_get_bridge_handle(struct pci_bus *pbus)

{

	if (!pci_is_root_bus(pbus))

		return DEVICE_ACPI_HANDLE(&(pbus->self->dev));

	return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus),

					      pbus->number);

	struct device *dev;



	if (pci_is_root_bus(pbus))

		dev = pbus->bridge;

	else

		dev = &pbus->self->dev;



	return DEVICE_ACPI_HANDLE(dev);

}

#endif