linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 V5 05/12] ACPI: check and enumerate CMOS RTC devices explicitly
Date: Tue,  8 Apr 2014 00:06:52 +0800	[thread overview]
Message-ID: <1396886819-2637-6-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1396886819-2637-1-git-send-email-rui.zhang@intel.com>

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 <rui.zhang@intel.com>
---
 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 961b45d..2da8660 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/acpi_cmos_rtc.c
@@ -68,7 +68,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 8cf7d9d..387b150 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);
 
-- 
1.7.9.5


  parent reply	other threads:[~2014-04-07 17:34 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-07 16:06 [PATCH V5 00/12] ACPI: change the way of enumerating PNPACPI/Platform devices Zhang Rui
2014-04-07 16:06 ` [PATCH V5 01/12] ACPI: introduce .match() callback for ACPI scan handler Zhang Rui
2014-04-07 16:06 ` [PATCH V5 02/12] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-04-27 22:01   ` Rafael J. Wysocki
2014-04-28  1:40     ` Zhang Rui
2014-04-28 20:35       ` Rafael J. Wysocki
2014-04-28 20:44   ` Bjorn Helgaas
2014-04-07 16:06 ` [PATCH V5 03/12] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-04-07 16:06 ` [PATCH V5 04/12] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-04-07 16:06 ` Zhang Rui [this message]
2014-04-27 22:17   ` [PATCH V5 05/12] ACPI: check and enumerate CMOS RTC devices explicitly Rafael J. Wysocki
2014-04-27 22:19     ` Rafael J. Wysocki
2014-04-28  1:50       ` Zhang Rui
2014-04-07 16:06 ` [PATCH V5 06/12] ACPI: introduce platform_id flag Zhang Rui
2014-04-27 22:20   ` Rafael J. Wysocki
2014-04-28  1:51     ` Zhang Rui
2014-04-07 16:06 ` [PATCH V5 07/12] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-04-07 16:06 ` [PATCH V5 08/12] ACPI: introduce dummy lpss scan handler Zhang Rui
2014-04-27 22:23   ` Rafael J. Wysocki
2014-04-28  1:57     ` Zhang Rui
2014-04-07 16:06 ` [PATCH V5 09/12] ACPI: introduce acpi platform exclude id list Zhang Rui
2014-04-27 22:21   ` Rafael J. Wysocki
2014-04-28  1:57     ` Zhang Rui
2014-04-28 20:31       ` Rafael J. Wysocki
2014-04-07 16:06 ` [PATCH V5 10/12] ACPI: introduce dummy container scan handler Zhang Rui
2014-04-07 16:06 ` [PATCH V5 11/12] ACPI: introduce dummy memory hotplug " Zhang Rui
2014-04-07 16:06 ` [PATCH V5 12/12] ACPI: introduce .handle_children flag for acpi " Zhang Rui
2014-04-27 22:26   ` Rafael J. Wysocki
2014-04-28  2:07     ` Zhang Rui
2014-04-28 20:34       ` Rafael J. Wysocki

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=1396886819-2637-6-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 \
    --subject='Re: [PATCH V5 05/12] ACPI: check and enumerate CMOS RTC devices explicitly' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox