linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, x86 <x86@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>, Len Brown <lenb@kernel.org>,
	linux-acpi@vger.kernel.org
Subject: [PATCH v2 23/37] PCI, ACPI: Add pci_root_hp hot add hotplug notification
Date: Fri,  9 Mar 2012 23:00:23 -0800	[thread overview]
Message-ID: <1331362837-10740-24-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1331362837-10740-1-git-send-email-yinghai@kernel.org>

It is from acpiphp_glue.c

How to use it?
Find out root bus number to acpi root name mapping from dmesg or /sys

  echo "\_SB.PCIB 0" > /proc/acpi/sci/notify
to add it back

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
---
 drivers/acpi/Makefile      |    1 +
 drivers/acpi/pci_root_hp.c |  237 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+), 0 deletions(-)
 create mode 100644 drivers/acpi/pci_root_hp.c

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 1567028..bc6e53f 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -36,6 +36,7 @@ acpi-y				+= processor_core.o
 acpi-y				+= ec.o
 acpi-$(CONFIG_ACPI_DOCK)	+= dock.o
 acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
+acpi-$(CONFIG_HOTPLUG)		+= pci_root_hp.o
 acpi-y				+= power.o
 acpi-y				+= event.o
 acpi-y				+= sysfs.o
diff --git a/drivers/acpi/pci_root_hp.c b/drivers/acpi/pci_root_hp.c
new file mode 100644
index 0000000..dc11e81
--- /dev/null
+++ b/drivers/acpi/pci_root_hp.c
@@ -0,0 +1,237 @@
+/*
+ * Separated from drivers/pci/hotplug/acpiphp_glue.c
+ *	only support root bridge
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/acpi.h>
+
+static LIST_HEAD(acpi_root_bridge_list);
+struct acpi_root_bridge {
+	struct list_head list;
+	acpi_handle handle;
+	u32 flags;
+};
+
+/* bridge flags */
+#define ROOT_BRIDGE_HAS_EJ0	(0x00000002)
+#define ROOT_BRIDGE_HAS_PS3	(0x00000080)
+
+#define ACPI_STA_FUNCTIONING	(0x00000008)
+
+static struct acpi_root_bridge *acpi_root_handle_to_bridge(acpi_handle handle)
+{
+	struct acpi_root_bridge *bridge;
+
+	list_for_each_entry(bridge, &acpi_root_bridge_list, list)
+		if (bridge->handle == handle)
+			return bridge;
+
+	return NULL;
+}
+
+/* allocate and initialize host bridge data structure */
+static void add_acpi_root_bridge(acpi_handle handle)
+{
+	struct acpi_root_bridge *bridge;
+	acpi_handle dummy_handle;
+	acpi_status status;
+
+	/* 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)) {
+		unsigned long long tmp;
+
+		status = acpi_evaluate_integer(handle, "_STA", NULL, &tmp);
+		if (ACPI_FAILURE(status)) {
+			printk(KERN_DEBUG "%s: _STA evaluation failure\n",
+						 __func__);
+			return;
+		}
+		if ((tmp & ACPI_STA_FUNCTIONING) == 0)
+			/* don't register this object */
+			return;
+	}
+
+	bridge = kzalloc(sizeof(struct acpi_root_bridge), GFP_KERNEL);
+	if (!bridge)
+		return;
+
+	bridge->handle = handle;
+
+	if (ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &dummy_handle)))
+		bridge->flags |= ROOT_BRIDGE_HAS_EJ0;
+	if (ACPI_SUCCESS(acpi_get_handle(handle, "_PS3", &dummy_handle)))
+		bridge->flags |= ROOT_BRIDGE_HAS_PS3;
+
+	list_add(&bridge->list, &acpi_root_bridge_list);
+}
+
+struct acpi_root_hp_work {
+	struct work_struct work;
+	acpi_handle handle;
+	u32 type;
+	void *context;
+};
+
+static void alloc_acpi_root_hp_work(acpi_handle handle, u32 type,
+					void *context,
+					void (*func)(struct work_struct *work))
+{
+	struct acpi_root_hp_work *hp_work;
+	int ret;
+
+	hp_work = kmalloc(sizeof(*hp_work), GFP_KERNEL);
+	if (!hp_work)
+		return;
+
+	hp_work->handle = handle;
+	hp_work->type = type;
+	hp_work->context = context;
+
+	INIT_WORK(&hp_work->work, func);
+	ret = queue_work(kacpi_hotplug_wq, &hp_work->work);
+	if (!ret)
+		kfree(hp_work);
+}
+
+/* Program resources in newly inserted bridge */
+static void acpi_root_configure_bridge(acpi_handle handle)
+{
+	struct acpi_pci_root *root = acpi_pci_find_root(handle);
+
+	pci_assign_unassigned_bus_resources(root->bus);
+}
+
+static void handle_root_bridge_insertion(acpi_handle handle)
+{
+	struct acpi_device *device, *pdevice;
+	acpi_handle phandle;
+	int ret_val;
+
+	acpi_get_parent(handle, &phandle);
+	if (acpi_bus_get_device(phandle, &pdevice)) {
+		printk(KERN_DEBUG "no parent device, assuming NULL\n");
+		pdevice = NULL;
+	}
+	if (!acpi_bus_get_device(handle, &device)) {
+		/* check if  pci root_bus is removed */
+		struct acpi_pci_root *root = acpi_driver_data(device);
+		if (pci_find_bus(root->segment, root->secondary.start))
+			return;
+
+		printk(KERN_DEBUG "bus exists... trim\n");
+		/* this shouldn't be in here, so remove
+		 * the bus then re-add it...
+		 */
+		ret_val = acpi_bus_trim(device, 1);
+		printk(KERN_DEBUG "acpi_bus_trim return %x\n", ret_val);
+	}
+	if (acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE)) {
+		printk(KERN_ERR "cannot add bridge to acpi list\n");
+		return;
+	}
+	acpi_root_configure_bridge(handle);
+	if (acpi_bus_start(device))
+		printk(KERN_ERR "cannot start bridge\n");
+}
+
+static void _handle_hotplug_event_root(struct work_struct *work)
+{
+	struct acpi_root_bridge *bridge;
+	char objname[64];
+	struct acpi_buffer buffer = { .length = sizeof(objname),
+				      .pointer = objname };
+	struct acpi_root_hp_work *hp_work;
+	acpi_handle handle;
+	u32 type;
+
+	hp_work = container_of(work, struct acpi_root_hp_work, work);
+	handle = hp_work->handle;
+	type = hp_work->type;
+
+	bridge = acpi_root_handle_to_bridge(handle);
+
+	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+
+	switch (type) {
+	case ACPI_NOTIFY_BUS_CHECK:
+		/* bus enumerate */
+		printk(KERN_DEBUG "%s: Bus check notify on %s\n", __func__,
+				 objname);
+		if (!bridge) {
+			handle_root_bridge_insertion(handle);
+			add_acpi_root_bridge(handle);
+		}
+
+		break;
+
+	case ACPI_NOTIFY_DEVICE_CHECK:
+		/* device check */
+		printk(KERN_DEBUG "%s: Device check notify on %s\n", __func__,
+				 objname);
+		if (!bridge) {
+			handle_root_bridge_insertion(handle);
+			add_acpi_root_bridge(handle);
+		}
+		break;
+
+	default:
+		printk(KERN_WARNING "notify_handler: unknown event type 0x%x for %s\n",
+				 type, objname);
+		break;
+	}
+
+	kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
+}
+
+static void handle_hotplug_event_root(acpi_handle handle, u32 type,
+					void *context)
+{
+	alloc_acpi_root_hp_work(handle, type, context,
+				_handle_hotplug_event_root);
+}
+
+static acpi_status __init
+find_root_bridges(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+	char objname[64];
+	struct acpi_buffer buffer = { .length = sizeof(objname),
+				      .pointer = objname };
+	int *count = (int *)context;
+
+	if (!acpi_is_root_bridge(handle))
+		return AE_OK;
+
+	(*count)++;
+
+	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
+
+	acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
+				handle_hotplug_event_root, NULL);
+	printk(KERN_DEBUG "acpi root: %s notify handler installed\n", objname);
+
+	add_acpi_root_bridge(handle);
+
+	return AE_OK;
+}
+
+static int __init acpi_pci_root_hp_init(void)
+{
+	int num = 0;
+
+	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+		ACPI_UINT32_MAX, find_root_bridges, NULL, &num, NULL);
+
+	printk(KERN_DEBUG "Found %d acpi root devices\n", num);
+
+	return 0;
+}
+
+subsys_initcall(acpi_pci_root_hp_init);
-- 
1.7.7


  parent reply	other threads:[~2012-03-10  7:00 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-10  7:00 [PATCH v2 00/37] PCI, x86: pci root bus hotplug support Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 01/37] IOMMU: Update dmar units devices list during hotplug Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 02/37] PNPACPI: Fix device ref leaking in acpi_pnp_match Yinghai Lu
