Commit a3b6bbd5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/jiang-subdrivers' into next 

* pci/jiang-subdrivers:
  PCI/ACPI: Remove support of ACPI PCI subdrivers
  PCI: acpiphp: Protect acpiphp data structures from concurrent updates
  PCI: acpiphp: Use normal list to simplify implementation
  PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
  PCI: acpiphp: Convert acpiphp to be builtin only, not modular
  PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses
  x86/PCI: Implement pcibios_{add|remove}_bus() hooks
  ia64/PCI: Implement pcibios_{add|remove}_bus() hooks
  PCI/ACPI: Prepare stub functions to handle ACPI PCI (hotplug) slots
  PCI: Add pcibios hooks for adding and removing PCI buses
  PCI: acpiphp: Replace local macros with standard ACPI macros
  PCI: acpiphp: Remove all functions even if function 0 doesn't exist
  PCI: acpiphp: Use list_for_each_entry_safe() in acpiphp_sanitize_bus()
  PCI: Clean up usages of pci_bus->is_added
  PCI: When removing bus, always remove legacy files & unregister
parents 30e22b23 c309dbb4

arch/ia64/pci/pci.c

+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/pci-acpi.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/slab.h>
@@ -458,6 +459,16 @@ void pcibios_fixup_bus(struct pci_bus *b) 
	platform_pci_fixup_bus(b);

}



void pcibios_add_bus(struct pci_bus *bus)

{

	acpi_pci_add_bus(bus);

}



void pcibios_remove_bus(struct pci_bus *bus)

{

	acpi_pci_remove_bus(bus);

}



void pcibios_set_master (struct pci_dev *dev)

{

	/* No special bus mastering setup handling */

arch/x86/pci/common.c

+11 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include <linux/sched.h>

#include <linux/pci.h>

#include <linux/pci-acpi.h>

#include <linux/ioport.h>

#include <linux/init.h>

#include <linux/dmi.h>
@@ -170,6 +171,16 @@ void pcibios_fixup_bus(struct pci_bus *b) 
		pcibios_fixup_device_resources(dev);

}



void pcibios_add_bus(struct pci_bus *bus)

{

	acpi_pci_add_bus(bus);

}



void pcibios_remove_bus(struct pci_bus *bus)

{

	acpi_pci_remove_bus(bus);

}



/*

 * Only use DMI information to set this if nothing was passed

 * on the kernel command line (which was parsed earlier).

drivers/acpi/pci_root.c

+1 −47
Original line number Diff line number Diff line
@@ -65,44 +65,12 @@ static struct acpi_scan_handler pci_root_handler = { 
	.detach = acpi_pci_root_remove,

};



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

/* Lock to protect both acpi_pci_roots lists */

static DEFINE_MUTEX(acpi_pci_root_lock);

static LIST_HEAD(acpi_pci_roots);

static LIST_HEAD(acpi_pci_drivers);



static DEFINE_MUTEX(osc_lock);



int acpi_pci_register_driver(struct acpi_pci_driver *driver)

{

	int n = 0;

	struct acpi_pci_root *root;



	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);

			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;



	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);

	mutex_unlock(&acpi_pci_root_lock);

}

EXPORT_SYMBOL(acpi_pci_unregister_driver);



/**

 * acpi_is_root_bridge - determine whether an ACPI CA node is a PCI root bridge

 * @handle - the ACPI CA node in question.
@@ -413,7 +381,6 @@ static int acpi_pci_root_add(struct acpi_device *device, 
	acpi_status status;

	int result;

	struct acpi_pci_root *root;

	struct acpi_pci_driver *driver;

	u32 flags, base_flags;

	bool is_osc_granted = false;
@@ -573,12 +540,6 @@ static int acpi_pci_root_add(struct acpi_device *device, 
		pci_assign_unassigned_bus_resources(root->bus);

	}



	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);



	/* need to after hot-added ioapic is registered */

	if (system_state != SYSTEM_BOOTING)

		pci_enable_bridges(root->bus);
@@ -599,16 +560,9 @@ end: 
static void acpi_pci_root_remove(struct acpi_device *device)

