From patchwork Sun Mar 16 17:03:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 3839691 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 326119F334 for ; Sun, 16 Mar 2014 17:07:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5CB6620200 for ; Sun, 16 Mar 2014 17:07:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8AFC820145 for ; Sun, 16 Mar 2014 17:07:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932098AbaCPRGu (ORCPT ); Sun, 16 Mar 2014 13:06:50 -0400 Received: from mga09.intel.com ([134.134.136.24]:56398 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755356AbaCPREF (ORCPT ); Sun, 16 Mar 2014 13:04:05 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 16 Mar 2014 09:59:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,665,1389772800"; d="scan'208";a="501094175" Received: from unknown (HELO rzhang1-mobl4.ccr.corp.intel.com) ([10.255.21.226]) by orsmga002.jf.intel.com with ESMTP; 16 Mar 2014 10:03:35 -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 V3 05/11] ACPI: check and enumerate CMOS RTC devices explicitly Date: Mon, 17 Mar 2014 01:03:11 +0800 Message-Id: <1394989397-2733-6-git-send-email-rui.zhang@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394989397-2733-1-git-send-email-rui.zhang@intel.com> References: <1394989397-2733-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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 For CMOS RTC devices, the acpi pnp scan handler does not work because there is already a cmos rtc scan handler installed, thus we need to check those devices and enumerate them to PNP bus explicitly. Plus, the cmos rtc scan handler needs to return 1 so that it will not be enumerated to platform bus. Note: the CMOS RTC device id is not removed from ACPI pnp scan handler id list, thus, if cmos rtc scan handler is compiled out, the ACPI pnp scan handler will be attached to the CMOS RTC devices instead, to prevent these devices from being created to platform bus. Signed-off-by: Zhang Rui --- drivers/acpi/acpi_cmos_rtc.c | 2 +- drivers/acpi/acpi_pnp.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/acpi_cmos_rtc.c index 84190ed..a19b0b3 100644 --- a/drivers/acpi/acpi_cmos_rtc.c +++ b/drivers/acpi/acpi_cmos_rtc.c @@ -70,7 +70,7 @@ static int acpi_install_cmos_rtc_space_handler(struct acpi_device *adev, return -ENODEV; } - return 0; + return 1; } static void acpi_remove_cmos_rtc_space_handler(struct acpi_device *adev) diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c index 2a7f86f..6fa482a 100644 --- a/drivers/acpi/acpi_pnp.c +++ b/drivers/acpi/acpi_pnp.c @@ -349,9 +349,29 @@ static struct acpi_scan_handler acpi_pnp_handler = { .attach = acpi_pnp_scan_handler_attach, }; +/* + * For CMOS RTC devices, the acpi pnp spcan handler does not work because + * there is already a cmos rtc scan handler installed, thus we need to + * check those devices and enumerate them to PNP bus explicitly. + */ +static int is_cmos_rtc_device(struct acpi_device *adev) +{ + struct acpi_device_id ids[] = { + { "PNP0B00" }, + { "PNP0B01" }, + { "PNP0B02" }, + {""}, + }; + return !acpi_match_device_ids(adev, ids); +} + bool acpi_is_pnp_device(struct acpi_device *device) { - return !!(device->handler == &acpi_pnp_handler); + if (device->handler == &acpi_pnp_handler) + return true; + if (is_cmos_rtc_device(device)) + return true; + return false; } EXPORT_SYMBOL_GPL(acpi_is_pnp_device);