From patchwork Mon Apr 7 16:06:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Rui" X-Patchwork-Id: 3946471 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7548BBFF02 for ; Mon, 7 Apr 2014 17:34:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92240202B4 for ; Mon, 7 Apr 2014 17:34:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA35F201E4 for ; Mon, 7 Apr 2014 17:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755845AbaDGRdO (ORCPT ); Mon, 7 Apr 2014 13:33:14 -0400 Received: from mga09.intel.com ([134.134.136.24]:42010 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755759AbaDGRcZ (ORCPT ); Mon, 7 Apr 2014 13:32:25 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 07 Apr 2014 09:05:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,810,1389772800"; d="scan'208";a="516253816" Received: from unknown (HELO rzhang1-mobl4.ccr.corp.intel.com) ([10.255.20.33]) by orsmga002.jf.intel.com with ESMTP; 07 Apr 2014 09:07:51 -0700 From: Zhang Rui 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 Subject: [PATCH V5 11/12] ACPI: introduce dummy memory hotplug scan handler Date: Tue, 8 Apr 2014 00:06:58 +0800 Message-Id: <1396886819-2637-12-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396886819-2637-1-git-send-email-rui.zhang@intel.com> References: <1396886819-2637-1-git-send-email-rui.zhang@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 ce8204e..bc7d102 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -33,6 +33,7 @@ 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 register_dock_dependent_device(struct acpi_device *adev, acpi_handle dshandle); @@ -44,11 +45,6 @@ static inline void register_dock_dependent_device(struct acpi_device *adev, static inline int dock_notify(struct acpi_device *adev, u32 event) { return -ENODEV; } static inline void acpi_dock_add(struct acpi_device *adev) {} #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