From patchwork Thu Nov 8 11:04:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 1715041 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E88ABE0138 for ; Thu, 8 Nov 2012 10:59:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755363Ab2KHK73 (ORCPT ); Thu, 8 Nov 2012 05:59:29 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:55605 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754182Ab2KHK7H (ORCPT ); Thu, 8 Nov 2012 05:59:07 -0500 X-IronPort-AV: E=Sophos;i="4.80,737,1344182400"; d="scan'208";a="6161808" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 08 Nov 2012 18:57:20 +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 qA8AwspJ006481; Thu, 8 Nov 2012 18:58:57 +0800 Received: from ghost.fnst.cn.fujitsu.com ([10.167.225.226]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012110818585966-1025739 ; Thu, 8 Nov 2012 18:58:59 +0800 From: Wen Congyang To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org, Len Brown Cc: "Rafael J. Wysocki" , Andrew Morton , Yasuaki Ishimatsu , Lai Jiangshan , Jiang Liu , KOSAKI Motohiro , Minchan Kim , Mel Gorman , David Rientjes , Konrad Rzeszutek Wilk , Toshi Kani , Wen Congyang , Jiang Liu , Benjamin Herrenschmidt , Paul Mackerras , Christoph Lameter Subject: [Patch v4 7/7] acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded Date: Thu, 8 Nov 2012 19:04:53 +0800 Message-Id: <1352372693-32411-8-git-send-email-wency@cn.fujitsu.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1352372693-32411-1-git-send-email-wency@cn.fujitsu.com> References: <1352372693-32411-1-git-send-email-wency@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/08 18:58:59, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/08 18:59:02, Serialize complete at 2012/11/08 18:59:02 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org If the memory device is hotplugged 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. CC: David Rientjes CC: Jiang Liu CC: Len Brown CC: Benjamin Herrenschmidt CC: Paul Mackerras CC: Christoph Lameter Cc: Minchan Kim CC: Andrew Morton CC: KOSAKI Motohiro CC: Yasuaki Ishimatsu CC: Rafael J. Wysocki CC: Konrad Rzeszutek Wilk Signed-off-by: Wen Congyang --- drivers/acpi/acpi_memhotplug.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 8a8716f..24bfa6e 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); @@ -581,12 +584,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 */