From: Rui Wang <rui.y.wang@intel.com>
To: helgaas@kernel.org, tglx@linutronix.de, rjw@rjwysocki.net,
tony.luck@intel.com
Cc: bhelgaas@google.com, linux-acpi@vger.kernel.org,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
rui.y.wang@intel.com
Subject: [PATCH v2 1/5] x86/ioapic: Change prototype of acpi_ioapic_add()
Date: Wed, 27 Jul 2016 23:44:11 +0800 [thread overview]
Message-ID: <1469634255-24101-2-git-send-email-rui.y.wang@intel.com> (raw)
In-Reply-To: <1469634255-24101-1-git-send-email-rui.y.wang@intel.com>
Change the argument of acpi_ioapic_add() to a generic ACPI handle, and
move its prototype from drivers/acpi/internal.h to include/linux/acpi.h
so that it can be called from outside the pci_root driver.
Signed-off-by: Rui Wang <rui.y.wang@intel.com>
---
drivers/acpi/internal.h | 2 --
drivers/acpi/ioapic.c | 6 +++---
drivers/acpi/pci_root.c | 2 +-
include/linux/acpi.h | 6 ++++++
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 27cc7fe..6d8e67e 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -40,10 +40,8 @@ int acpi_sysfs_init(void);
void acpi_container_init(void);
void acpi_memory_hotplug_init(void);
#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
-int acpi_ioapic_add(struct acpi_pci_root *root);
int acpi_ioapic_remove(struct acpi_pci_root *root);
#else
-static inline int acpi_ioapic_add(struct acpi_pci_root *root) { return 0; }
static inline int acpi_ioapic_remove(struct acpi_pci_root *root) { return 0; }
#endif
#ifdef CONFIG_ACPI_DOCK
diff --git a/drivers/acpi/ioapic.c b/drivers/acpi/ioapic.c
index ccdc8db..2449377 100644
--- a/drivers/acpi/ioapic.c
+++ b/drivers/acpi/ioapic.c
@@ -189,13 +189,13 @@ exit:
return AE_OK;
}
-int acpi_ioapic_add(struct acpi_pci_root *root)
+int acpi_ioapic_add(acpi_handle root_handle)
{
acpi_status status, retval = AE_OK;
- status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root->device->handle,
+ status = acpi_walk_namespace(ACPI_TYPE_DEVICE, root_handle,
UINT_MAX, handle_ioapic_add, NULL,
- root->device->handle, (void **)&retval);
+ root_handle, (void **)&retval);
return ACPI_SUCCESS(status) && ACPI_SUCCESS(retval) ? 0 : -ENODEV;
}
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index ae3fe4e..53f5965 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -614,7 +614,7 @@ static int acpi_pci_root_add(struct acpi_device *device,
if (hotadd) {
pcibios_resource_survey_bus(root->bus);
pci_assign_unassigned_root_bus_resources(root->bus);
- acpi_ioapic_add(root);
+ acpi_ioapic_add(root->device->handle);
}
pci_lock_rescan_remove();
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 288fac5..f5114dc 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -680,6 +680,12 @@ static inline enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)
#endif /* !CONFIG_ACPI */
+#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
+int acpi_ioapic_add(acpi_handle root);
+#else
+static inline int acpi_ioapic_add(acpi_handle root) { return 0; }
+#endif
+
#ifdef CONFIG_ACPI
void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
u32 pm1a_ctrl, u32 pm1b_ctrl));
--
1.8.3.1
next prev parent reply other threads:[~2016-07-27 15:44 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-26 16:13 [PATCH 0/4] Fixing a set of bugs for ioapic hotplug Rui Wang
2016-07-26 16:13 ` [PATCH 1/4] x86/ioapic: Support hot-removal of IOAPICs present during boot Rui Wang
2016-07-26 20:19 ` Bjorn Helgaas
2016-07-26 20:46 ` Bjorn Helgaas
2016-07-27 15:44 ` [PATCH v2 0/5] Fixing a set of bugs for ioapic hotplug Rui Wang
2016-07-27 15:44 ` Rui Wang [this message]
2016-07-27 15:44 ` [PATCH v2 2/5] x86/ioapic: Support hot-removal of IOAPICs present during boot Rui Wang
2016-07-27 17:13 ` Bjorn Helgaas
2016-07-27 15:44 ` [PATCH v2 3/5] x86/ioapic: Fix setup_res() failing to get resource Rui Wang
2016-07-27 15:44 ` [PATCH v2 4/5] x86/ioapic: Fix lost IOAPIC resource after hot-removal and hotadd Rui Wang
2016-07-27 15:44 ` [PATCH v2 5/5] x86/ioapic: Fix ioapic failing to request resource Rui Wang
2016-07-27 2:23 ` [PATCH 1/4] x86/ioapic: Support hot-removal of IOAPICs present during boot boot Rui Wang
2016-07-26 16:13 ` [PATCH 2/4] x86/ioapic: Fix setup_res() failing to get resource Rui Wang
2016-07-26 20:21 ` Bjorn Helgaas
2016-07-26 16:13 ` [PATCH 3/4] x86/ioapic: Fix lost ioapic resource after hot-removal and hotadd Rui Wang
2016-07-26 16:49 ` kbuild test robot
2016-07-26 20:24 ` Bjorn Helgaas
2016-07-27 2:35 ` Rui Wang
2016-07-26 16:13 ` [PATCH 4/4] x86/ioapic: Fix ioapic failing to request resource Rui Wang
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=1469634255-24101-2-git-send-email-rui.y.wang@intel.com \
--to=rui.y.wang@intel.com \
--cc=bhelgaas@google.com \
--cc=helgaas@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
/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).