From: Len Brown <lenb@kernel.org>
To: linux-acpi@vger.kernel.org, linux-pm@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Bob Moore <robert.moore@intel.com>,
Lin Ming <ming.m.lin@intel.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 44/76] ACPICA: Object repair code: Support to add Package wrappers
Date: Fri, 30 Mar 2012 06:13:47 -0400 [thread overview]
Message-ID: <6a99b1c94d053b3420eaa4a4bc8b2883dd90a2f9.1333101989.git.len.brown@intel.com> (raw)
In-Reply-To: <1333102459-23750-1-git-send-email-lenb@kernel.org>
In-Reply-To: <09f98a825a821f7a3f1b162f9ed023f37213a63b.1333101989.git.len.brown@intel.com>
From: Bob Moore <robert.moore@intel.com>
Repair a common problem with objects that are defined to return
a variable-length Package of sub-objects. If there is only one
sub-object, some BIOS code mistakenly simply declares the single
object instead of a Package with one sub-object. This function
attempts to repair this error by wrapping a Package object around
the original object, creating the correct and expected Package
with one sub-object.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/acpica/aclocal.h | 1 +
drivers/acpi/acpica/acnamesp.h | 5 +-
drivers/acpi/acpica/nspredef.c | 4 +-
drivers/acpi/acpica/nsrepair.c | 159 +++++++++++++++-------------------------
4 files changed, 64 insertions(+), 105 deletions(-)
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 3f24068..e3922ca 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -370,6 +370,7 @@ struct acpi_predefined_data {
/* Defines for Flags field above */
#define ACPI_OBJECT_REPAIRED 1
+#define ACPI_OBJECT_WRAPPED 2
/*
* Bitmapped return value types
diff --git a/drivers/acpi/acpica/acnamesp.h b/drivers/acpi/acpica/acnamesp.h
index 2c9e0f0..9b19d4b 100644
--- a/drivers/acpi/acpica/acnamesp.h
+++ b/drivers/acpi/acpica/acnamesp.h
@@ -283,8 +283,9 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
union acpi_operand_object **return_object_ptr);
acpi_status
-acpi_ns_repair_package_list(struct acpi_predefined_data *data,
- union acpi_operand_object **obj_desc_ptr);
+acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
+ union acpi_operand_object *original_object,
+ union acpi_operand_object **obj_desc_ptr);
acpi_status
acpi_ns_repair_null_element(struct acpi_predefined_data *data,
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index bbe46a4..23ce096 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -638,8 +638,8 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
/* Create the new outer package and populate it */
status =
- acpi_ns_repair_package_list(data,
- return_object_ptr);
+ acpi_ns_wrap_with_package(data, *elements,
+ return_object_ptr);
if (ACPI_FAILURE(status)) {
return (status);
}
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c
index 9c35d20..5519a64 100644
--- a/drivers/acpi/acpica/nsrepair.c
+++ b/drivers/acpi/acpica/nsrepair.c
@@ -71,11 +71,10 @@ ACPI_MODULE_NAME("nsrepair")
* Buffer -> String
* Buffer -> Package of Integers
* Package -> Package of one Package
+ * An incorrect standalone object is wrapped with required outer package
*
* Additional possible repairs:
- *
* Required package elements that are NULL replaced by Integer/String/Buffer
- * Incorrect standalone package wrapped with required outer package
*
******************************************************************************/
/* Local prototypes */
@@ -91,10 +90,6 @@ static acpi_status
acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
union acpi_operand_object **return_object);
-static acpi_status
-acpi_ns_convert_to_package(union acpi_operand_object *original_object,
- union acpi_operand_object **return_object);
-
/*******************************************************************************
*
* FUNCTION: acpi_ns_repair_object
@@ -151,9 +146,24 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
}
}
if (expected_btypes & ACPI_RTYPE_PACKAGE) {
- status = acpi_ns_convert_to_package(return_object, &new_object);
+ /*
+ * A package is expected. We will wrap the existing object with a
+ * new package object. It is often the case that if a variable-length
+ * package is required, but there is only a single object needed, the
+ * BIOS will return that object instead of wrapping it with a Package
+ * object. Note: after the wrapping, the package will be validated
+ * for correct contents (expected object type or types).
+ */
+ status =
+ acpi_ns_wrap_with_package(data, return_object, &new_object);
if (ACPI_SUCCESS(status)) {
- goto object_repaired;
+ /*
+ * The original object just had its reference count
+ * incremented for being inserted into the new package.
+ */
+ *return_object_ptr = new_object; /* New Package object */
+ data->flags |= ACPI_OBJECT_REPAIRED;
+ return (AE_OK);
}
}
@@ -165,22 +175,27 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
/* Object was successfully repaired */
- /*
- * If the original object is a package element, we need to:
- * 1. Set the reference count of the new object to match the
- * reference count of the old object.
- * 2. Decrement the reference count of the original object.
- */
if (package_index != ACPI_NOT_PACKAGE_ELEMENT) {
- new_object->common.reference_count =
- return_object->common.reference_count;
+ /*
+ * The original object is a package element. We need to
+ * decrement the reference count of the original object,
+ * for removing it from the package.
+ *
+ * However, if the original object was just wrapped with a
+ * package object as part of the repair, we don't need to
+ * change the reference count.
+ */
+ if (!(data->flags & ACPI_OBJECT_WRAPPED)) {
+ new_object->common.reference_count =
+ return_object->common.reference_count;
- if (return_object->common.reference_count > 1) {
- return_object->common.reference_count--;
+ if (return_object->common.reference_count > 1) {
+ return_object->common.reference_count--;
+ }
}
ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
- "%s: Converted %s to expected %s at index %u\n",
+ "%s: Converted %s to expected %s at Package index %u\n",
data->pathname,
acpi_ut_get_object_type_name(return_object),
acpi_ut_get_object_type_name(new_object),
@@ -453,65 +468,6 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
/*******************************************************************************
*
- * FUNCTION: acpi_ns_convert_to_package
- *
- * PARAMETERS: original_object - Object to be converted
- * return_object - Where the new converted object is returned
- *
- * RETURN: Status. AE_OK if conversion was successful.
- *
- * DESCRIPTION: Attempt to convert a Buffer object to a Package. Each byte of
- * the buffer is converted to a single integer package element.
- *
- ******************************************************************************/
-
-static acpi_status
-acpi_ns_convert_to_package(union acpi_operand_object *original_object,
- union acpi_operand_object **return_object)
-{
- union acpi_operand_object *new_object;
- union acpi_operand_object **elements;
- u32 length;
- u8 *buffer;
-
- switch (original_object->common.type) {
- case ACPI_TYPE_BUFFER:
-
- /* Buffer-to-Package conversion */
-
- length = original_object->buffer.length;
- new_object = acpi_ut_create_package_object(length);
- if (!new_object) {
- return (AE_NO_MEMORY);
- }
-
- /* Convert each buffer byte to an integer package element */
-
- elements = new_object->package.elements;
- buffer = original_object->buffer.pointer;
-
- while (length--) {
- *elements =
- acpi_ut_create_integer_object((u64) *buffer);
- if (!*elements) {
- acpi_ut_remove_reference(new_object);
- return (AE_NO_MEMORY);
- }
- elements++;
- buffer++;
- }
- break;
-
- default:
- return (AE_AML_OPERAND_TYPE);
- }
-
- *return_object = new_object;
- return (AE_OK);
-}
-
-/*******************************************************************************
- *
* FUNCTION: acpi_ns_repair_null_element
*
* PARAMETERS: Data - Pointer to validation data structure
@@ -677,55 +633,56 @@ acpi_ns_remove_null_elements(struct acpi_predefined_data *data,
/*******************************************************************************
*
- * FUNCTION: acpi_ns_repair_package_list
+ * FUNCTION: acpi_ns_wrap_with_package
*
* PARAMETERS: Data - Pointer to validation data structure
- * obj_desc_ptr - Pointer to the object to repair. The new
- * package object is returned here,
- * overwriting the old object.
+ * original_object - Pointer to the object to repair.
+ * obj_desc_ptr - The new package object is returned here
*
* RETURN: Status, new object in *obj_desc_ptr
*
- * DESCRIPTION: Repair a common problem with objects that are defined to return
- * a variable-length Package of Packages. If the variable-length
- * is one, some BIOS code mistakenly simply declares a single
- * Package instead of a Package with one sub-Package. This
- * function attempts to repair this error by wrapping a Package
- * object around the original Package, creating the correct
- * Package with one sub-Package.
+ * DESCRIPTION: Repair a common problem with objects that are defined to
+ * return a variable-length Package of sub-objects. If there is
+ * only one sub-object, some BIOS code mistakenly simply declares
+ * the single object instead of a Package with one sub-object.
+ * This function attempts to repair this error by wrapping a
+ * Package object around the original object, creating the
+ * correct and expected Package with one sub-object.
*
* Names that can be repaired in this manner include:
- * _ALR, _CSD, _HPX, _MLS, _PRT, _PSS, _TRT, TSS
+ * _ALR, _CSD, _HPX, _MLS, _PLD, _PRT, _PSS, _TRT, _TSS,
+ * _BCL, _DOD, _FIX, _Sx
*
******************************************************************************/
acpi_status
-acpi_ns_repair_package_list(struct acpi_predefined_data *data,
- union acpi_operand_object **obj_desc_ptr)
+acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
+ union acpi_operand_object *original_object,
+ union acpi_operand_object **obj_desc_ptr)
{
union acpi_operand_object *pkg_obj_desc;
- ACPI_FUNCTION_NAME(ns_repair_package_list);
+ ACPI_FUNCTION_NAME(ns_wrap_with_package);
/*
* Create the new outer package and populate it. The new package will
- * have a single element, the lone subpackage.
+ * have a single element, the lone sub-object.
*/
pkg_obj_desc = acpi_ut_create_package_object(1);
if (!pkg_obj_desc) {
return (AE_NO_MEMORY);
}
- pkg_obj_desc->package.elements[0] = *obj_desc_ptr;
+ pkg_obj_desc->package.elements[0] = original_object;
+
+ ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
+ "%s: Wrapped %s with expected Package object\n",
+ data->pathname,
+ acpi_ut_get_object_type_name(original_object)));
/* Return the new object in the object pointer */
*obj_desc_ptr = pkg_obj_desc;
- data->flags |= ACPI_OBJECT_REPAIRED;
-
- ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
- "%s: Repaired incorrectly formed Package\n",
- data->pathname));
-
+ data->flags |= ACPI_OBJECT_REPAIRED | ACPI_OBJECT_WRAPPED;
return (AE_OK);
}
--
1.7.10.rc2.19.gfae9d
next prev parent reply other threads:[~2012-03-30 12:20 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-30 10:13 ACPI & Power Management patches for Linux-3.4 Len Brown
2012-03-30 10:13 ` [PATCH 01/76] x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep Len Brown
2012-03-30 10:13 ` [PATCH 02/76] tboot: Add return values for tboot_sleep Len Brown
2012-03-30 10:13 ` [PATCH 03/76] ACPI: ignore FADT reset-reg-sup flag Len Brown
2012-03-30 10:13 ` [PATCH 04/76] ACPICA: Fix regression in FADT revision checks Len Brown
2012-03-30 13:14 ` Josh Boyer
2012-04-03 19:58 ` [3.0.y, 3.2.y, 3.3.y] " Jonathan Nieder
2012-04-03 20:15 ` Josh Boyer
2012-04-04 18:58 ` Greg Kroah-Hartman
2012-03-30 10:13 ` [PATCH 05/76] cpuidle: Add common time keeping and irq enabling Len Brown
2012-03-30 10:13 ` [PATCH 06/76] ARM: at91: Consolidate time keeping and irq enable Len Brown
2012-03-30 10:13 ` [PATCH 07/76] ARM: kirkwood: " Len Brown
2012-03-30 10:13 ` [PATCH 08/76] ARM: davinci: " Len Brown
2012-03-30 10:13 ` [PATCH 09/76] ARM: omap: Consolidate OMAP3 " Len Brown
2012-03-30 10:13 ` [PATCH 10/76] ARM: omap: Consolidate OMAP4 " Len Brown
2012-03-30 10:13 ` [PATCH 11/76] ARM: shmobile: Consolidate " Len Brown
2012-03-30 10:13 ` [PATCH 12/76] SH: " Len Brown
2012-03-30 10:13 ` [PATCH 13/76] drivers/thermal/thermal_sys.c: fix build warning Len Brown
2012-03-30 10:13 ` [PATCH 14/76] thermal_sys: remove unnecessary line continuations Len Brown
2012-03-30 10:13 ` [PATCH 15/76] thermal_sys: remove obfuscating used-once macros Len Brown
2012-03-30 10:13 ` [PATCH 16/76] thermal_sys: kernel style cleanups Len Brown
2012-03-30 10:13 ` [PATCH 17/76] thermal_sys: convert printks to pr_<level> Len Brown
2012-03-30 13:41 ` [linux-pm] " Eduardo Valentin
2012-03-30 19:08 ` Joe Perches
2012-04-01 19:13 ` Eduardo Valentin
2012-03-30 10:13 ` [PATCH 18/76] thermal: add support for thermal sensor present on SPEAr13xx machines Len Brown
2012-03-30 10:13 ` [PATCH 19/76] thermal/spear_thermal: replace readl/writel with lighter _relaxed variants Len Brown
2012-03-30 10:13 ` [PATCH 20/76] thermal: spear13xx: checking for NULL instead of IS_ERR() Len Brown
2012-03-30 10:13 ` [PATCH 21/76] thermal: Fix for setting the thermal zone mode to enable/disable Len Brown
2012-03-30 10:13 ` [PATCH 22/76] ARM: davinci: Fix for cpuidle consolidation changes Len Brown
2012-03-30 10:13 ` [PATCH 23/76] ACPICA: Update _REV return value to 5 Len Brown
2012-03-30 10:13 ` [PATCH 24/76] ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers Len Brown
2012-03-30 10:13 ` [PATCH 25/76] ACPICA: Move ACPI timer prototypes to public acpixf file Len Brown
2012-03-30 10:13 ` [PATCH 26/76] ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware Len Brown
2012-03-30 10:13 ` [PATCH 27/76] ACPICA: Expand OSL memory read/write interfaces to 64 bits Len Brown
2012-03-30 10:13 ` [PATCH 28/76] ACPICA: ACPI 5: Update debug output for new notify values Len Brown
2012-03-30 10:13 ` [PATCH 29/76] ACPICA: Add acpi_os_physical_table_override interface Len Brown
2012-03-30 10:13 ` [PATCH 30/76] ACPICA: Distill multiple sleep method functions to a single function Len Brown
2012-03-30 10:13 ` [PATCH 31/76] ACPICA: Split sleep/wake functions into two files Len Brown
2012-03-30 10:13 ` [PATCH 32/76] ACPICA: Add table-driven dispatch for sleep/wake functions Len Brown
2012-03-30 10:13 ` [PATCH 33/76] ACPICA: Update to version 20120215 Len Brown
2012-03-30 10:13 ` [PATCH 34/76] ACPICA: Clarify METHOD_NAME* defines for full-pathname cases Len Brown
2012-03-30 10:13 ` [PATCH 35/76] ACPICA: Change exception code for invalid pathname in acpi_evaluate_object Len Brown
2012-03-30 10:13 ` [PATCH 36/76] ACPICA: Debugger: Add missing object info to namespace dump Len Brown
2012-03-30 10:13 ` [PATCH 37/76] ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS Len Brown
2012-03-30 10:13 ` [PATCH 38/76] ACPI: Move module parameter gts and bfs to sleep.c Len Brown
2012-03-30 10:13 ` [PATCH 39/76] tools turbostat: add summary option Len Brown
2012-03-30 10:13 ` [PATCH 40/76] tools turbostat: reduce measurement overhead due to IPIs Len Brown
2012-03-30 10:13 ` [PATCH 41/76] tools turbostat: harden against cpu online/offline Len Brown
2012-03-30 10:13 ` [PATCH 42/76] ACPI: ec: Do request_region outside WARN() Len Brown
2012-03-30 10:13 ` [PATCH 43/76] ACPI: Make ACPI interrupt threaded Len Brown
2012-03-30 10:13 ` Len Brown [this message]
2012-03-30 10:13 ` [PATCH 45/76] ACPICA: Update to version 20120320 Len Brown
2012-03-30 10:13 ` [PATCH 46/76] ACPI: Introduce ACPI D3_COLD state support Len Brown
2012-04-01 6:53 ` [linux-pm] " Rafael J. Wysocki
2012-03-30 10:13 ` [PATCH 47/76] ACPI: Add interface to register/unregister device to/from power resources Len Brown
2012-03-30 10:13 ` [PATCH 48/76] cpuidle: add a sysfs entry to disable specific C state for debug purpose Len Brown
2012-03-30 10:13 ` [PATCH 49/76] cpuidle: use the driver's state_count as default Len Brown
2012-03-30 10:13 ` [PATCH 50/76] cpuidle: remove useless array definition in cpuidle_structure Len Brown
2012-03-30 10:13 ` [PATCH 51/76] cpuidle: remove unused 'governor_data' field Len Brown
2012-03-30 10:13 ` [PATCH 52/76] ACPI, PCI: Move acpi_dev_run_wake() to ACPI core Len Brown
2012-03-30 10:13 ` [PATCH 53/76] ACPI: Evaluate thermal trip points before reading temperature Len Brown
2012-03-30 10:13 ` [PATCH 54/76] ACPI: Ensure thermal limits match CPU frequencies Len Brown
2012-03-30 10:13 ` [PATCH 55/76] ACPI / PM: print physical addresses consistently with other parts of kernel Len Brown
2012-03-30 10:13 ` [PATCH 56/76] ACPI: Add CPU hotplug support for processor device objects Len Brown
2012-03-30 10:14 ` [PATCH 57/76] ACPI / Video: blacklist some samsung laptops Len Brown
2012-03-30 12:07 ` Corentin Chary
2012-03-30 12:16 ` Len Brown
2012-03-30 10:14 ` [PATCH 58/76] idle, x86: Allow off-lined CPU to enter deeper C states Len Brown
2012-04-02 16:13 ` Tony Luck
2012-04-02 17:25 ` Tony Luck
2012-04-02 17:45 ` Konrad Rzeszutek Wilk
2012-04-02 17:56 ` Boris Ostrovsky
2012-04-02 18:02 ` Tony Luck
2012-04-02 18:10 ` Boris Ostrovsky
2012-03-30 10:14 ` [PATCH 59/76] cpuidle: power_usage should be declared signed integer Len Brown
2012-03-30 10:14 ` [PATCH 60/76] ACPI, APEI, Fix ERST header length check Len Brown
2012-03-30 10:14 ` [PATCH 61/76] ACPI, APEI, EINJ, limit the range of einj_param Len Brown
2012-03-30 10:14 ` [PATCH 62/76] ACPI, APEI, EINJ, new parameter to control trigger action Len Brown
2012-03-30 10:14 ` [PATCH 63/76] Update documentation for parameter *notrigger* in einj.txt Len Brown
2012-03-30 10:14 ` [PATCH 64/76] ACPI, APEI: Fix incorrect APEI register bit width check and usage Len Brown
2012-03-30 10:14 ` [PATCH 65/76] ACPI: processor_driver: add missing kfree Len Brown
2012-03-30 10:14 ` [PATCH 66/76] ACPI: Fix use-after-free in acpi_map_lsapic Len Brown
2012-03-30 10:14 ` [PATCH 67/76] PNPACPI: Fix device ref leaking in acpi_pnp_match Len Brown
2012-03-30 10:14 ` [PATCH 68/76] ACPI: consistently use should_use_kmap() Len Brown
2012-03-30 10:14 ` [PATCH 69/76] ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed() Len Brown
2012-03-30 10:14 ` [PATCH 70/76] ACPI: Clean redundant codes in scan.c Len Brown
2012-03-30 10:14 ` [PATCH 71/76] CPER failed to handle generic error records with multiple sections Len Brown
2012-03-30 10:14 ` [PATCH 72/76] ACPI: Fix logic for removing mappings in 'acpi_unmap' Len Brown
2012-03-30 10:14 ` [PATCH 73/76] ACPI: export acpi_kobj Len Brown
2012-03-30 10:14 ` [PATCH 74/76] ACPI: Add support for exposing BGRT data Len Brown
2012-03-30 10:14 ` [PATCH 75/76] Disable MCP limit exceeded messages from Intel IPS driver Len Brown
2012-03-30 10:14 ` [PATCH 76/76] ACPI throttling: fix endian bug in acpi_read_throttling_status() Len Brown
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=6a99b1c94d053b3420eaa4a4bc8b2883dd90a2f9.1333101989.git.len.brown@intel.com \
--to=lenb@kernel.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=ming.m.lin@intel.com \
--cc=robert.moore@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
all inboxes | Powered by JetHome®