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 08/11] ACPI: introduce platform_id flag
Date: Thu, 15 May 2014 14:44:13 +0800	[thread overview]
Message-ID: <1400136256-2218-9-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1400136256-2218-1-git-send-email-rui.zhang@intel.com>

Only certain kind of ACPI device objects can be enumerated to platform bus.
These ACPI device objects include
1. ACPI device objects that have _HID control method.
2. some ACPI device objects that have Linux specified HID strings.

In order to distinguish those device objects from the others, a new flag
platform_id and a new function acpi_add_platform_id() are introduced
in this patch.

Currently, only devices with _HID method have this flag set.
If you want platform devices to be created for device objects without _HID,
use acpi_add_platform_id() when adding artificial Linux-specific ID strings
to them.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
 drivers/acpi/scan.c     | 9 ++++++++-
 include/acpi/acpi_bus.h | 3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index c82ab73..451e7d9 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1730,6 +1730,13 @@ static void acpi_add_id(struct acpi_device_pnp *pnp, const char *dev_id)
 	pnp->type.hardware_id = 1;
 }
 
+static void acpi_add_platform_id(struct acpi_device_pnp *pnp,
+				 const char *dev_id)
+{
+	acpi_add_id(pnp, dev_id);
+	pnp->type.platform_id = 1;
+}
+
 /*
  * Old IBM workstations have a DSDT bug wherein the SMBus object
  * lacks the SMBUS01 HID and the methods do not have the necessary "_"
@@ -1794,7 +1801,7 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp,
 		}
 
 		if (info->valid & ACPI_VALID_HID)
-			acpi_add_id(pnp, info->hardware_id.string);
+			acpi_add_platform_id(pnp, info->hardware_id.string);
 		if (info->valid & ACPI_VALID_CID) {
 			cid_list = &info->compatible_id_list;
 			for (i = 0; i < cid_list->count; i++)
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index ba679af..ec92ad3 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -233,7 +233,8 @@ struct acpi_hardware_id {
 struct acpi_pnp_type {
 	u32 hardware_id:1;
 	u32 bus_address:1;
-	u32 reserved:30;
+	u32 platform_id:1;
+	u32 reserved:29;
 };
 
 struct acpi_device_pnp {
-- 
1.8.3.2


  parent reply	other threads:[~2014-05-15  6:44 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 ` Zhang Rui [this message]
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 ` [PATCH V6 10/11] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-05-22  9:58   ` 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-9-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 \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).