mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Lv Zheng <lv.zheng@intel.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
	Len Brown <len.brown@intel.com>
Cc: Lv Zheng <lv.zheng@intel.com>, Lv Zheng <zetalog@gmail.com>,
	<linux-kernel@vger.kernel.org>,
	linux-acpi@vger.kernel.org, Bob Moore <robert.moore@intel.com>
Subject: [PATCH 37/42] ACPICA: Events: Split acpi_ev_associate_reg_method() from region initialization code
Date: Tue, 29 Dec 2015 14:02:58 +0800	[thread overview]
Message-ID: <8066e7e9e7cb78b88eceb4d64a69b70d5b27c150.1451367389.git.lv.zheng@intel.com> (raw)
In-Reply-To: <cover.1451367388.git.lv.zheng@intel.com>

ACPICA commit 87c85610250ff7141a84507f68dbc1e00f2936db

This patch introduces a new region initialization function
acpi_ev_associate_reg_method(), which is invoked to associate the _REG method
to its related region object.

Region object's default value assignments are also sorted by cleaning up
the code using this new function. Lv Zheng.

Link: https://github.com/acpica/acpica/commit/87c85610
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
 drivers/acpi/acpica/acevents.h |    2 ++
 drivers/acpi/acpica/evregion.c |   46 ++++++++++++++++++++++++++++++++++++++++
 drivers/acpi/acpica/evrgnini.c |   30 ++------------------------
 drivers/acpi/acpica/excreate.c |    6 +++++-
 4 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 42975ab..772ee3c 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -198,6 +198,8 @@ void
 acpi_ev_detach_region(union acpi_operand_object *region_obj,
 		      u8 acpi_ns_is_locked);
 
+void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj);
+
 acpi_status
 acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
 			    acpi_adr_space_type space_id);
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 19a4e69..432b810 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -529,6 +529,52 @@ acpi_ev_attach_region(union acpi_operand_object *handler_obj,
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ev_associate_reg_method
+ *
+ * PARAMETERS:  region_obj          - Region object
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Find and associate _REG method to a region
+ *
+ ******************************************************************************/
+
+void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj)
+{
+	acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
+	struct acpi_namespace_node *method_node;
+	struct acpi_namespace_node *node;
+	union acpi_operand_object *region_obj2;
+	acpi_status status;
+
+	ACPI_FUNCTION_TRACE(ev_associate_reg_method);
+
+	region_obj2 = acpi_ns_get_secondary_object(region_obj);
+	if (!region_obj2) {
+		return_VOID;
+	}
+
+	node = region_obj->region.node->parent;
+
+	/* Find any "_REG" method associated with this region definition */
+
+	status =
+	    acpi_ns_search_one_scope(*reg_name_ptr, node, ACPI_TYPE_METHOD,
+				     &method_node);
+	if (ACPI_SUCCESS(status)) {
+		/*
+		 * The _REG method is optional and there can be only one per region
+		 * definition. This will be executed when the handler is attached
+		 * or removed
+		 */
+		region_obj2->extra.method_REG = method_node;
+	}
+
+	return_VOID;
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ev_execute_reg_method
  *
  * PARAMETERS:  region_obj          - Region object
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index 024689d..bb2e529 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -507,9 +507,6 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
 	acpi_adr_space_type space_id;
 	struct acpi_namespace_node *node;
 	acpi_status status;
-	struct acpi_namespace_node *method_node;
-	acpi_name *reg_name_ptr = (acpi_name *) METHOD_NAME__REG;
-	union acpi_operand_object *region_obj2;
 
 	ACPI_FUNCTION_TRACE_U32(ev_initialize_region, acpi_ns_locked);
 
@@ -521,35 +518,12 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
 		return_ACPI_STATUS(AE_OK);
 	}
 
-	region_obj2 = acpi_ns_get_secondary_object(region_obj);
-	if (!region_obj2) {
-		return_ACPI_STATUS(AE_NOT_EXIST);
-	}
+	acpi_ev_associate_reg_method(region_obj);
+	region_obj->common.flags |= AOPOBJ_OBJECT_INITIALIZED;
 
 	node = region_obj->region.node->parent;
 	space_id = region_obj->region.space_id;
 