{

	struct acpi_pci_root *root = acpi_driver_data(device);

	struct acpi_pci_driver *driver;



	pci_stop_root_bus(root->bus);



	mutex_lock(&acpi_pci_root_lock);

	list_for_each_entry_reverse(driver, &acpi_pci_drivers, node)

		if (driver->remove)

			driver->remove(root);

	mutex_unlock(&acpi_pci_root_lock);



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

	pci_acpi_remove_bus_pm_notifier(device);

drivers/acpi/pci_slot.c

+24 −146
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ 
 *  Copyright (C) 2007-2008 Hewlett-Packard Development Company, L.P.

 *  	Alex Chiang <achiang@hp.com>

 *

 *  Copyright (C) 2013 Huawei Tech. Co., Ltd.

 *	Jiang Liu <jiang.liu@huawei.com>

 *

 *  This program is free software; you can redistribute it and/or modify it

 *  under the terms and conditions of the GNU General Public License,

 *  version 2, as published by the Free Software Foundation.
@@ -28,10 +31,9 @@ 
#include <linux/init.h>

#include <linux/slab.h>

#include <linux/types.h>

#include <linux/list.h>

#include <linux/pci.h>

#include <linux/acpi.h>

#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>

#include <linux/dmi.h>



static bool debug;
@@ -61,20 +63,12 @@ ACPI_MODULE_NAME("pci_slot"); 
#define SLOT_NAME_SIZE 21		/* Inspired by #define in acpiphp.h */



struct acpi_pci_slot {

	acpi_handle root_handle;	/* handle of the root bridge */

	struct pci_slot *pci_slot;	/* corresponding pci_slot */

	struct list_head list;		/* node in the list of slots */

};



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);

static struct acpi_pci_driver acpi_pci_slot_driver = {

	.add = acpi_pci_slot_add,

	.remove = acpi_pci_slot_remove,

};



static int

check_slot(acpi_handle handle, unsigned long long *sun)
@@ -113,21 +107,8 @@ out: 
	return device;

}



struct callback_args {

	acpi_walk_callback	user_function;	/* only for walk_p2p_bridge */

	struct pci_bus		*pci_bus;

	acpi_handle		root_handle;

};



/*

 * register_slot

 *

 * Called once for each SxFy object in the namespace. Don't worry about

 * calling pci_create_slot multiple times for the same pci_bus:device,

 * since each subsequent call simply bumps the refcount on the pci_slot.

 *

 * The number of calls to pci_destroy_slot from unregister_slot is

 * symmetrical.

 * Check whether handle has an associated slot and create PCI slot if it has.

 */

static acpi_status

register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
@@ -137,13 +118,22 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 
	char name[SLOT_NAME_SIZE];

	struct acpi_pci_slot *slot;

	struct pci_slot *pci_slot;

	struct callback_args *parent_context = context;

	struct pci_bus *pci_bus = parent_context->pci_bus;

	struct pci_bus *pci_bus = context;



	device = check_slot(handle, &sun);

	if (device < 0)

		return AE_OK;



	/*

	 * There may be multiple PCI functions associated with the same slot.

	 * Check whether PCI slot has already been created for this PCI device.

	 */

	list_for_each_entry(slot, &slot_list, list) {

		pci_slot = slot->pci_slot;

		if (pci_slot->bus == pci_bus && pci_slot->number == device)

			return AE_OK;

	}



	slot = kmalloc(sizeof(*slot), GFP_KERNEL);

	if (!slot) {

		err("%s: cannot allocate memory\n", __func__);
@@ -158,12 +148,8 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 
		return AE_OK;

	}



	slot->root_handle = parent_context->root_handle;

	slot->pci_slot = pci_slot;

	INIT_LIST_HEAD(&slot->list);

	mutex_lock(&slot_list_lock);

	list_add(&slot->list, &slot_list);

	mutex_unlock(&slot_list_lock);



	get_device(&pci_bus->dev);
@@ -173,131 +159,24 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv) 
	return AE_OK;

}



