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 V2 06/13] ACPI: introduce enumerable_id flag
Date: Fri, 14 Mar 2014 00:16:46 +0800	[thread overview]
Message-ID: <1394727413-3587-7-git-send-email-rui.zhang@intel.com> (raw)
In-Reply-To: <1394727413-3587-1-git-send-email-rui.zhang@intel.com>

Only certain kind of ACPI device objects can be enumerated via ACPI.
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
enumerable_id and a new function acpi_add_eid() are introduced in this patch.

Currently, only devices with _HID method have this flag set.
And in the future, if a device that has Linux specified HID strings
wants to be enumerated to platform bus, acpi_add_eid() should be used
instead of acpi_add_id() when adding its Linux specified HID string.

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

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 399257e..768f81d 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1679,6 +1679,12 @@ static void acpi_add_id(struct acpi_device_pnp *pnp, const char *dev_id)
 	pnp->type.hardware_id = 1;
 }
 
+static void acpi_add_eid(struct acpi_device_pnp *pnp, const char *dev_id)
+{
+	acpi_add_id(pnp, dev_id);
+	pnp->type.enumerable_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 "_"
@@ -1729,7 +1735,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_eid(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 8c5e235..688ca44 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -217,7 +217,8 @@ struct acpi_hardware_id {
 struct acpi_pnp_type {
 	u32 hardware_id:1;
 	u32 bus_address:1;
-	u32 reserved:30;
+	u32 enumerable_id:1;
+	u32 reserved:29;
 };
 
 struct acpi_device_pnp {
-- 
1.7.9.5


  parent reply	other threads:[~2014-03-13 16:18 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-13 16:16 [PATCH V2 0/13] ACPI: change the way of enumerating PNPACPI/Platform devices Zhang Rui
2014-03-13 16:16 ` [PATCH V2 01/13] ACPI: introduce .match() callback for ACPI scan handler Zhang Rui
2014-03-13 16:16 ` [PATCH V2 02/13] PNPACPI: use whilte list for pnpacpi device enumeration Zhang Rui
2014-03-13 16:16 ` [PATCH V2 03/13] ACPI: remove ids that does not comply with the ACPI PNP id rule Zhang Rui
2014-03-13 16:16 ` [PATCH V2 04/13] ACPI: remove unsupported serial PNP ids from acpi pnp scan handler id lsit Zhang Rui
2014-03-13 16:16 ` [PATCH V2 05/13] ACPI: check and enumerate CMOS RTC devices explicitly Zhang Rui
2014-03-13 16:16 ` Zhang Rui [this message]
2014-03-15  1:03   ` [PATCH V2 06/13] ACPI: introduce enumerable_id flag Rafael J. Wysocki
2014-03-15  1:12     ` Zhang, Rui
2014-03-13 16:16 ` [PATCH V2 07/13] ACPI: use platform bus as the default bus for _HID enumeration Zhang Rui
2014-03-13 16:16 ` [PATCH V2 08/13] ACPI: introduce dummy lpss scan handler Zhang Rui
2014-03-13 16:16 ` [PATCH V2 09/13] ACPI: introduce acpi platform exclude id list Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 10/13] Revert "ACPI / PNP: skip ACPI device nodes associated with physical nodes already" Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 11/13] ACPI: create both PNP and Platform device nodes for PNP0C01/PNP0C02 Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 12/13] ACPI: introduce dummy container scan handler Zhang Rui
2014-03-13 16:16 ` [RFC PATCH V2 13/13] ACPI: introduce dummy memory hotplug " 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=1394727413-3587-7-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 V2 06/13] ACPI: introduce enumerable_id flag' \
    /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