Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1363842
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 28/30] ACPICA: Events: Fix an issue that _REG association can happen before namespace is initialized |
| Date | 2016-03-24 02:50 +0100 |
| Message-ID | <rg2zp-3Dt-3@gated-at.bofh.it> (permalink) |
| References | <rg2pH-3zI-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
ACPICA commit c508f8592efaa0d8197f26d7fee6382c5ac8e383
Current code flow cannot ensure _REG association can happen after the
namespace is initialized, so we move _REG association to where _REG was
about to run to fix this issue.
This issue is detected when acpi_ev_initialize_region() is invoked during
the table loading. And this is one of the most important the root cause why
ACPICA table loading is split into 2 load passes. Lv Zheng.
Link: https://github.com/acpica/acpica/commit/c508f859
Link: https://bugs.acpica.org/show_bug.cgi?id=1252
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 | 71 ++++++++++++++--------------------------
drivers/acpi/acpica/evrgnini.c | 1 -
3 files changed, 24 insertions(+), 50 deletions(-)
diff --git a/drivers/acpi/acpica/acevents.h b/drivers/acpi/acpica/acevents.h
index 010cf81..17f2217 100644
--- a/drivers/acpi/acpica/acevents.h
+++ b/drivers/acpi/acpica/acevents.h
@@ -198,8 +198,6 @@ 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);
-
void
acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
acpi_adr_space_type space_id, u32 function);
diff --git a/drivers/acpi/acpica/evregion.c b/drivers/acpi/acpica/evregion.c
index 17d61c6..4c6f795 100644
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
@@ -526,82 +526,59 @@ acpi_ev_attach_region(union acpi_operand_object *handler_obj,
/*******************************************************************************
*
- * FUNCTION: acpi_ev_associate_reg_method
+ * FUNCTION: acpi_ev_execute_reg_method
*
* PARAMETERS: region_obj - Region object
+ * function - Passed to _REG: On (1) or Off (0)
*
* RETURN: Status
*
- * DESCRIPTION: Find and associate _REG method to a region
+ * DESCRIPTION: Execute _REG method for a region
*
******************************************************************************/
-void acpi_ev_associate_reg_method(union acpi_operand_object *region_obj)
+acpi_status
+acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
{
+ struct acpi_evaluate_info *info;
+ union acpi_operand_object *args[3];
+ union acpi_operand_object *region_obj2;
const acpi_name *reg_name_ptr =
ACPI_CAST_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);
+ ACPI_FUNCTION_TRACE(ev_execute_reg_method);
+
+ if (!acpi_gbl_namespace_initialized ||
+ region_obj->region.handler == NULL) {
+ return_ACPI_STATUS(AE_OK);
+ }
region_obj2 = acpi_ns_get_secondary_object(region_obj);
if (!region_obj2) {
- return_VOID;
+ return_ACPI_STATUS(AE_NOT_EXIST);
}
+ /*
+ * Find any "_REG" method associated with this region definition.
+ * The method should always be updated as this function may be
+ * invoked after a namespace change.
+ */
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
+ * 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
- * function - Passed to _REG: On (1) or Off (0)
- *
- * RETURN: Status
- *
- * DESCRIPTION: Execute _REG method for a region
- *
- ******************************************************************************/
-
-acpi_status
-acpi_ev_execute_reg_method(union acpi_operand_object *region_obj, u32 function)
-{
- struct acpi_evaluate_info *info;
- union acpi_operand_object *args[3];
- union acpi_operand_object *region_obj2;
- acpi_status status;
-
- ACPI_FUNCTION_TRACE(ev_execute_reg_method);
-
- region_obj2 = acpi_ns_get_secondary_object(region_obj);
- if (!region_obj2) {
- return_ACPI_STATUS(AE_NOT_EXIST);
- }
-
- if (region_obj2->extra.method_REG == NULL ||
- region_obj->region.handler == NULL ||
- !acpi_gbl_namespace_initialized) {
+ if (region_obj2->extra.method_REG == NULL) {
return_ACPI_STATUS(AE_OK);
}
diff --git a/drivers/acpi/acpica/evrgnini.c b/drivers/acpi/acpica/evrgnini.c
index fda869c..6972ab4 100644
--- a/drivers/acpi/acpica/evrgnini.c
+++ b/drivers/acpi/acpica/evrgnini.c
@@ -518,7 +518,6 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj,
return_ACPI_STATUS(AE_OK);
}
- acpi_ev_associate_reg_method(region_obj);
region_obj->common.flags |= AOPOBJ_OBJECT_INITIALIZED;
node = region_obj->region.node->parent;
--
1.7.10
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/30] ACPICA: 20160318 Release Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:40 +0100
[PATCH 28/30] ACPICA: Events: Fix an issue that _REG association can happen before namespace is initialized Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 24/30] ACPICA: Hardware: Add access_width/bit_offset support in acpi_hw_read() Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
RE: [PATCH 24/30] ACPICA: Hardware: Add access_width/bit_offset support in acpi_hw_read() "Zheng, Lv" <lv.zheng@intel.com> - 2016-03-29 10:20 +0200
[PATCH 21/30] ACPICA: Utilities: Add ACPI_IS_POWER_OF_TWO() Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 26/30] ACPICA: Interpreter: Fix wrong conditions for acpi_ev_install_region_handlers() invocation Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 17/30] ACPICA: Add support for QNX 6.6 platform Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 14/30] ACPICA: iASL: Cleanup/optimization for ToPLD macro support Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 29/30] ACPICA: Namespace: Reorder \_SB._INI to make sure it is evaluated before _REG evaluations Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 30/30] ACPICA: Update version to 20160318 Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 16/30] ACPICA: Headers: Update generation of the ACPICA library Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 20/30] ACPICA: iASL/Disassembler: Improve handling of unresolved methods Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 19/30] ACPICA: All: const keyword changes across the ACPICA source Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 25/30] ACPICA: Hardware: Add access_width/bit_offset support for acpi_hw_write() Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 18/30] ACPICA: Utilities: Update for strtoul64 merger Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 13/30] ACPICA: Interpreter: Update some function headers, no functional change Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 22/30] Utilities: Fix missing parentheses in ACPI_GET_BITS()/ACPI_SET_BITS() Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 23/30] ACPICA: Hardware: Enhance acpi_hw_validate_register() with access_width/bit_offset awareness Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 15/30] ACPICA: Cleanup some invocation indentations, no functional change Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 12/30] ACPICA: Intepreter: Add object extensions to Concatenate operand Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 27/30] ACPICA: Tables: Fix wrong MLC condition for dynamic table loading Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
[PATCH 06/30] ACPICA: IORT: Add in support for the SMMUv3 subtable Lv Zheng <lv.zheng@intel.com> - 2016-03-24 02:50 +0100
Re: [PATCH 00/30] ACPICA: 20160318 Release "Rafael J. Wysocki" <rafael@kernel.org> - 2016-03-24 14:10 +0100
RE: [PATCH 00/30] ACPICA: 20160318 Release "Zheng, Lv" <lv.zheng@intel.com> - 2016-03-28 05:10 +0200
csiph-web