From: Zhang Rui <rui.zhang@intel.com>
To: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: bhelgaas@google.com, matthew.garrett@nebula.com,
rafael.j.wysocki@intel.com, dmitry.torokhov@gmail.com,
Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH V4 11/11] ACPI: introduce dummy memory hotplug scan handler
Date: Mon, 17 Mar 2014 15:49:40 +0800 [thread overview]
Message-ID: <1395042580-3344-12-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1395042580-3344-1-git-send-email-rui.zhang@intel.com>
If CONFIG_ACPI_HOTPLUG_MEMORY is cleared, platform devices would be
created for ACPI hotplug memory device objects.
Introduce a dummy memory hotplug scan handler in this patch,
to prevent those platform devices from being created.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/acpi/Makefile | 2 +-
drivers/acpi/acpi_memhotplug.c | 45 ++++++++++++++++++++++++++++------------
drivers/acpi/internal.h | 6 +-----
3 files changed, 34 insertions(+), 19 deletions(-)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 871d70d..605eff7 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -65,7 +65,7 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o
obj-$(CONFIG_ACPI_PROCESSOR) += processor.o
obj-y += container.o
obj-$(CONFIG_ACPI_THERMAL) += thermal.o
-obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
+obj-y += acpi_memhotplug.o
obj-$(CONFIG_ACPI_BATTERY) += battery.o
obj-$(CONFIG_ACPI_SBS) += sbshc.o
obj-$(CONFIG_ACPI_SBS) += sbs.o
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index b67be85..ed2f6a7 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -44,6 +44,13 @@
ACPI_MODULE_NAME("acpi_memhotplug");
+static const struct acpi_device_id memory_device_ids[] = {
+ {ACPI_MEMORY_DEVICE_HID, 0},
+ {"", 0},
+};
+
+#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
+
/* Memory Device States */
#define MEMORY_INVALID_STATE 0
#define MEMORY_POWER_ON_STATE 1
@@ -53,11 +60,6 @@ static int acpi_memory_device_add(struct acpi_device *device,
const struct acpi_device_id *not_used);
static void acpi_memory_device_remove(struct acpi_device *device);
-static const struct acpi_device_id memory_device_ids[] = {
- {ACPI_MEMORY_DEVICE_HID, 0},
- {"", 0},
-};
-
static struct acpi_scan_handler memory_device_handler = {
.ids = memory_device_ids,
.attach = acpi_memory_device_add,
@@ -362,17 +364,34 @@ static void acpi_memory_device_remove(struct acpi_device *device)
static bool __initdata acpi_no_memhotplug;
-void __init acpi_memory_hotplug_init(void)
-{
- if (acpi_no_memhotplug)
- return;
-
- acpi_scan_add_handler_with_hotplug(&memory_device_handler, "memory");
-}
-
static int __init disable_acpi_memory_hotplug(char *str)
{
acpi_no_memhotplug = true;
return 1;
}
__setup("acpi_no_memhotplug", disable_acpi_memory_hotplug);
+
+#endif
+
+static int acpi_memory_dummy_add(struct acpi_device *device,
+ const struct acpi_device_id *not_used)
+{
+ return 1;
+}
+
+static struct acpi_scan_handler memory_dummy_handler = {
+ .ids = memory_device_ids,
+ .attach = acpi_memory_dummy_add,
+};
+
+void __init acpi_memory_hotplug_init(void)
+{
+#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
+ if (!acpi_no_memhotplug) {
+ acpi_scan_add_handler_with_hotplug(&memory_device_handler,
+ "memory");
+ return;
+ }
+#endif
+ acpi_scan_add_handler(&memory_dummy_handler);
+}
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index 253758a..4e96e84 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -33,16 +33,12 @@ void acpi_platform_init(void);
void acpi_pnp_init(void);
int acpi_sysfs_init(void);
void acpi_container_init(void);
+void acpi_memory_hotplug_init(void);
#ifdef CONFIG_ACPI_DOCK
void acpi_dock_init(void);
#else
static inline void acpi_dock_init(void) {}
#endif
-#ifdef CONFIG_ACPI_HOTPLUG_MEMORY
-void acpi_memory_hotplug_init(void);
-#else
-static inline void acpi_memory_hotplug_init(void) {}
-#endif
#ifdef CONFIG_X86
void acpi_cmos_rtc_init(void);
#else
--
1.7.9.5
prev parent reply other threads:[~2014-03-17 7:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-17 7:49 [PATCH V4 00/11] ACPI: change the way of enumerating PNPACPI/Platform devices Zhang Rui
2014-03-17 7:49 ` [PATCH V4 01/11] ACPI: introduce .match() callback for ACPI scan handler Zhang Rui
2014-03-17 7:49 ` [PATCH V4 02/11] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-03-17 7:49 ` [PATCH V4 03/11] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-03-17 7:49 ` [PATCH V4 04/11] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-03-17 7:49 ` [PATCH V4 05/11] ACPI: check and enumerate CMOS RTC devices explicitly Zhang Rui
2014-03-17 7:49 ` [PATCH V4 06/11] ACPI: introduce platform_id flag Zhang Rui
2014-03-17 7:49 ` [PATCH V4 07/11] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-03-24 2:00 ` Rafael J. Wysocki
2014-03-24 4:06 ` Zhang Rui
2014-03-31 5:24 ` Zhang Rui
2014-03-17 7:49 ` [PATCH V4 08/11] ACPI: introduce dummy lpss scan handler Zhang Rui
2014-03-17 7:49 ` [PATCH V4 09/11] ACPI: introduce acpi platform exclude id list Zhang Rui
2014-03-17 7:49 ` [PATCH V4 10/11] ACPI: introduce dummy container scan handler Zhang Rui
2014-03-17 7:49 ` Zhang Rui [this message]
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=1395042580-3344-12-git-send-email-rui.zhang@intel.com \
--to=rui.zhang@intel.com \
--cc=bhelgaas@google.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.garrett@nebula.com \
--cc=rafael.j.wysocki@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).