-	/* Setup defaults */
-
-	region_obj->region.handler = NULL;
-	region_obj2->extra.method_REG = NULL;
-	region_obj->common.flags &= ~(AOPOBJ_SETUP_COMPLETE);
-	region_obj->common.flags |= AOPOBJ_OBJECT_INITIALIZED;
-
-	/* Find any "_REG" method associated with this region definition */
-
-	status =
-	    acpi_ns_search_one_scope(*reg_name_ptr, node, ACPI_TYPE_METHOD,
-				     &method_node);
-	if (ACPI_SUCCESS(status)) {
-		/*
-		 * The _REG method is optional and there can be only one per region
-		 * definition. This will be executed when the handler is attached
-		 * or removed
-		 */
-		region_obj2->extra.method_REG = method_node;
-	}
-
 	/*
 	 * The following loop depends upon the root Node having no parent
 	 * ie: acpi_gbl_root_node->Parent being set to NULL
diff --git a/drivers/acpi/acpica/excreate.c b/drivers/acpi/acpica/excreate.c
index 0f34446..6a1396e 100644
--- a/drivers/acpi/acpica/excreate.c
+++ b/drivers/acpi/acpica/excreate.c
@@ -326,9 +326,10 @@ acpi_ex_create_region(u8 * aml_start,
 	 * Remember location in AML stream of address & length
 	 * operands since they need to be evaluated at run time.
 	 */
-	region_obj2 = obj_desc->common.next_object;
+	region_obj2 = acpi_ns_get_secondary_object(obj_desc);
 	region_obj2->extra.aml_start = aml_start;
 	region_obj2->extra.aml_length = aml_length;