2012-03-13  2:40   ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 03/37] IOMMU: Fix tboot force iommu logic Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 04/37] x86, PCI: Fix non acpi path pci_sysdata leaking with release_fn Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 05/37] PCI: Separate out pci_assign_unassigned_bus_resources() Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 06/37] PCI: Move back pci_rescan_bus() Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 07/37] PCI: pci_bus_size_bridges() should not size own bridge Yinghai Lu
2012-03-13  2:47   ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 08/37] PCI: Use __pci_bus_size_bridges() directly in pci_assign_unassigned_bus_resources() Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 09/37] PCI, sysfs: Use device_type and attr_groups with pci dev Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 10/37] PCI, sysfs: create rescan_bridge under /sys/.../pci/devices/... for pci bridges Yinghai Lu
2012-03-13  2:55   ` Bjorn Helgaas
2012-03-13  5:48     ` Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 11/37] PCI: Add pci_bus_add_single_device() Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 12/37] PCI: Make pci_rescan_bus_bridge_resize() use pci_scan_bridge instead Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 13/37] PCI: Clean up rescan_bus_bridge_resize() Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 14/37] PCI: Rescan bus or bridge using callback method too Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 15/37] PCI, sysfs: Clean up rescan/remove with scheule_callback Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 16/37] PCI: Move pci_stop_and_remove_behind_bridge() down Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 17/37] PCI: Add __pci_remove_bus_devices() Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 18/37] PCI: Use list_for_each_entry_safe instead of list_for_each_safe Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 19/37] PCI: Add pci_stop_and_remove_bus() Yinghai Lu
2012-03-12 15:58   ` Jiang Liu
2012-03-13  6:22     ` Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 20/37] PCI: Add pci bus removal through /sys/.../pci_bus/.../remove Yinghai Lu
2012-03-13  3:10   ` Bjorn Helgaas
2012-03-13  5:54     ` Yinghai Lu
2012-03-15 17:33       ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 21/37] PCI, ACPI: Make acpi_pci_root_remove remove pci root bus too Yinghai Lu
2012-03-13  3:11   ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 22/37] PCI, acpiphp: remove hot-add support of pci host bridge Yinghai Lu
2012-03-13  3:14   ` Bjorn Helgaas
2012-03-13  5:58     ` Yinghai Lu
2012-03-15 17:34       ` Bjorn Helgaas
2012-03-10  7:00 ` Yinghai Lu [this message]
2012-03-13  3:22   ` [PATCH v2 23/37] PCI, ACPI: Add pci_root_hp hot add hotplug notification Bjorn Helgaas
2012-03-13  6:03     ` Yinghai Lu
2012-03-15 17:47       ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 24/37] PCI, ACPI: Add pci_root_hp hot removal notification support Yinghai Lu
2012-03-13  3:25   ` Bjorn Helgaas
2012-03-13  6:06     ` Yinghai Lu
2012-03-15 17:53       ` Bjorn Helgaas
2012-03-15 18:01         ` Yinghai Lu
2012-03-15 18:09           ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 25/37] PCI, ACPI: Add alloc_acpi_hp_work() Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 26/37] PCI, acpiphp: Use acpi_hp_work Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 27/37] PCI, pci_root_hp: " Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 28/37] PCI, ACPI: Make kacpi_hotplug_wq static Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 29/37] PCI, ACPI: Add acpi_pci_root_rescan() Yinghai Lu
2012-03-13  3:33   ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 30/37] PCI: Add __pci_scan_root_bus() that can skip bus_add Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 31/37] x86, PCI: add __pci_scan_root_bus_on_node() " Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 32/37] x86, PCI: add __pcibios_scan_specific_bus " Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 33/37] x86, PCI: Add pcibios_root_rescan() Yinghai Lu
2012-03-13  3:37   ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 34/37] x86, PCI: Add arch version pci_root_rescan() Yinghai Lu
2012-03-13  3:40   ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 35/37] PCI: Make /sys/bus/pci/rescan rescan root Yinghai Lu
2012-03-13  3:44   ` Bjorn Helgaas
2012-03-13  6:26     ` Yinghai Lu
2012-03-15 17:55       ` Bjorn Helgaas
2012-03-10  7:00 ` [PATCH v2 36/37] ACPI: Enable SCI_EMULATE to manually simulate physical hotplug testing Yinghai Lu
2012-03-10  7:00 ` [PATCH v2 37/37] PCI, sysfs: Prepare to kill pci device rescan Yinghai Lu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1331362837-10740-24-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=bhelgaas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jbarnes@virtuousgeek.org \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).