From patchwork Wed Jul 11 07:50:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 1180841 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 89B8F3FC5A for ; Wed, 11 Jul 2012 07:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756735Ab2GKHpq (ORCPT ); Wed, 11 Jul 2012 03:45:46 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:5680 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752719Ab2GKHpp (ORCPT ); Wed, 11 Jul 2012 03:45:45 -0400 X-IronPort-AV: E=Sophos;i="4.77,566,1336320000"; d="scan'208";a="5371838" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 11 Jul 2012 15:44:52 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id q6B7jc15021052; Wed, 11 Jul 2012 15:45:42 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012071115453227-643593 ; Wed, 11 Jul 2012 15:45:32 +0800 Message-ID: <4FFD3039.1090305@cn.fujitsu.com> Date: Wed, 11 Jul 2012 15:50:17 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: lenb@kernel.org, linux-acpi@vger.kernel.org, "linux-kernel@vger.kernel.org" CC: Yasuaki ISIMATU , David Rientjes , Andrew Morton , Konrad Rzeszutek Wilk Subject: [PATCH 6/7 v2] auto bind the memory device which is hotpluged before the driver is loaded References: <4FFD2F1E.10006@cn.fujitsu.com> In-Reply-To: <4FFD2F1E.10006@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/07/11 15:45:32, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/07/11 15:45:37, Serialize complete at 2012/07/11 15:45:37 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org If the memory device is hotpluged before the driver is loaded, the user cannot see this device under the directory /sys/bus/acpi/devices/, and the user cannot bind it by hand after the driver is loaded. This patch introduces a new feature to bind such device when the driver is being loaded. Signed-off-by: Wen Congyang --- drivers/acpi/acpi_memhotplug.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 3765375..0010720 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -52,6 +52,9 @@ MODULE_LICENSE("GPL"); #define MEMORY_POWER_ON_STATE 1 #define MEMORY_POWER_OFF_STATE 2 +static bool auto_probe; +module_param(auto_probe, bool, S_IRUGO | S_IWUSR); + static int acpi_memory_device_add(struct acpi_device *device); static int acpi_memory_device_remove(struct acpi_device *device, int type); @@ -522,12 +525,44 @@ acpi_memory_register_notify_handler(acpi_handle handle, u32 level, void *ctxt, void **retv) { acpi_status status; - + struct acpi_memory_device *mem_device = NULL; + unsigned long long current_status; status = is_memory_device(handle); if (ACPI_FAILURE(status)) return AE_OK; /* continue */ + if (auto_probe) { + /* Get device present/absent information from the _STA */ + status = acpi_evaluate_integer(handle, "_STA", NULL, + ¤t_status); + if (ACPI_FAILURE(status)) + goto install; + + /* + * Check for device status. Device should be + * present/enabled/functioning. + */ + if (!(current_status & + (ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | + ACPI_STA_DEVICE_FUNCTIONING))) + goto install; + + if (acpi_memory_get_device(handle, &mem_device)) + goto install; + + /* We have bound this device while we register the driver */ + if (mem_device->state == MEMORY_POWER_ON_STATE) + goto install; + + ACPI_DEBUG_PRINT((ACPI_DB_INFO, + "\nauto probe memory device\n")); + + if (acpi_memory_enable_device(mem_device)) + pr_err(PREFIX "Cannot enable memory device\n"); + } + +install: status = acpi_install_notify_handler(handle, ACPI_SYSTEM_NOTIFY, acpi_memory_device_notify, NULL); /* continue */