/*

 * walk_p2p_bridge - discover and walk p2p bridges

 * @handle: points to an acpi_pci_root

 * @context: p2p_bridge_context pointer

 *

 * Note that when we call ourselves recursively, we pass a different

 * value of pci_bus in the child_context.

 */

static acpi_status

walk_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)

void acpi_pci_slot_enumerate(struct pci_bus *bus, acpi_handle handle)

{

	int device, function;

	unsigned long long adr;

	acpi_status status;

	acpi_handle dummy_handle;

	acpi_walk_callback user_function;



	struct pci_dev *dev;

	struct pci_bus *pci_bus;

	struct callback_args child_context;

	struct callback_args *parent_context = context;



	pci_bus = parent_context->pci_bus;

	user_function = parent_context->user_function;



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

	if (ACPI_FAILURE(status))

		return AE_OK;



	status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);

	if (ACPI_FAILURE(status))

		return AE_OK;



	device = (adr >> 16) & 0xffff;

	function = adr & 0xffff;



	dev = pci_get_slot(pci_bus, PCI_DEVFN(device, function));

	if (!dev || !dev->subordinate)

		goto out;



	child_context.pci_bus = dev->subordinate;

	child_context.user_function = user_function;

	child_context.root_handle = parent_context->root_handle;



	dbg("p2p bridge walk, pci_bus = %x\n", dev->subordinate->number);

	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,

				     user_function, NULL, &child_context, NULL);

	if (ACPI_FAILURE(status))

		goto out;



	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,

				     walk_p2p_bridge, NULL, &child_context, NULL);

out:

	pci_dev_put(dev);

	return AE_OK;

}



/*

 * walk_root_bridge - generic root bridge walker

 * @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(struct acpi_pci_root *root, acpi_walk_callback user_function)

{

	acpi_status status;

	acpi_handle handle = root->device->handle;

	struct pci_bus *pci_bus = root->bus;

	struct callback_args context;



	context.pci_bus = pci_bus;

	context.user_function = user_function;

	context.root_handle = handle;



	dbg("root bridge walk, pci_bus = %x\n", pci_bus->number);

	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,

				     user_function, NULL, &context, NULL);

	if (ACPI_FAILURE(status))

		return status;



	status = acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, (u32)1,

				     walk_p2p_bridge, NULL, &context, NULL);

	if (ACPI_FAILURE(status))

		err("%s: walk_p2p_bridge failure - %d\n", __func__, status);



	return status;

}



/*

 * acpi_pci_slot_add

 * @handle: points to an acpi_pci_root

 */

static int

acpi_pci_slot_add(struct acpi_pci_root *root)

{

	acpi_status status;



	status = walk_root_bridge(root, register_slot);

	if (ACPI_FAILURE(status))

		err("%s: register_slot failure - %d\n", __func__, status);



	return status;

	mutex_lock(&slot_list_lock);

	acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,

			    register_slot, NULL, bus, NULL);

	mutex_unlock(&slot_list_lock);

}



/*

 * acpi_pci_slot_remove

 * @handle: points to an acpi_pci_root

 */

static void

acpi_pci_slot_remove(struct acpi_pci_root *root)

void acpi_pci_slot_remove(struct pci_bus *bus)

{

	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) {

		if (slot->root_handle == handle) {

		if (slot->pci_slot->bus == bus) {

			list_del(&slot->list);

			pbus = slot->pci_slot->bus;

			pci_destroy_slot(slot->pci_slot);

			put_device(&pbus->dev);

			put_device(&bus->dev);

			kfree(slot);

		}

	}
@@ -332,5 +211,4 @@ static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = { 
void __init acpi_pci_slot_init(void)

{

	dmi_check_system(acpi_pci_slot_dmi_table);

	acpi_pci_register_driver(&acpi_pci_slot_driver);

}

drivers/acpi/scan.c

+0 −1
Original line number Diff line number Diff line
@@ -1790,7 +1790,6 @@ int __init acpi_scan_init(void) 
	acpi_platform_init();

	acpi_csrt_init();

	acpi_container_init();

	acpi_pci_slot_init();



	mutex_lock(&acpi_scan_lock);

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE