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 V6 10/11] ACPI: use platform bus as the default bus for _HID enumeration
Date: Thu, 15 May 2014 14:44:15 +0800	[thread overview]
Message-ID: <1400136256-2218-11-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1400136256-2218-1-git-send-email-rui.zhang@intel.com>

Because of the growing demand for enumerating ACPI devices to
platform bus, this patch changes the code to enumerate ACPI
devices to platform bus by default, if the device
1. has _HID.
2. does not have a scan handler attached.
3. will not be enumerated by its parent.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/acpi/acpi_platform.c | 28 ----------------------------
 drivers/acpi/scan.c          | 25 ++++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index dbfe49e..33376a9 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -22,24 +22,6 @@
 
 ACPI_MODULE_NAME("platform");
 
-/*
- * The following ACPI IDs are known to be suitable for representing as
- * platform devices.
- */
-static const struct acpi_device_id acpi_platform_device_ids[] = {
-
-	{ "PNP0D40" },
-	{ "ACPI0003" },
-	{ "VPC2004" },
-	{ "BCM4752" },
-
-	/* Intel Smart Sound Technology */
-	{ "INT33C8" },
-	{ "80860F28" },
-
-	{ }
-};
-
 /**
  * acpi_create_platform_device - Create platform device for ACPI device node
  * @adev: ACPI device node to create a platform device for.
@@ -125,13 +107,3 @@ int acpi_create_platform_device(struct acpi_device *adev,
 	kfree(resources);
 	return 1;
 }
-
-static struct acpi_scan_handler platform_handler = {
-	.ids = acpi_platform_device_ids,
-	.attach = acpi_create_platform_device,
-};
-
-void __init acpi_platform_init(void)
-{
-	acpi_scan_add_handler(&platform_handler);
-}
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 451e7d9..756977e 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2073,6 +2073,27 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
 	return AE_OK;
 }
 
+static void acpi_do_default_enumeration(struct acpi_device *device)
+{
+	/*
+	 * Do not do enumeration for device object that has been/will be
+	 * enumerated by its parent.
+	 */
+	if (device->parent && device->parent->flags.is_master_device)
+		return;
+
+	/* Do not do enumeration for device object with scan handler attached */
+	if (device->handler)
+		return;
+
+	/* Do not do enumeration for device object w/o platform_id */
+	if (!device->pnp.type.platform_id)
+		return;
+
+	acpi_create_platform_device(device, NULL);
+}
+
+
 static int acpi_scan_attach_handler(struct acpi_device *device)
 {
 	struct acpi_hardware_id *hwid;
@@ -2094,6 +2115,9 @@ static int acpi_scan_attach_handler(struct acpi_device *device)
 				break;
 		}
 	}
+
+	acpi_do_default_enumeration(device);
+
 	return ret;
 }
 
@@ -2253,7 +2277,6 @@ int __init acpi_scan_init(void)
 	acpi_pci_root_init();
 	acpi_pci_link_init();
 	acpi_processor_init();
-	acpi_platform_init();
 	acpi_lpss_init();
 	acpi_cmos_rtc_init();
 	acpi_container_init();
-- 
1.8.3.2


  parent reply	other threads:[~2014-05-15  6:45 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-15  6:44 [PATCH V6 00/11] ACPI: ACPI enumeration rework Zhang Rui
2014-05-15  6:44 ` [PATCH V6 01/11] ACPI: introduce .match() callback for ACPI scan handler Zhang Rui
2014-05-15  6:44 ` [PATCH V6 02/11] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-05-15  6:44 ` [PATCH V6 03/11] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-05-15  6:44 ` [PATCH V6 04/11] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-05-15  6:44 ` [PATCH V6 05/11] ACPI: introduce dummy container scan handler Zhang Rui
2014-05-15  6:44 ` [PATCH V6 06/11] ACPI: introduce dummy memory hotplug " Zhang Rui
2014-05-15  6:44 ` [PATCH V6 07/11] ACPI: introduce dummy lpss " Zhang Rui
2014-05-21  8:48   ` Mika Westerberg
2014-05-21 14:56     ` Zhang Rui
2014-05-22  9:57       ` Mika Westerberg
2014-05-15  6:44 ` [PATCH V6 08/11] ACPI: introduce platform_id flag Zhang Rui
2014-05-15  6:44 ` [PATCH V6 09/11] ACPI: introduce flag .is_master_device Zhang Rui
2014-05-21  8:52   ` Mika Westerberg
2014-05-21 11:10     ` Rafael J. Wysocki
2014-05-21 11:04       ` Mika Westerberg
2014-05-21 11:59         ` Rafael J. Wysocki
2014-05-21 15:09       ` Zhang Rui
2014-05-22  8:08         ` Mika Westerberg
2014-05-21 14:43     ` Zhang Rui
2014-05-22  8:51       ` Mika Westerberg
2014-05-22 14:26         ` Zhang Rui
2014-05-15  6:44 ` Zhang Rui [this message]
2014-05-22  9:58   ` [PATCH V6 10/11] ACPI: use platform bus as the default bus for _HID enumeration Mika Westerberg
2014-05-15  6:44 ` [PATCH V6 11/11] ACPI: introduce acpi platform exclude id list Zhang Rui

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=1400136256-2218-11-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 V6 10/11] ACPI: use platform bus as the default bus for _HID enumeration' \
    /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