+	region_obj2->extra.method_REG = NULL;
 	if (walk_state->scope_info) {
 		region_obj2->extra.scope_node =
 		    walk_state->scope_info->scope.node;
@@ -342,6 +343,9 @@ acpi_ex_create_region(u8 * aml_start,
 	obj_desc->region.address = 0;
 	obj_desc->region.length = 0;
 	obj_desc->region.node = node;
+	obj_desc->region.handler = NULL;
+	obj_desc->common.flags &=
+	    ~(AOPOBJ_SETUP_COMPLETE | AOPOBJ_OBJECT_INITIALIZED);
 
 	/* Install the new region object in the parent Node */
 
-- 
1.7.10


  parent reply	other threads:[~2015-12-29  6:03 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-29  5:52 [PATCH 00/42] ACPICA: 20151218 Release Lv Zheng
2015-12-29  5:52 ` [PATCH 01/42] ACPICA: Linuxize: reduce divergences for 20151218 release Lv Zheng
2015-12-29  5:52 ` [PATCH 02/42] ACPICA: acpi_get_sleep_type_data: Reduce warnings Lv Zheng
2015-12-29  5:52 ` [PATCH 03/42] ACPICA: Namespace: Fix wrong error log Lv Zheng
2015-12-29  5:53 ` [PATCH 04/42] ACPICA: Debugger: reduce old external path format Lv Zheng
2015-12-29  5:53 ` [PATCH 05/42] ACPICA: Fix SyncLevel support interaction with method auto-serialization Lv Zheng
2015-12-29  5:54 ` [PATCH 06/42] ACPICA: Add "const" to some functions that return fixed strings Lv Zheng
2015-12-29  5:54 ` [PATCH 07/42] ACPICA: exmutex: General cleanup, restructured some code Lv Zheng
2015-12-29  5:54 ` [PATCH 08/42] ACPICA: Core: Major update for code formatting, no functional changes Lv Zheng
2015-12-29  5:54 ` [PATCH 09/42] ACPICA: Split interpreter tracing functions to a new file Lv Zheng
2015-12-29  5:54 ` [PATCH 10/42] ACPICA: acpiexec: Add support for AML files containing multiple tables Lv Zheng
2015-12-29  5:54 ` [PATCH 11/42] ACPICA: Disassembler/tools: Support for multiple ACPI tables in one file Lv Zheng
2015-12-29  5:55 ` [PATCH 12/42] ACPICA: iasl/acpiexec: Update input file handling and verification Lv Zheng
2015-12-29  5:55 ` [PATCH 13/42] ACPICA: Debugger: Remove some unecessary NULL checks Lv Zheng
2015-12-29  5:55 ` [PATCH 14/42] ACPICA: Revert "acpi_get_object_info: Add support for ACPI 5.0 _SUB method." Lv Zheng
2015-12-29  5:56 ` [PATCH 15/42] ACPICA: Add comment explaining _SUB removal Lv Zheng
2015-12-29  5:56 ` [PATCH 16/42] ACPICA: acpiexec/acpinames: Update for error checking macros Lv Zheng
2015-12-29  5:56 ` [PATCH 17/42] ACPICA: Concatenate operator: Add extensions to support all ACPI objects Lv Zheng
2015-12-29  5:57 ` [PATCH 18/42] ACPICA: Debug Object: Cleanup output Lv Zheng
2015-12-29  5:57 ` [PATCH 19/42] ACPICA: Debug object: Fix output for a NULL object Lv Zheng
2015-12-29  5:57 ` [PATCH 20/42] ACPICA: Update for output of the Debug Object Lv Zheng
2015-12-29  5:57 ` [PATCH 21/42] ACPICA: Namespace: Add scope information to the simple object repair mechanism Lv Zheng
2015-12-29  5:58 ` [PATCH 22/42] ACPICA: Namespace: Add String -> ObjectReference conversion support Lv Zheng
2015-12-29  5:58 ` [PATCH 23/42] ACPICA: getopt: Comment update, no functional change Lv Zheng
2015-12-29  5:59 ` [PATCH 24/42] ACPICA: Tools: Add spacing and missing options in acpibin tool Lv Zheng
2015-12-29  5:59 ` [PATCH 25/42] ACPICA: Add new exception code, AE_IO_ERROR Lv Zheng
2015-12-29  6:00 ` [PATCH 26/42] ACPICA: iasl/Disassembler: Support ASL ElseIf operator Lv Zheng
2015-12-29  6:00 ` [PATCH 27/42] ACPICA: Parser: Add constants for internal namepath function Lv Zheng
2015-12-29  6:00 ` [PATCH 28/42] ACPICA: Parser: Fix for SuperName method invocation Lv Zheng
2015-12-29  6:00 ` [PATCH 29/42] ACPICA: Update parameter type for ObjectType operator Lv Zheng
2015-12-29  6:00 ` [PATCH 30/42] ACPICA: Update internal #defines for ObjectType operator. No functional change Lv Zheng
2015-12-29  6:01 ` [PATCH 31/42] ACPICA: Update for CondRefOf and RefOf operators Lv Zheng
2015-12-29  6:01 ` [PATCH 32/42] ACPICA: Cleanup code related to the per-table module level improvement Lv Zheng
2015-12-29  6:02 ` [PATCH 33/42] ACPICA: Events: Deploys acpi_ev_find_region_handler() Lv Zheng
2015-12-29  6:02 ` [PATCH 34/42] ACPICA: Events: Uses common_notify for address space handlers Lv Zheng
2015-12-29  6:02 ` [PATCH 35/42] ACPICA: Utilities: Reorder initialization code Lv Zheng
2015-12-29  6:02 ` [PATCH 36/42] ACPICA: Events: Fix an issue that region object is re-attached to another scope when it is already attached Lv Zheng
2015-12-29  6:02 ` Lv Zheng [this message]
2015-12-29  6:03 ` [PATCH 38/42] ACPICA: Events: Enhance acpi_ev_execute_reg_method() to ensure no _REG evaluations can happen during OS early boot stages Lv Zheng
2015-12-29  6:03 ` [PATCH 39/42] ACPICA: Events: Introduce ACPI_REG_DISCONNECT invocation to acpi_ev_execute_reg_methods() Lv Zheng
2015-12-29  6:04 ` [PATCH 40/42] ACPICA: Add "root node" case to the ACPI name repair code Lv Zheng
2015-12-29  6:04 ` [PATCH 41/42] ACPICA: Add per-table execution of module-level code Lv Zheng
2015-12-29  6:04 ` [PATCH 42/42] ACPICA: Update version to 20151218 Lv Zheng
2016-01-01  3:04 ` [PATCH 00/42] ACPICA: 20151218 Release Rafael J. Wysocki
2016-01-01  3:24   ` Rafael J. Wysocki
2016-01-04  2:29   ` Zheng, Lv
2016-01-03  0:49 ` Rafael J. Wysocki
2016-01-03  6:45 ` David Lang
2016-01-04  2:27   ` Zheng, Lv
2016-01-04 13:16     ` 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=8066e7e9e7cb78b88eceb4d64a69b70d5b27c150.1451367389.git.lv.zheng@intel.com \
    --to=lv.zheng@intel.com \
    --cc=len.brown@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=robert.moore@intel.com \
    --cc=zetalog@gmail.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

all inboxes | Powered by JetHome®