Skip to content

L
linux
Commit 0ad4991c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files
Options

Merge branch 'acpica' 

* acpica: (33 commits)
  ACPICA: Update version to 20130328
  ACPICA: Add a lock to the internal object reference count mechanism
  ACPICA: Fix a format string for 64-bit generation
  ACPICA: Remove FORCE_DELETE option for global reference count mechanism
  ACPICA: Improve error message for Index() operator
  ACPICA: FADT: Remove extraneous warning for very large GPE registers
  ACPICA: Fix a typo in a function header, no functional change
  ACPICA: Fix a typo in an error message
  ACPICA: Fix for some comments/headers
  ACPICA: _OSI Support: handle any errors from acpi_os_acquire_mutex()
  ACPICA: Predefine names: Add allowed argument types to master info table
  ACPI: Set length even for TYPE_END_TAG acpi resource
  ACPICA: Update version to 20130214
  ACPICA: Object repair: Allow 0-length packages for variable-length packages
  ACPICA: Disassembler: Add warnings for unresolved control methods
  ACPICA: Return object repair: Add resource template repairs
  ACPICA: Return object repair: Add string-to-unicode conversion
  ACPICA: Split object conversion functions to a new file
  ACPICA: Add mechanism for early object repairs on a per-name basis
  ACPICA: Remove trailing comma in enum declarations
  ...
parents 2467d7b7 8ee88d59
Show whitespace changes
Inline Side-by-side
Showing with 2697 additions and 1189 deletions
drivers/acpi/acpica/Makefile
View file @ 0ad4991c
...@@ -83,6 +83,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o ...@@ -83,6 +83,7 @@ acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
acpi-y += \ acpi-y += \
nsaccess.o \ nsaccess.o \
nsalloc.o \ nsalloc.o \
nsconvert.o \
nsdump.o \ nsdump.o \
nseval.o \ nseval.o \
nsinit.o \ nsinit.o \
...@@ -160,6 +161,7 @@ acpi-y += \ ...@@ -160,6 +161,7 @@ acpi-y += \
utobject.o \ utobject.o \
utosi.o \ utosi.o \
utownerid.o \ utownerid.o \
utpredef.o \
utresrc.o \ utresrc.o \
utstate.o \ utstate.o \
utstring.o \ utstring.o \
......
drivers/acpi/acpica/acglobal.h
View file @ 0ad4991c
...@@ -224,6 +224,7 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_pending; ...@@ -224,6 +224,7 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_pending;
*/ */
ACPI_EXTERN acpi_spinlock acpi_gbl_gpe_lock; /* For GPE data structs and registers */ ACPI_EXTERN acpi_spinlock acpi_gbl_gpe_lock; /* For GPE data structs and registers */
ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */ ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */
ACPI_EXTERN acpi_spinlock acpi_gbl_reference_count_lock;
/* Mutex for _OSI support */ /* Mutex for _OSI support */
...@@ -413,10 +414,12 @@ ACPI_EXTERN u8 acpi_gbl_db_output_flags; ...@@ -413,10 +414,12 @@ ACPI_EXTERN u8 acpi_gbl_db_output_flags;
#ifdef ACPI_DISASSEMBLER #ifdef ACPI_DISASSEMBLER
u8 ACPI_INIT_GLOBAL(acpi_gbl_ignore_noop_operator, FALSE); ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_ignore_noop_operator, FALSE);
ACPI_EXTERN u8 acpi_gbl_db_opt_disasm; ACPI_EXTERN u8 acpi_gbl_db_opt_disasm;
ACPI_EXTERN u8 acpi_gbl_db_opt_verbose; ACPI_EXTERN u8 acpi_gbl_db_opt_verbose;
ACPI_EXTERN u8 acpi_gbl_num_external_methods;
ACPI_EXTERN u32 acpi_gbl_resolved_external_methods;
ACPI_EXTERN struct acpi_external_list *acpi_gbl_external_list; ACPI_EXTERN struct acpi_external_list *acpi_gbl_external_list;
ACPI_EXTERN struct acpi_external_file *acpi_gbl_external_file_list; ACPI_EXTERN struct acpi_external_file *acpi_gbl_external_file_list;
#endif #endif
......
drivers/acpi/acpica/aclocal.h
View file @ 0ad4991c
...@@ -294,6 +294,8 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state); ...@@ -294,6 +294,8 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
#define ACPI_BTYPE_OBJECTS_AND_REFS 0x0001FFFF /* ARG or LOCAL */ #define ACPI_BTYPE_OBJECTS_AND_REFS 0x0001FFFF /* ARG or LOCAL */
#define ACPI_BTYPE_ALL_OBJECTS 0x0000FFFF #define ACPI_BTYPE_ALL_OBJECTS 0x0000FFFF
#pragma pack(1)
/* /*
* Information structure for ACPI predefined names. * Information structure for ACPI predefined names.
* Each entry in the table contains the following items: * Each entry in the table contains the following items:
...@@ -304,7 +306,7 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state); ...@@ -304,7 +306,7 @@ acpi_status(*acpi_internal_method) (struct acpi_walk_state * walk_state);
*/ */
struct acpi_name_info { struct acpi_name_info {
char name[ACPI_NAME_SIZE]; char name[ACPI_NAME_SIZE];
u8 param_count; u16 argument_list;
u8 expected_btypes; u8 expected_btypes;
}; };
...@@ -327,7 +329,7 @@ struct acpi_package_info { ...@@ -327,7 +329,7 @@ struct acpi_package_info {
u8 count1; u8 count1;
u8 object_type2; u8 object_type2;
u8 count2; u8 count2;
u8 reserved; u16 reserved;
}; };
/* Used for ACPI_PTYPE2_FIXED */ /* Used for ACPI_PTYPE2_FIXED */
...@@ -336,6 +338,7 @@ struct acpi_package_info2 { ...@@ -336,6 +338,7 @@ struct acpi_package_info2 {
u8 type; u8 type;
u8 count; u8 count;
u8 object_type[4]; u8 object_type[4];
u8 reserved;
}; };
/* Used for ACPI_PTYPE1_OPTION */ /* Used for ACPI_PTYPE1_OPTION */
...@@ -345,7 +348,7 @@ struct acpi_package_info3 { ...@@ -345,7 +348,7 @@ struct acpi_package_info3 {
u8 count; u8 count;
u8 object_type[2]; u8 object_type[2];
u8 tail_object_type; u8 tail_object_type;
u8 reserved; u16 reserved;
}; };
union acpi_predefined_info { union acpi_predefined_info {
...@@ -355,6 +358,10 @@ union acpi_predefined_info { ...@@ -355,6 +358,10 @@ union acpi_predefined_info {
struct acpi_package_info3 ret_info3; struct acpi_package_info3 ret_info3;
}; };
/* Reset to default packing */
#pragma pack()
/* Data block used during object validation */ /* Data block used during object validation */
struct acpi_predefined_data { struct acpi_predefined_data {
...@@ -363,6 +370,7 @@ struct acpi_predefined_data { ...@@ -363,6 +370,7 @@ struct acpi_predefined_data {
union acpi_operand_object *parent_package; union acpi_operand_object *parent_package;
struct acpi_namespace_node *node; struct acpi_namespace_node *node;
u32 flags; u32 flags;
u32 return_btype;
u8 node_flags; u8 node_flags;
}; };
...@@ -371,6 +379,20 @@ struct acpi_predefined_data { ...@@ -371,6 +379,20 @@ struct acpi_predefined_data {
#define ACPI_OBJECT_REPAIRED 1 #define ACPI_OBJECT_REPAIRED 1
#define ACPI_OBJECT_WRAPPED 2 #define ACPI_OBJECT_WRAPPED 2
/* Return object auto-repair info */
typedef acpi_status(*acpi_object_converter) (union acpi_operand_object
*original_object,
union acpi_operand_object
**converted_object);
struct acpi_simple_repair_info {
char name[ACPI_NAME_SIZE];
u32 unexpected_btypes;
u32 package_index;
acpi_object_converter object_converter;
};
/* /*
* Bitmapped return value types * Bitmapped return value types
* Note: the actual data types must be contiguous, a loop in nspredef.c * Note: the actual data types must be contiguous, a loop in nspredef.c
...@@ -1037,6 +1059,7 @@ struct acpi_external_list { ...@@ -1037,6 +1059,7 @@ struct acpi_external_list {
u16 length; u16 length;
u8 type; u8 type;
u8 flags; u8 flags;
u8 resolved;
}; };
/* Values for Flags field above */ /* Values for Flags field above */
......
drivers/acpi/acpica/acmacros.h
View file @ 0ad4991c
...@@ -322,10 +322,12 @@ ...@@ -322,10 +322,12 @@
* where a pointer to an object of type union acpi_operand_object can also * where a pointer to an object of type union acpi_operand_object can also
* appear. This macro is used to distinguish them. * appear. This macro is used to distinguish them.
* *
* The "Descriptor" field is the first field in both structures. * The "DescriptorType" field is the second field in both structures.
*/ */
#define ACPI_GET_DESCRIPTOR_PTR(d) (((union acpi_descriptor *)(void *)(d))->common.common_pointer)
#define ACPI_SET_DESCRIPTOR_PTR(d, p) (((union acpi_descriptor *)(void *)(d))->common.common_pointer = (p))
#define ACPI_GET_DESCRIPTOR_TYPE(d) (((union acpi_descriptor *)(void *)(d))->common.descriptor_type) #define ACPI_GET_DESCRIPTOR_TYPE(d) (((union acpi_descriptor *)(void *)(d))->common.descriptor_type)
#define ACPI_SET_DESCRIPTOR_TYPE(d, t) (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = t) #define ACPI_SET_DESCRIPTOR_TYPE(d, t) (((union acpi_descriptor *)(void *)(d))->common.descriptor_type = (t))
/* /*
* Macros for the master AML opcode table * Macros for the master AML opcode table
......
drivers/acpi/acpica/acnamesp.h
View file @ 0ad4991c
...@@ -166,6 +166,29 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent); ...@@ -166,6 +166,29 @@ void acpi_ns_delete_children(struct acpi_namespace_node *parent);
int acpi_ns_compare_names(char *name1, char *name2); int acpi_ns_compare_names(char *name1, char *name2);
/*
* nsconvert - Dynamic object conversion routines
*/
acpi_status
acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
union acpi_operand_object **return_object);
acpi_status
acpi_ns_convert_to_string(union acpi_operand_object *original_object,
union acpi_operand_object **return_object);
acpi_status
acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
union acpi_operand_object **return_object);
acpi_status
acpi_ns_convert_to_unicode(union acpi_operand_object *original_object,
union acpi_operand_object **return_object);
acpi_status
acpi_ns_convert_to_resource(union acpi_operand_object *original_object,
union acpi_operand_object **return_object);
/* /*
* nsdump - Namespace dump/print utilities * nsdump - Namespace dump/print utilities
*/ */
...@@ -208,10 +231,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, ...@@ -208,10 +231,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
acpi_status return_status, acpi_status return_status,
union acpi_operand_object **return_object); union acpi_operand_object **return_object);
const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
acpi_namespace_node
*node);
void void
acpi_ns_check_parameter_count(char *pathname, acpi_ns_check_parameter_count(char *pathname,
struct acpi_namespace_node *node, struct acpi_namespace_node *node,
...@@ -289,7 +308,7 @@ acpi_ns_get_attached_data(struct acpi_namespace_node *node, ...@@ -289,7 +308,7 @@ acpi_ns_get_attached_data(struct acpi_namespace_node *node,
* predefined methods/objects * predefined methods/objects
*/ */
acpi_status acpi_status
acpi_ns_repair_object(struct acpi_predefined_data *data, acpi_ns_simple_repair(struct acpi_predefined_data *data,
u32 expected_btypes, u32 expected_btypes,
u32 package_index, u32 package_index,
union acpi_operand_object **return_object_ptr); union acpi_operand_object **return_object_ptr);
......
drivers/acpi/acpica/acpredef.h
View file @ 0ad4991c
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
* object type * object type
* count * count
* *
* ACPI_PTYPE1_VAR: Variable-length length: * ACPI_PTYPE1_VAR: Variable-length length. Zero-length package is allowed:
* object type (Int/Buf/Ref) * object type (Int/Buf/Ref)
* *
* ACPI_PTYPE1_OPTION: Package has some required and some optional elements * ACPI_PTYPE1_OPTION: Package has some required and some optional elements
...@@ -66,14 +66,16 @@ ...@@ -66,14 +66,16 @@
* 2) PTYPE2 packages contain a Variable-length number of sub-packages. Each * 2) PTYPE2 packages contain a Variable-length number of sub-packages. Each
* of the different types describe the contents of each of the sub-packages. * of the different types describe the contents of each of the sub-packages.
* *
* ACPI_PTYPE2: Each subpackage contains 1 or 2 object types: * ACPI_PTYPE2: Each subpackage contains 1 or 2 object types. Zero-length
* parent package is allowed:
* object type * object type
* count * count
* object type * object type
* count * count
* (Used for _ALR,_MLS,_PSS,_TRT,_TSS) * (Used for _ALR,_MLS,_PSS,_TRT,_TSS)
* *
* ACPI_PTYPE2_COUNT: Each subpackage has a count as first element: * ACPI_PTYPE2_COUNT: Each subpackage has a count as first element.
* Zero-length parent package is allowed:
* object type * object type
* (Used for _CSD,_PSD,_TSD) * (Used for _CSD,_PSD,_TSD)
* *
...@@ -84,17 +86,19 @@ ...@@ -84,17 +86,19 @@
* count * count
* (Used for _CST) * (Used for _CST)
* *
* ACPI_PTYPE2_FIXED: Each subpackage is of Fixed-length * ACPI_PTYPE2_FIXED: Each subpackage is of Fixed-length. Zero-length
* parent package is allowed.
* (Used for _PRT) * (Used for _PRT)
* *
* ACPI_PTYPE2_MIN: Each subpackage has a Variable-length but minimum length * ACPI_PTYPE2_MIN: Each subpackage has a Variable-length but minimum length.
* Zero-length parent package is allowed:
* (Used for _HPX) * (Used for _HPX)
* *
* ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length * ACPI_PTYPE2_REV_FIXED: Revision at start, each subpackage is Fixed-length
* (Used for _ART, _FPS) * (Used for _ART, _FPS)
* *
* ACPI_PTYPE2_FIX_VAR: Each subpackage consists of some fixed-length elements * ACPI_PTYPE2_FIX_VAR: Each subpackage consists of some fixed-length elements
* followed by an optional element * followed by an optional element. Zero-length parent package is allowed.
* object type * object type
* count * count
* object type * object type
...@@ -116,8 +120,47 @@ enum acpi_return_package_types { ...@@ -116,8 +120,47 @@ enum acpi_return_package_types {
ACPI_PTYPE2_FIX_VAR = 10 ACPI_PTYPE2_FIX_VAR = 10
}; };
/* Support macros for users of the predefined info table */
#define METHOD_PREDEF_ARGS_MAX 4
#define METHOD_ARG_BIT_WIDTH 3
#define METHOD_ARG_MASK 0x0007
#define ARG_COUNT_IS_MINIMUM 0x8000
#define METHOD_MAX_ARG_TYPE ACPI_TYPE_PACKAGE
#define METHOD_GET_COUNT(arg_list) (arg_list & METHOD_ARG_MASK)
#define METHOD_GET_NEXT_ARG(arg_list) (arg_list >> METHOD_ARG_BIT_WIDTH)
/* Macros used to build the predefined info table */
#define METHOD_0ARGS 0
#define METHOD_1ARGS(a1) (1 | (a1 << 3))
#define METHOD_2ARGS(a1,a2) (2 | (a1 << 3) | (a2 << 6))
#define METHOD_3ARGS(a1,a2,a3) (3 | (a1 << 3) | (a2 << 6) | (a3 << 9))
#define METHOD_4ARGS(a1,a2,a3,a4) (4 | (a1 << 3) | (a2 << 6) | (a3 << 9) | (a4 << 12))
#define METHOD_RETURNS(type) (type)
#define METHOD_NO_RETURN_VALUE 0
#define PACKAGE_INFO(a,b,c,d,e,f) {{{(a),(b),(c),(d)}, ((((u16)(f)) << 8) | (e)), 0}}
/* Support macros for the resource descriptor info table */
#define WIDTH_1 0x0001
#define WIDTH_2 0x0002
#define WIDTH_3 0x0004
#define WIDTH_8 0x0008
#define WIDTH_16 0x0010
#define WIDTH_32 0x0020
#define WIDTH_64 0x0040
#define VARIABLE_DATA 0x0080
#define NUM_RESOURCE_WIDTHS 8
#define WIDTH_ADDRESS WIDTH_16 | WIDTH_32 | WIDTH_64
#ifdef ACPI_CREATE_PREDEFINED_TABLE #ifdef ACPI_CREATE_PREDEFINED_TABLE
/* /******************************************************************************
*
* Predefined method/object information table. * Predefined method/object information table.
* *
* These are the names that can actually be evaluated via acpi_evaluate_object. * These are the names that can actually be evaluated via acpi_evaluate_object.
...@@ -128,6 +171,7 @@ enum acpi_return_package_types { ...@@ -128,6 +171,7 @@ enum acpi_return_package_types {
* _Lxx and _Exx GPE methods * _Lxx and _Exx GPE methods
* _Qxx EC methods * _Qxx EC methods
* _T_x compiler temporary variables * _T_x compiler temporary variables
* _Wxx wake events
* *
* 2) Predefined names that never actually exist within the AML code: * 2) Predefined names that never actually exist within the AML code:
* Predefined resource descriptor field names * Predefined resource descriptor field names
...@@ -135,13 +179,13 @@ enum acpi_return_package_types { ...@@ -135,13 +179,13 @@ enum acpi_return_package_types {
* 3) Predefined names that are implemented within ACPICA: * 3) Predefined names that are implemented within ACPICA:
* _OSI * _OSI
* *
* 4) Some predefined names that are not documented within the ACPI spec.
* _WDG, _WED
*
* The main entries in the table each contain the following items: * The main entries in the table each contain the following items:
* *
* name - The ACPI reserved name * name - The ACPI reserved name
* param_count - Number of arguments to the method * argument_list - Contains (in 16 bits), the number of required
* arguments to the method (3 bits), and a 3-bit type
* field for each argument (up to 4 arguments). The
* METHOD_?ARGS macros generate the correct packed data.
* expected_btypes - Allowed type(s) for the return value. * expected_btypes - Allowed type(s) for the return value.
* 0 means that no return value is expected. * 0 means that no return value is expected.
* *
...@@ -151,256 +195,511 @@ enum acpi_return_package_types { ...@@ -151,256 +195,511 @@ enum acpi_return_package_types {
* overall size of the stored data. * overall size of the stored data.
* *
* Note: The additional braces are intended to promote portability. * Note: The additional braces are intended to promote portability.
*/ *
static const union acpi_predefined_info predefined_names[] = { * Note2: Table is used by the kernel-resident subsystem, the iASL compiler,
{{"_AC0", 0, ACPI_RTYPE_INTEGER}}, * and the acpi_help utility.
{{"_AC1", 0, ACPI_RTYPE_INTEGER}}, *
{{"_AC2", 0, ACPI_RTYPE_INTEGER}}, * TBD: _PRT - currently ignore reversed entries. Attempt to fix in nsrepair.
{{"_AC3", 0, ACPI_RTYPE_INTEGER}}, * Possibly fixing package elements like _BIF, etc.
{{"_AC4", 0, ACPI_RTYPE_INTEGER}}, *
{{"_AC5", 0, ACPI_RTYPE_INTEGER}}, *****************************************************************************/
{{"_AC6", 0, ACPI_RTYPE_INTEGER}},
{{"_AC7", 0, ACPI_RTYPE_INTEGER}}, const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
{{"_AC8", 0, ACPI_RTYPE_INTEGER}}, {{"_AC0", METHOD_0ARGS,
{{"_AC9", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_ADR", 0, ACPI_RTYPE_INTEGER}},
{{"_AEI", 0, ACPI_RTYPE_BUFFER}}, {{"_AC1", METHOD_0ARGS,
{{"_AL0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC2", METHOD_0ARGS,
{{"_AL1", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC3", METHOD_0ARGS,
{{"_AL2", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC4", METHOD_0ARGS,
{{"_AL3", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC5", METHOD_0ARGS,
{{"_AL4", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC6", METHOD_0ARGS,
{{"_AL5", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC7", METHOD_0ARGS,
{{"_AL6", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC8", METHOD_0ARGS,
{{"_AL7", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AC9", METHOD_0ARGS,
{{"_AL8", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_ADR", METHOD_0ARGS,
{{"_AL9", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_AEI", METHOD_0ARGS,
{{"_ALC", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_ALI", 0, ACPI_RTYPE_INTEGER}},
{{"_ALP", 0, ACPI_RTYPE_INTEGER}}, {{"_AL0", METHOD_0ARGS,
{{"_ALR", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 (Ints) */ METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_ALT", 0, ACPI_RTYPE_INTEGER}}, {{"_AL1", METHOD_0ARGS,
{{"_ART", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(rev), n Pkg (2 Ref/11 Int) */ METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
11, 0}},
{{"_AL2", METHOD_0ARGS,
{{"_BBN", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{"_BCL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */ PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
{{"_AL3", METHOD_0ARGS,
{{"_BCM", 1, 0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{"_BCT", 1, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_BDN", 0, ACPI_RTYPE_INTEGER}},
{{"_BFS", 1, 0}}, {{"_AL4", METHOD_0ARGS,
{{"_BIF", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (9 Int),(4 Str) */ METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 9, ACPI_RTYPE_STRING}, 4, 0}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_BIX", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int),(4 Str) */ {{"_AL5", METHOD_0ARGS,
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, ACPI_RTYPE_STRING}, 4, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
0}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_BLT", 3, 0}}, {{"_AL6", METHOD_0ARGS,
{{"_BMA", 1, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{"_BMC", 1, 0}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_BMD", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (5 Int) */
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5,0}, 0,0}}, {{"_AL7", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{"_BMS", 1, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_BQC", 0, ACPI_RTYPE_INTEGER}},
{{"_BST", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */ {{"_AL8", METHOD_0ARGS,
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_BTM", 1, ACPI_RTYPE_INTEGER}},
{{"_BTP", 1, 0}}, {{"_AL9", METHOD_0ARGS,
{{"_CBA", 0, ACPI_RTYPE_INTEGER}}, /* See PCI firmware spec 3.0 */ METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{"_CDM", 0, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_CID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Strs) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0, 0}, 0, {{"_ALC", METHOD_0ARGS,
0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_CLS", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (3 Int) */ {{"_ALI", METHOD_0ARGS,
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_CPC", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints/Bufs) */ {{"_ALP", METHOD_0ARGS,
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0, 0}, 0, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
0}},
{{"_ALR", METHOD_0ARGS,
{{"_CRS", 0, ACPI_RTYPE_BUFFER}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 2 (Ints) */
{{"_CRT", 0, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 2, 0, 0, 0),
{{"_CSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n-1 Int) */
{{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0,0}, 0,0}}, {{"_ALT", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_CST", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */
{{{ACPI_PTYPE2_PKG_COUNT, ACPI_RTYPE_BUFFER, 1, ACPI_RTYPE_INTEGER}, 3, {{"_ART", METHOD_0ARGS,
0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(rev), n Pkg (2 Ref/11 Int) */
PACKAGE_INFO(ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_REFERENCE, 2,
{{"_CWS", 1, ACPI_RTYPE_INTEGER}}, ACPI_RTYPE_INTEGER, 11, 0),
{{"_DCK", 1, ACPI_RTYPE_INTEGER}},
{{"_DCS", 0, ACPI_RTYPE_INTEGER}}, {{"_BBN", METHOD_0ARGS,
{{"_DDC", 1, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_DDN", 0, ACPI_RTYPE_STRING}},
{{"_DEP", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ {{"_BCL", METHOD_0ARGS,
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
{{"_DGS", 0, ACPI_RTYPE_INTEGER}},
{{"_DIS", 0, 0}}, {{"_BCM", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_DLM", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */
{{{ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1, {{"_BCT", METHOD_1ARGS(ACPI_TYPE_INTEGER),
ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER}, 0, 0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_DMA", 0, ACPI_RTYPE_BUFFER}}, {{"_BDN", METHOD_0ARGS,
{{"_DOD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
{{"_BFS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_DOS", 1, 0}}, METHOD_NO_RETURN_VALUE}},
{{"_DSM", 4, ACPI_RTYPE_ALL}}, /* Must return a type, but it can be of any type */
{{"_DSS", 1, 0}}, {{"_BIF", METHOD_0ARGS,
{{"_DSW", 3, 0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (9 Int),(4 Str) */
{{"_DTI", 1, 0}}, PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 9,
{{"_EC_", 0, ACPI_RTYPE_INTEGER}}, ACPI_RTYPE_STRING, 4, 0),
{{"_EDL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs)*/
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}}, {{"_BIX", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (16 Int),(4 Str) */
{{"_EJ0", 1, 0}}, PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,
{{"_EJ1", 1, 0}}, ACPI_RTYPE_STRING, 4, 0),
{{"_EJ2", 1, 0}},
{{"_EJ3", 1, 0}}, {{"_BLT",
{{"_EJ4", 1, 0}}, METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
{{"_EJD", 0, ACPI_RTYPE_STRING}}, METHOD_NO_RETURN_VALUE}},
{{"_EVT", 1, 0}},
{{"_FDE", 0, ACPI_RTYPE_BUFFER}}, {{"_BMA", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_FDI", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (16 Int) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,0}, 0,0}},
{{"_BMC", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_FDM", 1, 0}}, METHOD_NO_RETURN_VALUE}},
{{"_FIF", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0}, 0, 0}}, {{"_BMD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (5 Int) */
{{"_FIX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Ints) */ PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0,0}, 0,0}},
{{"_BMS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_FPS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (1 Int(rev), n Pkg (5 Int) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 5, 0}, 0, 0}},
{{"_BQC", METHOD_0ARGS,
{{"_FSL", 1, 0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_FST", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (3 Int) */
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0}, 0, 0}}, {{"_BST", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
{{"_GAI", 0, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
{{"_GCP", 0, ACPI_RTYPE_INTEGER}},
{{"_GHL", 0, ACPI_RTYPE_INTEGER}}, {{"_BTM", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_GLK", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_GPD", 0, ACPI_RTYPE_INTEGER}},
{{"_GPE", 0, ACPI_RTYPE_INTEGER}}, /* _GPE method, not _GPE scope */ {{"_BTP", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_GRT", 0, ACPI_RTYPE_BUFFER}}, METHOD_NO_RETURN_VALUE}},
{{"_GSB", 0, ACPI_RTYPE_INTEGER}},
{{"_GTF", 0, ACPI_RTYPE_BUFFER}}, {{"_CBA", METHOD_0ARGS,
{{"_GTM", 0, ACPI_RTYPE_BUFFER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See PCI firmware spec 3.0 */
{{"_GTS", 1, 0}},
{{"_GWS", 1, ACPI_RTYPE_INTEGER}}, {{"_CDM", METHOD_0ARGS,
{{"_HID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_HOT", 0, ACPI_RTYPE_INTEGER}},
{{"_HPP", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */ {{"_CID", METHOD_0ARGS,
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints/Strs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING, 0,
0, 0, 0),
{{"_CLS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (3 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0, 0, 0),
{{"_CPC", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints/Bufs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER, 0,
0, 0, 0),
{{"_CRS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_CRT", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_CSD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(n), n-1 Int) */
PACKAGE_INFO(ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
{{"_CST", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(n), n Pkg (1 Buf/3 Int) */
PACKAGE_INFO(ACPI_PTYPE2_PKG_COUNT, ACPI_RTYPE_BUFFER, 1,
ACPI_RTYPE_INTEGER, 3, 0),
{{"_CWS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_DCK", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_DCS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_DDC", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_BUFFER)}},
{{"_DDN", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_STRING)}},
{{"_DEP", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_DGS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_DIS", METHOD_0ARGS,
METHOD_NO_RETURN_VALUE}},
{{"_DLM", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (1 Ref, 0/1 Optional Buf/Ref) */
PACKAGE_INFO(ACPI_PTYPE2_FIX_VAR, ACPI_RTYPE_REFERENCE, 1,
ACPI_RTYPE_REFERENCE | ACPI_RTYPE_BUFFER, 0, 0),
{{"_DMA", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_DOD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
{{"_DOS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_DSM",
METHOD_4ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
ACPI_TYPE_PACKAGE),
METHOD_RETURNS(ACPI_RTYPE_ALL)}}, /* Must return a value, but it can be of any type */
{{"_DSS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_DSW",
METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_DTI", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_EC_", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_EDL", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_EJ0", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_EJ1", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_EJ2", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_EJ3", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_EJ4", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_EJD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_STRING)}},
{{"_ERR",
METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_STRING, ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* Internal use only, used by ACPICA test suites */
{{"_EVT", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_FDE", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_FDI", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (16 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16, 0, 0, 0),
{{"_FDM", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_FIF", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
{{"_FIX", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Ints) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
{{"_FPS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (1 Int(rev), n Pkg (5 Int) */
PACKAGE_INFO(ACPI_PTYPE2_REV_FIXED, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
{{"_FSL", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_FST", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (3 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, 0, 0, 0),
{{"_GAI", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_GCP", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_GHL", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_GLK", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_GPD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_GPE", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* _GPE method, not _GPE scope */
{{"_GRT", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_GSB", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_GTF", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_GTM", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_GTS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_GWS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_HID", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING)}},
{{"_HOT", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_HPP", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
/* /*
* For _HPX, a single package is returned, containing a Variable-length number * For _HPX, a single package is returned, containing a variable-length number
* of sub-packages. Each sub-package contains a PCI record setting. * of sub-packages. Each sub-package contains a PCI record setting.
* There are several different type of record settings, of different * There are several different type of record settings, of different
* lengths, but all elements of all settings are Integers. * lengths, but all elements of all settings are Integers.
*/ */
{{"_HPX", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (var Ints) */ {{"_HPX", METHOD_0ARGS,
{{{ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5,0}, 0,0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (var Ints) */
PACKAGE_INFO(ACPI_PTYPE2_MIN, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
{{"_HRV", 0, ACPI_RTYPE_INTEGER}},
{{"_IFT", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */ {{"_HRV", METHOD_0ARGS,
{{"_INI", 0, 0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_IRC", 0, 0}},
{{"_LCK", 1, 0}}, {{"_IFT", METHOD_0ARGS,
{{"_LID", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See IPMI spec */
{{"_MAT", 0, ACPI_RTYPE_BUFFER}},
{{"_MBM", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (8 Int) */ {{"_INI", METHOD_0ARGS,
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 8, 0}, 0, 0}}, METHOD_NO_RETURN_VALUE}},
{{"_MLS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (1 Str/1 Buf) */ {{"_IRC", METHOD_0ARGS,
{{{ACPI_PTYPE2, ACPI_RTYPE_STRING, 1, ACPI_RTYPE_BUFFER}, 1, 0}}, METHOD_NO_RETURN_VALUE}},
{{"_MSG", 1, 0}}, {{"_LCK", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_MSM", 4, ACPI_RTYPE_INTEGER}}, METHOD_NO_RETURN_VALUE}},
{{"_NTT", 0, ACPI_RTYPE_INTEGER}},
{{"_OFF", 0, 0}}, {{"_LID", METHOD_0ARGS,
{{"_ON_", 0, 0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_OS_", 0, ACPI_RTYPE_STRING}},
{{"_OSC", 4, ACPI_RTYPE_BUFFER}}, {{"_MAT", METHOD_0ARGS,
{{"_OST", 3, 0}}, METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_PAI", 1, ACPI_RTYPE_INTEGER}},
{{"_PCL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ {{"_MBM", METHOD_0ARGS,
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (8 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 8, 0, 0, 0),
{{"_PCT", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (2 Buf) */
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2,0}, 0,0}}, {{"_MLS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (1 Str/1 Buf) */
{{"_PDC", 1, 0}}, PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_STRING, 1, ACPI_RTYPE_BUFFER, 1,
{{"_PDL", 0, ACPI_RTYPE_INTEGER}}, 0),
{{"_PIC", 1, 0}},
{{"_PIF", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (3 Int),(3 Str) */ {{"_MSG", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3, ACPI_RTYPE_STRING}, 3, 0}}, METHOD_NO_RETURN_VALUE}},
{{"_PLD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Bufs) */ {{"_MSM",
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_BUFFER, 0,0}, 0,0}}, METHOD_4ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
ACPI_TYPE_INTEGER),
{{"_PMC", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (11 Int),(3 Str) */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 11, ACPI_RTYPE_STRING}, 3,
0}}, {{"_NTT", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PMD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, {{"_OFF", METHOD_0ARGS,
METHOD_NO_RETURN_VALUE}},
{{"_PMM", 0, ACPI_RTYPE_INTEGER}},
{{"_PPC", 0, ACPI_RTYPE_INTEGER}}, {{"_ON_", METHOD_0ARGS,
{{"_PPE", 0, ACPI_RTYPE_INTEGER}}, /* See dig64 spec */ METHOD_NO_RETURN_VALUE}},
{{"_PR0", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}}, {{"_OS_", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_STRING)}},
{{"_PR1", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}}, {{"_OSC",
METHOD_4ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER,
{{"_PR2", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ ACPI_TYPE_BUFFER),
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}}, METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_PR3", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ {{"_OST",
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, METHOD_3ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER, ACPI_TYPE_BUFFER),
METHOD_NO_RETURN_VALUE}},
{{"_PRE", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, {{"_PAI", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PRL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0}, 0, 0}}, {{"_PCL", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{"_PRS", 0, ACPI_RTYPE_BUFFER}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PCT", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (2 Buf) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0),
{{"_PDC", METHOD_1ARGS(ACPI_TYPE_BUFFER),
METHOD_NO_RETURN_VALUE}},
{{"_PDL", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PIC", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_PIF", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (3 Int),(3 Str) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 3,
ACPI_RTYPE_STRING, 3, 0),
{{"_PLD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Bufs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_BUFFER, 0, 0, 0, 0),
{{"_PMC", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (11 Int),(3 Str) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 11,
ACPI_RTYPE_STRING, 3, 0),
{{"_PMD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PMM", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PPC", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PPE", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See dig64 spec */
{{"_PR0", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PR1", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PR2", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PR3", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PRE", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PRL", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_PRS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
/* /*
* For _PRT, many BIOSs reverse the 3rd and 4th Package elements (Source * For _PRT, many BIOSs reverse the 3rd and 4th Package elements (Source
...@@ -410,47 +709,89 @@ static const union acpi_predefined_info predefined_names[] = { ...@@ -410,47 +709,89 @@ static const union acpi_predefined_info predefined_names[] = {
* warning, add the ACPI_RTYPE_REFERENCE type to the 4th element (index 3) * warning, add the ACPI_RTYPE_REFERENCE type to the 4th element (index 3)
* in the statement below. * in the statement below.
*/ */
{{"_PRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (4): Int,Int,Int/Ref,Int */ {{"_PRT", METHOD_0ARGS,
{{{ACPI_PTYPE2_FIXED, 4, ACPI_RTYPE_INTEGER,ACPI_RTYPE_INTEGER}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (4): Int,Int,Int/Ref,Int */
PACKAGE_INFO(ACPI_PTYPE2_FIXED, 4, ACPI_RTYPE_INTEGER,
ACPI_RTYPE_INTEGER,
ACPI_RTYPE_INTEGER | ACPI_RTYPE_REFERENCE, ACPI_RTYPE_INTEGER | ACPI_RTYPE_REFERENCE,
ACPI_RTYPE_INTEGER}}, ACPI_RTYPE_INTEGER),
{{"_PRW", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each: Pkg/Int,Int,[Variable-length Refs] (Pkg is Ref/Int) */ {{"_PRW", METHOD_0ARGS,
{{{ACPI_PTYPE1_OPTION, 2, ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each: Pkg/Int,Int,[Variable-length Refs] (Pkg is Ref/Int) */
ACPI_RTYPE_INTEGER}, ACPI_RTYPE_REFERENCE,0}}, PACKAGE_INFO(ACPI_PTYPE1_OPTION, 2,
ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE,
{{"_PS0", 0, 0}}, ACPI_RTYPE_INTEGER, ACPI_RTYPE_REFERENCE, 0),
{{"_PS1", 0, 0}},
{{"_PS2", 0, 0}}, {{"_PS0", METHOD_0ARGS,
{{"_PS3", 0, 0}}, METHOD_NO_RETURN_VALUE}},
{{"_PSC", 0, ACPI_RTYPE_INTEGER}},
{{"_PSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (5 Int) with count */ {{"_PS1", METHOD_0ARGS,
{{{ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER,0,0}, 0,0}}, METHOD_NO_RETURN_VALUE}},
{{"_PSE", 1, 0}}, {{"_PS2", METHOD_0ARGS,
{{"_PSL", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_NO_RETURN_VALUE}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_PS3", METHOD_0ARGS,
{{"_PSR", 0, ACPI_RTYPE_INTEGER}}, METHOD_NO_RETURN_VALUE}},
{{"_PSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each (6 Int) */
{{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 6,0}, 0,0}}, {{"_PSC", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PSV", 0, ACPI_RTYPE_INTEGER}},
{{"_PSW", 1, 0}}, {{"_PSD", METHOD_0ARGS,
{{"_PTC", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (2 Buf) */ METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (5 Int) with count */
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2,0}, 0,0}}, PACKAGE_INFO(ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 0, 0, 0, 0),
{{"_PTP", 2, ACPI_RTYPE_INTEGER}}, {{"_PSE", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_PTS", 1, 0}}, METHOD_NO_RETURN_VALUE}},
{{"_PUR", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (2 Int) */
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0}, 0, 0}}, {{"_PSL", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
{{"_PXM", 0, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_REG", 2, 0}},
{{"_REV", 0, ACPI_RTYPE_INTEGER}}, {{"_PSR", METHOD_0ARGS,
{{"_RMV", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_ROM", 2, ACPI_RTYPE_BUFFER}},
{{"_RTV", 0, ACPI_RTYPE_INTEGER}}, {{"_PSS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each (6 Int) */
PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 6, 0, 0, 0),
{{"_PSV", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PSW", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_PTC", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (2 Buf) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_BUFFER, 2, 0, 0, 0),
{{"_PTP", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_PTS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_PUR", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (2 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0),
{{"_PXM", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_REG", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_REV", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_RMV", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_ROM", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_RTV", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
/* /*
* For _S0_ through _S5_, the ACPI spec defines a return Package * For _S0_ through _S5_, the ACPI spec defines a return Package
...@@ -458,111 +799,285 @@ static const union acpi_predefined_info predefined_names[] = { ...@@ -458,111 +799,285 @@ static const union acpi_predefined_info predefined_names[] = {
* Allow this by making the objects "Variable-length length", but all elements * Allow this by making the objects "Variable-length length", but all elements
* must be Integers. * must be Integers.
*/ */
{{"_S0_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */ {{"_S0_", METHOD_0ARGS,
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
{{"_S1_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}}, {{"_S1_", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
{{"_S2_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */ PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}},
{{"_S2_", METHOD_0ARGS,
{{"_S3_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */ METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
{{"_S4_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */ {{"_S3_", METHOD_0ARGS,
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
{{"_S5_", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (1 Int) */
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1,0}, 0,0}}, {{"_S4_", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
{{"_S1D", 0, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
{{"_S2D", 0, ACPI_RTYPE_INTEGER}},
{{"_S3D", 0, ACPI_RTYPE_INTEGER}}, {{"_S5_", METHOD_0ARGS,
{{"_S4D", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (1 Int) */
{{"_S0W", 0, ACPI_RTYPE_INTEGER}}, PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_INTEGER, 1, 0, 0, 0),
{{"_S1W", 0, ACPI_RTYPE_INTEGER}},
{{"_S2W", 0, ACPI_RTYPE_INTEGER}}, {{"_S1D", METHOD_0ARGS,
{{"_S3W", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_S4W", 0, ACPI_RTYPE_INTEGER}},
{{"_SBS", 0, ACPI_RTYPE_INTEGER}}, {{"_S2D", METHOD_0ARGS,
{{"_SCP", 0x13, 0}}, /* Acpi 1.0 allowed 1 arg. Acpi 3.0 expanded to 3 args. Allow both. */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
/* Note: the 3-arg definition may be removed for ACPI 4.0 */
{{"_SDD", 1, 0}}, {{"_S3D", METHOD_0ARGS,
{{"_SEG", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_SHL", 1, ACPI_RTYPE_INTEGER}},
{{"_SLI", 0, ACPI_RTYPE_BUFFER}}, {{"_S4D", METHOD_0ARGS,
{{"_SPD", 1, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_SRS", 1, 0}},
{{"_SRT", 1, ACPI_RTYPE_INTEGER}}, {{"_S0W", METHOD_0ARGS,
{{"_SRV", 0, ACPI_RTYPE_INTEGER}}, /* See IPMI spec */ METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_SST", 1, 0}},
{{"_STA", 0, ACPI_RTYPE_INTEGER}}, {{"_S1W", METHOD_0ARGS,
{{"_STM", 3, 0}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_STP", 2, ACPI_RTYPE_INTEGER}},
{{"_STR", 0, ACPI_RTYPE_BUFFER}}, {{"_S2W", METHOD_0ARGS,
{{"_STV", 2, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_SUB", 0, ACPI_RTYPE_STRING}},
{{"_SUN", 0, ACPI_RTYPE_INTEGER}}, {{"_S3W", METHOD_0ARGS,
{{"_SWS", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TC1", 0, ACPI_RTYPE_INTEGER}},
{{"_TC2", 0, ACPI_RTYPE_INTEGER}}, {{"_S4W", METHOD_0ARGS,
{{"_TDL", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TIP", 1, ACPI_RTYPE_INTEGER}},
{{"_TIV", 1, ACPI_RTYPE_INTEGER}}, {{"_SBS", METHOD_0ARGS,
{{"_TMP", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TPC", 0, ACPI_RTYPE_INTEGER}},
{{"_TPT", 1, 0}}, {{"_SCP", METHOD_1ARGS(ACPI_TYPE_INTEGER) | ARG_COUNT_IS_MINIMUM,
{{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 Ref/6 Int */ METHOD_NO_RETURN_VALUE}}, /* Acpi 1.0 allowed 1 integer arg. Acpi 3.0 expanded to 3 args. Allow both. */
{{{ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER}, 6, 0}},
{{"_SDD", METHOD_1ARGS(ACPI_TYPE_BUFFER),
{{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int with count */ METHOD_NO_RETURN_VALUE}},
{{{ACPI_PTYPE2_COUNT,ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
{{"_SEG", METHOD_0ARGS,
{{"_TSP", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int */
{{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5,0}, 0,0}}, {{"_SHL", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TST", 0, ACPI_RTYPE_INTEGER}},
{{"_TTS", 1, 0}}, {{"_SLI", METHOD_0ARGS,
{{"_TZD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Refs) */ METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{{ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0,0}, 0,0}},
{{"_SPD", METHOD_1ARGS(ACPI_TYPE_INTEGER),
{{"_TZM", 0, ACPI_RTYPE_REFERENCE}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TZP", 0, ACPI_RTYPE_INTEGER}},
{{"_UID", 0, ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING}}, {{"_SRS", METHOD_1ARGS(ACPI_TYPE_BUFFER),
{{"_UPC", 0, ACPI_RTYPE_PACKAGE}}, /* Fixed-length (4 Int) */ METHOD_NO_RETURN_VALUE}},
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4,0}, 0,0}},
{{"_SRT", METHOD_1ARGS(ACPI_TYPE_BUFFER),
{{"_UPD", 0, ACPI_RTYPE_INTEGER}}, METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_UPP", 0, ACPI_RTYPE_INTEGER}},
{{"_VPO", 0, ACPI_RTYPE_INTEGER}}, {{"_SRV", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}}, /* See IPMI spec */
{{"_SST", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_STA", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_STM",
METHOD_3ARGS(ACPI_TYPE_BUFFER, ACPI_TYPE_BUFFER, ACPI_TYPE_BUFFER),
METHOD_NO_RETURN_VALUE}},
{{"_STP", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_STR", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
{{"_STV", METHOD_2ARGS(ACPI_TYPE_INTEGER, ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_SUB", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_STRING)}},
{{"_SUN", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_SWS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TC1", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TC2", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TDL", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TIP", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TIV", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TMP", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TPC", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TPT", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_TRT", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 2 Ref/6 Int */
PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER,
6, 0),
{{"_TSD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 5 Int with count */
PACKAGE_INFO(ACPI_PTYPE2_COUNT, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
{{"_TSP", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TSS", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Pkgs) each 5 Int */
PACKAGE_INFO(ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5, 0, 0, 0),
{{"_TST", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_TTS", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_NO_RETURN_VALUE}},
{{"_TZD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Variable-length (Refs) */
PACKAGE_INFO(ACPI_PTYPE1_VAR, ACPI_RTYPE_REFERENCE, 0, 0, 0, 0),
{{"_TZM", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_REFERENCE)}},
{{"_TZP", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_UID", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING)}},
{{"_UPC", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (4 Int) */
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 4, 0, 0, 0),
{{"_UPD", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_UPP", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
{{"_VPO", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_INTEGER)}},
/* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */ /* Acpi 1.0 defined _WAK with no return value. Later, it was changed to return a package */
{{"_WAK", 1, {{"_WAK", METHOD_1ARGS(ACPI_TYPE_INTEGER),
ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER | ACPI_RTYPE_PACKAGE}}, METHOD_RETURNS(ACPI_RTYPE_NONE | ACPI_RTYPE_INTEGER |
{{{ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2,0}, 0,0}}, /* Fixed-length (2 Int), but is optional */ ACPI_RTYPE_PACKAGE)}},
PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 2, 0, 0, 0), /* Fixed-length (2 Int), but is optional */
/* _WDG/_WED are MS extensions defined by "Windows Instrumentation" */ /* _WDG/_WED are MS extensions defined by "Windows Instrumentation" */
{{"_WDG", 0, ACPI_RTYPE_BUFFER}}, {{"_WDG", METHOD_0ARGS,
{{"_WED", 1, METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER}},
{{"_WED", METHOD_1ARGS(ACPI_TYPE_INTEGER),
METHOD_RETURNS(ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING |
ACPI_RTYPE_BUFFER)}},
{{{0, 0, 0, 0}, 0, 0}} /* Table terminator */ PACKAGE_INFO(0, 0, 0, 0, 0, 0) /* Table terminator */
}; };
#else
extern const union acpi_predefined_info acpi_gbl_predefined_methods[];
#endif
#if 0 #if (defined ACPI_CREATE_RESOURCE_TABLE && defined ACPI_APPLICATION)
/******************************************************************************
*
* Predefined names for use in Resource Descriptors. These names do not
* appear in the global Predefined Name table (since these names never
* appear in actual AML byte code, only in the original ASL)
*
* Note: Used by iASL compiler and acpi_help utility only.
*
*****************************************************************************/
/* This is an internally implemented control method, no need to check */ const union acpi_predefined_info acpi_gbl_resource_names[] = {
{ { {{"_ADR", WIDTH_16 | WIDTH_64, 0}},
"_OSI", 1, ACPI_RTYPE_INTEGER}}, {{"_ALN", WIDTH_8 | WIDTH_16 | WIDTH_32, 0}},
{{"_ASI", WIDTH_8, 0}},
{{"_ASZ", WIDTH_8, 0}},
{{"_ATT", WIDTH_64, 0}},
{{"_BAS", WIDTH_16 | WIDTH_32, 0}},
{{"_BM_", WIDTH_1, 0}},
{{"_DBT", WIDTH_16, 0}}, /* Acpi 5.0 */
{{"_DEC", WIDTH_1, 0}},
{{"_DMA", WIDTH_8, 0}},
{{"_DPL", WIDTH_1, 0}}, /* Acpi 5.0 */
{{"_DRS", WIDTH_16, 0}}, /* Acpi 5.0 */
{{"_END", WIDTH_1, 0}}, /* Acpi 5.0 */
{{"_FLC", WIDTH_2, 0}}, /* Acpi 5.0 */
{{"_GRA", WIDTH_ADDRESS, 0}},
{{"_HE_", WIDTH_1, 0}},
{{"_INT", WIDTH_16 | WIDTH_32, 0}},
{{"_IOR", WIDTH_2, 0}}, /* Acpi 5.0 */
{{"_LEN", WIDTH_8 | WIDTH_ADDRESS, 0}},
{{"_LIN", WIDTH_8, 0}}, /* Acpi 5.0 */
{{"_LL_", WIDTH_1, 0}},
{{"_MAF", WIDTH_1, 0}},
{{"_MAX", WIDTH_ADDRESS, 0}},
{{"_MEM", WIDTH_2, 0}},
{{"_MIF", WIDTH_1, 0}},
{{"_MIN", WIDTH_ADDRESS, 0}},
{{"_MOD", WIDTH_1, 0}}, /* Acpi 5.0 */
{{"_MTP", WIDTH_2, 0}},
{{"_PAR", WIDTH_8, 0}}, /* Acpi 5.0 */
{{"_PHA", WIDTH_1, 0}}, /* Acpi 5.0 */
{{"_PIN", WIDTH_16, 0}}, /* Acpi 5.0 */
{{"_PPI", WIDTH_8, 0}}, /* Acpi 5.0 */
{{"_POL", WIDTH_1 | WIDTH_2, 0}}, /* Acpi 5.0 */
{{"_RBO", WIDTH_8, 0}},
{{"_RBW", WIDTH_8, 0}},
{{"_RNG", WIDTH_1, 0}},
{{"_RT_", WIDTH_8, 0}}, /* Acpi 3.0 */
{{"_RW_", WIDTH_1, 0}},
{{"_RXL", WIDTH_16, 0}}, /* Acpi 5.0 */
{{"_SHR", WIDTH_2, 0}},
{{"_SIZ", WIDTH_2, 0}},
{{"_SLV", WIDTH_1, 0}}, /* Acpi 5.0 */
{{"_SPE", WIDTH_32, 0}}, /* Acpi 5.0 */
{{"_STB", WIDTH_2, 0}}, /* Acpi 5.0 */
{{"_TRA", WIDTH_ADDRESS, 0}},
{{"_TRS", WIDTH_1, 0}},
{{"_TSF", WIDTH_8, 0}}, /* Acpi 3.0 */
{{"_TTP", WIDTH_1, 0}},
{{"_TXL", WIDTH_16, 0}}, /* Acpi 5.0 */
{{"_TYP", WIDTH_2 | WIDTH_16, 0}},
{{"_VEN", VARIABLE_DATA, 0}}, /* Acpi 5.0 */
PACKAGE_INFO(0, 0, 0, 0, 0, 0) /* Table terminator */
};
/* TBD: */ static const union acpi_predefined_info acpi_gbl_scope_names[] = {
_PRT - currently ignore reversed entries. attempt to fix here? {{"_GPE", 0, 0}},
think about possibly fixing package elements like _BIF, etc. {{"_PR_", 0, 0}},
{{"_SB_", 0, 0}},
{{"_SI_", 0, 0}},
{{"_TZ_", 0, 0}},
PACKAGE_INFO(0, 0, 0, 0, 0, 0) /* Table terminator */
};
#else
extern const union acpi_predefined_info acpi_gbl_resource_names[];
#endif #endif
#endif #endif
#endif
drivers/acpi/acpica/acutils.h
View file @ 0ad4991c
...@@ -113,9 +113,10 @@ struct acpi_pkg_info { ...@@ -113,9 +113,10 @@ struct acpi_pkg_info {
u32 num_packages; u32 num_packages;
}; };
/* Object reference counts */
#define REF_INCREMENT (u16) 0 #define REF_INCREMENT (u16) 0
#define REF_DECREMENT (u16) 1 #define REF_DECREMENT (u16) 1
#define REF_FORCE_DELETE (u16) 2
/* acpi_ut_dump_buffer */ /* acpi_ut_dump_buffer */
...@@ -421,7 +422,7 @@ acpi_ut_get_object_size(union acpi_operand_object *obj, acpi_size * obj_length); ...@@ -421,7 +422,7 @@ acpi_ut_get_object_size(union acpi_operand_object *obj, acpi_size * obj_length);
*/ */
acpi_status acpi_ut_initialize_interfaces(void); acpi_status acpi_ut_initialize_interfaces(void);
void acpi_ut_interface_terminate(void); acpi_status acpi_ut_interface_terminate(void);
acpi_status acpi_ut_install_interface(acpi_string interface_name); acpi_status acpi_ut_install_interface(acpi_string interface_name);
...@@ -431,6 +432,26 @@ struct acpi_interface_info *acpi_ut_get_interface(acpi_string interface_name); ...@@ -431,6 +432,26 @@ struct acpi_interface_info *acpi_ut_get_interface(acpi_string interface_name);
acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state); acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state);
/*
* utpredef - support for predefined names
*/
const union acpi_predefined_info *acpi_ut_get_next_predefined_method(const union
acpi_predefined_info
*this_name);
const union acpi_predefined_info *acpi_ut_match_predefined_method(char *name);
const union acpi_predefined_info *acpi_ut_match_resource_name(char *name);
void
acpi_ut_display_predefined_method(char *buffer,
const union acpi_predefined_info *this_name,
u8 multi_line);
void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes);
u32 acpi_ut_get_resource_bit_width(char *buffer, u16 types);
/* /*
* utstate - Generic state creation/cache routines * utstate - Generic state creation/cache routines
*/ */
...@@ -483,7 +504,8 @@ acpi_ut_short_divide(u64 in_dividend, ...@@ -483,7 +504,8 @@ acpi_ut_short_divide(u64 in_dividend,
/* /*
* utmisc * utmisc
*/ */
const char *acpi_ut_validate_exception(acpi_status status); const struct acpi_exception_info *acpi_ut_validate_exception(acpi_status
status);
u8 acpi_ut_is_pci_root_bridge(char *id); u8 acpi_ut_is_pci_root_bridge(char *id);
......
drivers/acpi/acpica/dsutils.c
View file @ 0ad4991c
...@@ -178,7 +178,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, ...@@ -178,7 +178,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
if (!op) { if (!op) {
ACPI_ERROR((AE_INFO, "Null Op")); ACPI_ERROR((AE_INFO, "Null Op"));
return_VALUE(TRUE); return_UINT8(TRUE);
} }
/* /*
...@@ -210,7 +210,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, ...@@ -210,7 +210,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
"At Method level, result of [%s] not used\n", "At Method level, result of [%s] not used\n",
acpi_ps_get_opcode_name(op->common. acpi_ps_get_opcode_name(op->common.
aml_opcode))); aml_opcode)));
return_VALUE(FALSE); return_UINT8(FALSE);
} }
/* Get info on the parent. The root_op is AML_SCOPE */ /* Get info on the parent. The root_op is AML_SCOPE */
...@@ -219,7 +219,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, ...@@ -219,7 +219,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode); acpi_ps_get_opcode_info(op->common.parent->common.aml_opcode);
if (parent_info->class == AML_CLASS_UNKNOWN) { if (parent_info->class == AML_CLASS_UNKNOWN) {
ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op)); ACPI_ERROR((AE_INFO, "Unknown parent opcode Op=%p", op));
return_VALUE(FALSE); return_UINT8(FALSE);
} }
/* /*
...@@ -307,7 +307,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, ...@@ -307,7 +307,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
acpi_ps_get_opcode_name(op->common.parent->common. acpi_ps_get_opcode_name(op->common.parent->common.
aml_opcode), op)); aml_opcode), op));
return_VALUE(TRUE); return_UINT8(TRUE);
result_not_used: result_not_used:
ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH, ACPI_DEBUG_PRINT((ACPI_DB_DISPATCH,
...@@ -316,7 +316,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op, ...@@ -316,7 +316,7 @@ acpi_ds_is_result_used(union acpi_parse_object * op,
acpi_ps_get_opcode_name(op->common.parent->common. acpi_ps_get_opcode_name(op->common.parent->common.
aml_opcode), op)); aml_opcode), op));
return_VALUE(FALSE); return_UINT8(FALSE);
} }
/******************************************************************************* /*******************************************************************************
......
drivers/acpi/acpica/dswexec.c
View file @ 0ad4991c
...@@ -693,7 +693,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state) ...@@ -693,7 +693,7 @@ acpi_status acpi_ds_exec_end_op(struct acpi_walk_state *walk_state)
default: default:
ACPI_ERROR((AE_INFO, ACPI_ERROR((AE_INFO,
"Unimplemented opcode, class=0x%X type=0x%X Opcode=-0x%X Op=%p", "Unimplemented opcode, class=0x%X type=0x%X Opcode=0x%X Op=%p",
op_class, op_type, op->common.aml_opcode, op_class, op_type, op->common.aml_opcode,
op)); op));
......
drivers/acpi/acpica/evevent.c
View file @ 0ad4991c
...@@ -257,6 +257,8 @@ u32 acpi_ev_fixed_event_detect(void) ...@@ -257,6 +257,8 @@ u32 acpi_ev_fixed_event_detect(void)
* *
* DESCRIPTION: Clears the status bit for the requested event, calls the * DESCRIPTION: Clears the status bit for the requested event, calls the
* handler that previously registered for the event. * handler that previously registered for the event.
* NOTE: If there is no handler for the event, the event is
* disabled to prevent further interrupts.
* *
******************************************************************************/ ******************************************************************************/
...@@ -271,17 +273,17 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event) ...@@ -271,17 +273,17 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
status_register_id, ACPI_CLEAR_STATUS); status_register_id, ACPI_CLEAR_STATUS);
/* /*
* Make sure we've got a handler. If not, report an error. The event is * Make sure that a handler exists. If not, report an error
* disabled to prevent further interrupts. * and disable the event to prevent further interrupts.
*/ */
if (NULL == acpi_gbl_fixed_event_handlers[event].handler) { if (!acpi_gbl_fixed_event_handlers[event].handler) {
(void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event]. (void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
enable_register_id, enable_register_id,
ACPI_DISABLE_EVENT); ACPI_DISABLE_EVENT);
ACPI_ERROR((AE_INFO, ACPI_ERROR((AE_INFO,
"No installed handler for fixed event [0x%08X]", "No installed handler for fixed event - %s (%u), disabling",
event)); acpi_ut_get_event_name(event), event));
return (ACPI_INTERRUPT_NOT_HANDLED); return (ACPI_INTERRUPT_NOT_HANDLED);
} }
......
drivers/acpi/acpica/evgpe.c
View file @ 0ad4991c
...@@ -707,7 +707,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, ...@@ -707,7 +707,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status, ACPI_EXCEPTION((AE_INFO, status,
"Unable to clear GPE%02X", gpe_number)); "Unable to clear GPE%02X", gpe_number));
return_VALUE(ACPI_INTERRUPT_NOT_HANDLED); return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
} }
} }
...@@ -724,7 +724,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, ...@@ -724,7 +724,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status, ACPI_EXCEPTION((AE_INFO, status,
"Unable to disable GPE%02X", gpe_number)); "Unable to disable GPE%02X", gpe_number));
return_VALUE(ACPI_INTERRUPT_NOT_HANDLED); return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
} }
/* /*
...@@ -784,7 +784,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, ...@@ -784,7 +784,7 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
break; break;
} }
return_VALUE(ACPI_INTERRUPT_HANDLED); return_UINT32(ACPI_INTERRUPT_HANDLED);
} }
#endif /* !ACPI_REDUCED_HARDWARE */ #endif /* !ACPI_REDUCED_HARDWARE */
drivers/acpi/acpica/evsci.c
View file @ 0ad4991c
...@@ -89,7 +89,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context) ...@@ -89,7 +89,7 @@ static u32 ACPI_SYSTEM_XFACE acpi_ev_sci_xrupt_handler(void *context)
*/ */
interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list); interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
return_VALUE(interrupt_handled); return_UINT32(interrupt_handled);
} }
/******************************************************************************* /*******************************************************************************
...@@ -120,7 +120,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context) ...@@ -120,7 +120,7 @@ u32 ACPI_SYSTEM_XFACE acpi_ev_gpe_xrupt_handler(void *context)
interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list); interrupt_handled |= acpi_ev_gpe_detect(gpe_xrupt_list);
return_VALUE(interrupt_handled); return_UINT32(interrupt_handled);
} }
/****************************************************************************** /******************************************************************************
......
drivers/acpi/acpica/evxface.c
View file @ 0ad4991c
...@@ -467,9 +467,9 @@ acpi_install_fixed_event_handler(u32 event, ...@@ -467,9 +467,9 @@ acpi_install_fixed_event_handler(u32 event,
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
/* Don't allow two handlers. */ /* Do not allow multiple handlers */
if (NULL != acpi_gbl_fixed_event_handlers[event].handler) { if (acpi_gbl_fixed_event_handlers[event].handler) {
status = AE_ALREADY_EXISTS; status = AE_ALREADY_EXISTS;
goto cleanup; goto cleanup;
} }
...@@ -483,8 +483,9 @@ acpi_install_fixed_event_handler(u32 event, ...@@ -483,8 +483,9 @@ acpi_install_fixed_event_handler(u32 event,
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
status = acpi_enable_event(event, 0); status = acpi_enable_event(event, 0);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_WARNING((AE_INFO, "Could not enable fixed event 0x%X", ACPI_WARNING((AE_INFO,
event)); "Could not enable fixed event - %s (%u)",
acpi_ut_get_event_name(event), event));
/* Remove the handler */ /* Remove the handler */
...@@ -492,7 +493,8 @@ acpi_install_fixed_event_handler(u32 event, ...@@ -492,7 +493,8 @@ acpi_install_fixed_event_handler(u32 event,
acpi_gbl_fixed_event_handlers[event].context = NULL; acpi_gbl_fixed_event_handlers[event].context = NULL;
} else { } else {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Enabled fixed event %X, Handler=%p\n", event, "Enabled fixed event %s (%X), Handler=%p\n",
acpi_ut_get_event_name(event), event,
handler)); handler));
} }
...@@ -544,11 +546,12 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler) ...@@ -544,11 +546,12 @@ acpi_remove_fixed_event_handler(u32 event, acpi_event_handler handler)
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_WARNING((AE_INFO, ACPI_WARNING((AE_INFO,
"Could not write to fixed event enable register 0x%X", "Could not disable fixed event - %s (%u)",
event)); acpi_ut_get_event_name(event), event));
} else { } else {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Disabled fixed event %X\n", ACPI_DEBUG_PRINT((ACPI_DB_INFO,
event)); "Disabled fixed event - %s (%X)\n",
acpi_ut_get_event_name(event), event));
} }
(void)acpi_ut_release_mutex(ACPI_MTX_EVENTS); (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
......
drivers/acpi/acpica/evxfevnt.c
View file @ 0ad4991c
...@@ -74,6 +74,12 @@ acpi_status acpi_enable(void) ...@@ -74,6 +74,12 @@ acpi_status acpi_enable(void)
return_ACPI_STATUS(AE_NO_ACPI_TABLES); return_ACPI_STATUS(AE_NO_ACPI_TABLES);
} }
/* If the Hardware Reduced flag is set, machine is always in acpi mode */
if (acpi_gbl_reduced_hardware) {
return_ACPI_STATUS(AE_OK);
}
/* Check current mode */ /* Check current mode */
if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) { if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
...@@ -126,6 +132,12 @@ acpi_status acpi_disable(void) ...@@ -126,6 +132,12 @@ acpi_status acpi_disable(void)
ACPI_FUNCTION_TRACE(acpi_disable); ACPI_FUNCTION_TRACE(acpi_disable);
/* If the Hardware Reduced flag is set, machine is always in acpi mode */
if (acpi_gbl_reduced_hardware) {
return_ACPI_STATUS(AE_OK);
}
if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) { if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) {
ACPI_DEBUG_PRINT((ACPI_DB_INIT, ACPI_DEBUG_PRINT((ACPI_DB_INIT,
"System is already in legacy (non-ACPI) mode\n")); "System is already in legacy (non-ACPI) mode\n"));
......
drivers/acpi/acpica/exoparg2.c
View file @ 0ad4991c
...@@ -257,7 +257,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -257,7 +257,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
union acpi_operand_object *return_desc = NULL; union acpi_operand_object *return_desc = NULL;
u64 index; u64 index;
acpi_status status = AE_OK; acpi_status status = AE_OK;
acpi_size length; acpi_size length = 0;
ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_1T_1R, ACPI_FUNCTION_TRACE_STR(ex_opcode_2A_1T_1R,
acpi_ps_get_opcode_name(walk_state->opcode)); acpi_ps_get_opcode_name(walk_state->opcode));
...@@ -320,7 +320,6 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -320,7 +320,6 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
* NOTE: A length of zero is ok, and will create a zero-length, null * NOTE: A length of zero is ok, and will create a zero-length, null
* terminated string. * terminated string.
*/ */
length = 0;
while ((length < operand[0]->buffer.length) && while ((length < operand[0]->buffer.length) &&
(length < operand[1]->integer.value) && (length < operand[1]->integer.value) &&
(operand[0]->buffer.pointer[length])) { (operand[0]->buffer.pointer[length])) {
...@@ -376,6 +375,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -376,6 +375,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
case ACPI_TYPE_STRING: case ACPI_TYPE_STRING:
if (index >= operand[0]->string.length) { if (index >= operand[0]->string.length) {
length = operand[0]->string.length;
status = AE_AML_STRING_LIMIT; status = AE_AML_STRING_LIMIT;
} }
...@@ -386,6 +386,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -386,6 +386,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
case ACPI_TYPE_BUFFER: case ACPI_TYPE_BUFFER:
if (index >= operand[0]->buffer.length) { if (index >= operand[0]->buffer.length) {
length = operand[0]->buffer.length;
status = AE_AML_BUFFER_LIMIT; status = AE_AML_BUFFER_LIMIT;
} }
...@@ -396,6 +397,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -396,6 +397,7 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
case ACPI_TYPE_PACKAGE: case ACPI_TYPE_PACKAGE:
if (index >= operand[0]->package.count) { if (index >= operand[0]->package.count) {
length = operand[0]->package.count;
status = AE_AML_PACKAGE_LIMIT; status = AE_AML_PACKAGE_LIMIT;
} }
...@@ -414,8 +416,9 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state) ...@@ -414,8 +416,9 @@ acpi_status acpi_ex_opcode_2A_1T_1R(struct acpi_walk_state *walk_state)
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ACPI_EXCEPTION((AE_INFO, status, ACPI_EXCEPTION((AE_INFO, status,
"Index (0x%8.8X%8.8X) is beyond end of object", "Index (0x%X%8.8X) is beyond end of object (length 0x%X)",
ACPI_FORMAT_UINT64(index))); ACPI_FORMAT_UINT64(index),
(u32)length));
goto cleanup; goto cleanup;
} }
......
drivers/acpi/acpica/exprep.c
View file @ 0ad4991c
...@@ -276,7 +276,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc, ...@@ -276,7 +276,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
/* Invalid field access type */ /* Invalid field access type */
ACPI_ERROR((AE_INFO, "Unknown field access type 0x%X", access)); ACPI_ERROR((AE_INFO, "Unknown field access type 0x%X", access));
return_VALUE(0); return_UINT32(0);
} }
if (obj_desc->common.type == ACPI_TYPE_BUFFER_FIELD) { if (obj_desc->common.type == ACPI_TYPE_BUFFER_FIELD) {
...@@ -289,7 +289,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc, ...@@ -289,7 +289,7 @@ acpi_ex_decode_field_access(union acpi_operand_object *obj_desc,
} }
*return_byte_alignment = byte_alignment; *return_byte_alignment = byte_alignment;
return_VALUE(bit_length); return_UINT32(bit_length);
} }
/******************************************************************************* /*******************************************************************************
......
drivers/acpi/acpica/exutils.c
View file @ 0ad4991c
...@@ -340,7 +340,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base) ...@@ -340,7 +340,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base)
/* u64 is unsigned, so we don't worry about a '-' prefix */ /* u64 is unsigned, so we don't worry about a '-' prefix */
if (value == 0) { if (value == 0) {
return_VALUE(1); return_UINT32(1);
} }
current_value = value; current_value = value;
...@@ -354,7 +354,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base) ...@@ -354,7 +354,7 @@ static u32 acpi_ex_digits_needed(u64 value, u32 base)
num_digits++; num_digits++;
} }
return_VALUE(num_digits); return_UINT32(num_digits);
} }
/******************************************************************************* /*******************************************************************************
......
drivers/acpi/acpica/hwacpi.c
View file @ 0ad4991c
...@@ -66,6 +66,12 @@ acpi_status acpi_hw_set_mode(u32 mode) ...@@ -66,6 +66,12 @@ acpi_status acpi_hw_set_mode(u32 mode)
ACPI_FUNCTION_TRACE(hw_set_mode); ACPI_FUNCTION_TRACE(hw_set_mode);
/* If the Hardware Reduced flag is set, machine is always in acpi mode */
if (acpi_gbl_reduced_hardware) {
return_ACPI_STATUS(AE_OK);
}
/* /*
* ACPI 2.0 clarified that if SMI_CMD in FADT is zero, * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
* system does not support mode transition. * system does not support mode transition.
...@@ -146,23 +152,29 @@ u32 acpi_hw_get_mode(void) ...@@ -146,23 +152,29 @@ u32 acpi_hw_get_mode(void)
ACPI_FUNCTION_TRACE(hw_get_mode); ACPI_FUNCTION_TRACE(hw_get_mode);
/* If the Hardware Reduced flag is set, machine is always in acpi mode */
if (acpi_gbl_reduced_hardware) {
return_UINT32(ACPI_SYS_MODE_ACPI);
}
/* /*
* ACPI 2.0 clarified that if SMI_CMD in FADT is zero, * ACPI 2.0 clarified that if SMI_CMD in FADT is zero,
* system does not support mode transition. * system does not support mode transition.
*/ */
if (!acpi_gbl_FADT.smi_command) { if (!acpi_gbl_FADT.smi_command) {
return_VALUE(ACPI_SYS_MODE_ACPI); return_UINT32(ACPI_SYS_MODE_ACPI);
} }
status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value); status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
return_VALUE(ACPI_SYS_MODE_LEGACY); return_UINT32(ACPI_SYS_MODE_LEGACY);
} }
if (value) { if (value) {
return_VALUE(ACPI_SYS_MODE_ACPI); return_UINT32(ACPI_SYS_MODE_ACPI);
} else { } else {
return_VALUE(ACPI_SYS_MODE_LEGACY); return_UINT32(ACPI_SYS_MODE_LEGACY);
} }
} }
......
drivers/acpi/acpica/nsconvert.c 0 → 100644
View file @ 0ad4991c
/******************************************************************************
*
* Module Name: nsconvert - Object conversions for objects returned by
* predefined methods
*
*****************************************************************************/
/*
* Copyright (C) 2000 - 2013, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions, and the following disclaimer,
* without modification.
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
* substantially similar to the "NO WARRANTY" disclaimer below
* ("Disclaimer") and any redistribution must be conditioned upon
* including a substantially similar Disclaimer requirement for further
* binary redistribution.
* 3. Neither the names of the above-listed copyright holders nor the names
* of any contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* Alternatively, this software may be distributed under the terms of the
* GNU General Public License ("GPL") version 2 as published by the Free
* Software Foundation.
*
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <acpi/acpi.h>
#include "accommon.h"
#include "acnamesp.h"
#include "acinterp.h"
#include "acpredef.h"
#include "amlresrc.h"
#define _COMPONENT ACPI_NAMESPACE
ACPI_MODULE_NAME("nsconvert")
/*******************************************************************************
*
* FUNCTION: acpi_ns_convert_to_integer
*
* 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 String/Buffer object to an Integer.
*
******************************************************************************/
acpi_status
acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
union acpi_operand_object **return_object)
{
union acpi_operand_object *new_object;
acpi_status status;
u64 value = 0;
u32 i;
switch (original_object->common.type) {
case ACPI_TYPE_STRING:
/* String-to-Integer conversion */
status = acpi_ut_strtoul64(original_object->string.pointer,
ACPI_ANY_BASE, &value);
if (ACPI_FAILURE(status)) {
return (status);
}
break;
case ACPI_TYPE_BUFFER:
/* Buffer-to-Integer conversion. Max buffer size is 64 bits. */
if (original_object->buffer.length > 8) {
return (AE_AML_OPERAND_TYPE);
}
/* Extract each buffer byte to create the integer */
for (i = 0; i < original_object->buffer.length; i++) {
value |=
((u64)original_object->buffer.
pointer[i] << (i * 8));
}
break;
default:
return (AE_AML_OPERAND_TYPE);
}
new_object = acpi_ut_create_integer_object(value);
if (!new_object) {
return (AE_NO_MEMORY);
}
*return_object = new_object;
return (AE_OK);
}
/*******************************************************************************
*
* FUNCTION: acpi_ns_convert_to_string
*
* 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 Integer/Buffer object to a String.
*
******************************************************************************/
acpi_status
acpi_ns_convert_to_string(union acpi_operand_object *original_object,
union acpi_operand_object **return_object)
{
union acpi_operand_object *new_object;
acpi_size length;
acpi_status status;
switch (original_object->common.type) {
case ACPI_TYPE_INTEGER:
/*
* Integer-to-String conversion. Commonly, convert
* an integer of value 0 to a NULL string. The last element of
* _BIF and _BIX packages occasionally need this fix.
*/
if (original_object->integer.value == 0) {
/* Allocate a new NULL string object */
new_object = acpi_ut_create_string_object(0);
if (!new_object) {
return (AE_NO_MEMORY);
}
} else {
status =
acpi_ex_convert_to_string(original_object,
&new_object,
ACPI_IMPLICIT_CONVERT_HEX);
if (ACPI_FAILURE(status)) {
return (status);
}
}
break;
case ACPI_TYPE_BUFFER:
/*
* Buffer-to-String conversion. Use a to_string
* conversion, no transform performed on the buffer data. The best
* example of this is the _BIF method, where the string data from
* the battery is often (incorrectly) returned as buffer object(s).
*/
length = 0;
while ((length < original_object->buffer.length) &&
(original_object->buffer.pointer[length])) {
length++;
}
/* Allocate a new string object */
new_object = acpi_ut_create_string_object(length);
if (!new_object) {
return (AE_NO_MEMORY);
}
/*
* Copy the raw buffer data with no transform. String is already NULL
* terminated at Length+1.
*/
ACPI_MEMCPY(new_object->string.pointer,
original_object->buffer.pointer, length);
break;
default:
return (AE_AML_OPERAND_TYPE);
}
*return_object = new_object;
return (AE_OK);
}
/*******************************************************************************
*
* FUNCTION: acpi_ns_convert_to_buffer
*
* 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 Integer/String/Package object to a Buffer.
*
******************************************************************************/
acpi_status
acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
union acpi_operand_object **return_object)
{
union acpi_operand_object *new_object;
acpi_status status;
union acpi_operand_object **elements;
u32 *dword_buffer;
u32 count;
u32 i;
switch (original_object->common.type) {
case ACPI_TYPE_INTEGER:
/*
* Integer-to-Buffer conversion.
* Convert the Integer to a packed-byte buffer. _MAT and other
* objects need this sometimes, if a read has been performed on a
* Field object that is less than or equal to the global integer
* size (32 or 64 bits).
*/
status =
acpi_ex_convert_to_buffer(original_object, &new_object);
if (ACPI_FAILURE(status)) {
return (status);
}
break;
case ACPI_TYPE_STRING:
/* String-to-Buffer conversion. Simple data copy */
new_object =
acpi_ut_create_buffer_object(original_object->string.
length);
if (!new_object) {
return (AE_NO_MEMORY);
}
ACPI_MEMCPY(new_object->buffer.pointer,
original_object->string.pointer,
original_object->string.length);
break;
case ACPI_TYPE_PACKAGE:
/*
* This case is often seen for predefined names that must return a
* Buffer object with multiple DWORD integers within. For example,
* _FDE and _GTM. The Package can be converted to a Buffer.
*/
/* All elements of the Package must be integers */
elements = original_object->package.elements;
count = original_object->package.count;
for (i = 0; i < count; i++) {
if ((!*elements) ||
((*elements)->common.type != ACPI_TYPE_INTEGER)) {
return (AE_AML_OPERAND_TYPE);
}
elements++;
}
/* Create the new buffer object to replace the Package */
new_object = acpi_ut_create_buffer_object(ACPI_MUL_4(count));
if (!new_object) {
return (AE_NO_MEMORY);
}
/* Copy the package elements (integers) to the buffer as DWORDs */
elements = original_object->package.elements;
dword_buffer = ACPI_CAST_PTR(u32, new_object->buffer.pointer);
for (i = 0; i < count; i++) {
*dword_buffer = (u32)(*elements)->integer.value;
dword_buffer++;
elements++;
}
break;
default:
return (AE_AML_OPERAND_TYPE);
}
*return_object = new_object;
return (AE_OK);
}
/*******************************************************************************
*
* FUNCTION: acpi_ns_convert_to_unicode
*
* PARAMETERS: original_object - ASCII String 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 String object to a Unicode string Buffer.
*
******************************************************************************/
acpi_status
acpi_ns_convert_to_unicode(union acpi_operand_object *original_object,
union acpi_operand_object **return_object)
{
union acpi_operand_object *new_object;
char *ascii_string;
u16 *unicode_buffer;
u32 unicode_length;
u32 i;
if (!original_object) {
return (AE_OK);
}
/* If a Buffer was returned, it must be at least two bytes long */
if (original_object->common.type == ACPI_TYPE_BUFFER) {
if (original_object->buffer.length < 2) {
return (AE_AML_OPERAND_VALUE);
}
*return_object = NULL;
return (AE_OK);
}
/*
* The original object is an ASCII string. Convert this string to
* a unicode buffer.
*/
ascii_string = original_object->string.pointer;
unicode_length = (original_object->string.length * 2) + 2;
/* Create a new buffer object for the Unicode data */
new_object = acpi_ut_create_buffer_object(unicode_length);
if (!new_object) {
return (AE_NO_MEMORY);
}
unicode_buffer = ACPI_CAST_PTR(u16, new_object->buffer.pointer);
/* Convert ASCII to Unicode */
for (i = 0; i < original_object->string.length; i++) {
unicode_buffer[i] = (u16)ascii_string[i];
}
*return_object = new_object;
return (AE_OK);
}
/*******************************************************************************
*
* FUNCTION: acpi_ns_convert_to_resource
*
* 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 Integer object to a resource_template
* Buffer.
*
******************************************************************************/
acpi_status
acpi_ns_convert_to_resource(union acpi_operand_object *original_object,
union acpi_operand_object **return_object)
{
union acpi_operand_object *new_object;
u8 *buffer;
/*
* We can fix the following cases for an expected resource template:
* 1. No return value (interpreter slack mode is disabled)
* 2. A "Return (Zero)" statement
* 3. A "Return empty buffer" statement
*
* We will return a buffer containing a single end_tag
* resource descriptor.
*/
if (original_object) {
switch (original_object->common.type) {
case ACPI_TYPE_INTEGER:
/* We can only repair an Integer==0 */
if (original_object->integer.value) {
return (AE_AML_OPERAND_TYPE);
}
break;
case ACPI_TYPE_BUFFER:
if (original_object->buffer.length) {
/* Additional checks can be added in the future */
*return_object = NULL;
return (AE_OK);
}
break;
case ACPI_TYPE_STRING:
default:
return (AE_AML_OPERAND_TYPE);
}
}
/* Create the new buffer object for the resource descriptor */
new_object = acpi_ut_create_buffer_object(2);
if (!new_object) {
return (AE_NO_MEMORY);
}
buffer = ACPI_CAST_PTR(u8, new_object->buffer.pointer);
/* Initialize the Buffer with a single end_tag descriptor */
buffer[0] = (ACPI_RESOURCE_NAME_END_TAG | ASL_RDESC_END_TAG_SIZE);
buffer[1] = 0x00;
*return_object = new_object;
return (AE_OK);
}
drivers/acpi/acpica/nseval.c
View file @ 0ad4991c
...@@ -98,18 +98,22 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info) ...@@ -98,18 +98,22 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info)
info->return_object = NULL; info->return_object = NULL;
info->param_count = 0; info->param_count = 0;
if (!info->resolved_node) {
/* /*
* Get the actual namespace node for the target object. Handles these cases: * Get the actual namespace node for the target object if we need to.
* Handles these cases:
* *
* 1) Null node, Pathname (absolute path) * 1) Null node, Pathname (absolute path)
* 2) Node, Pathname (path relative to Node) * 2) Node, Pathname (path relative to Node)
* 3) Node, Null Pathname * 3) Node, Null Pathname
*/ */
status = acpi_ns_get_node(info->prefix_node, info->pathname, status = acpi_ns_get_node(info->prefix_node, info->pathname,
ACPI_NS_NO_UPSEARCH, &info->resolved_node); ACPI_NS_NO_UPSEARCH,
&info->resolved_node);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
}
/* /*
* For a method alias, we must grab the actual method node so that proper * For a method alias, we must grab the actual method node so that proper
......
drivers/acpi/acpica/nspredef.c
View file @ 0ad4991c
...@@ -76,19 +76,7 @@ static acpi_status ...@@ -76,19 +76,7 @@ static acpi_status
acpi_ns_check_reference(struct acpi_predefined_data *data, acpi_ns_check_reference(struct acpi_predefined_data *data,
union acpi_operand_object *return_object); union acpi_operand_object *return_object);
static void acpi_ns_get_expected_types(char *buffer, u32 expected_btypes); static u32 acpi_ns_get_bitmapped_type(union acpi_operand_object *return_object);
/*
* Names for the types that can be returned by the predefined objects.
* Used for warning messages. Must be in the same order as the ACPI_RTYPEs
*/
static const char *acpi_rtype_names[] = {
"/Integer",
"/String",
"/Buffer",
"/Package",
"/Reference",
};
/******************************************************************************* /*******************************************************************************
* *
...@@ -112,7 +100,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, ...@@ -112,7 +100,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
acpi_status return_status, acpi_status return_status,
union acpi_operand_object **return_object_ptr) union acpi_operand_object **return_object_ptr)
{ {
union acpi_operand_object *return_object = *return_object_ptr;
acpi_status status = AE_OK; acpi_status status = AE_OK;
const union acpi_predefined_info *predefined; const union acpi_predefined_info *predefined;
char *pathname; char *pathname;
...@@ -120,7 +107,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, ...@@ -120,7 +107,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
/* Match the name for this method/object against the predefined list */ /* Match the name for this method/object against the predefined list */
predefined = acpi_ns_check_for_predefined_name(node); predefined = acpi_ut_match_predefined_method(node->name.ascii);
/* Get the full pathname to the object, for use in warning messages */ /* Get the full pathname to the object, for use in warning messages */
...@@ -151,25 +138,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node, ...@@ -151,25 +138,6 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
goto cleanup; goto cleanup;
} }
/*
* If there is no return value, check if we require a return value for
* this predefined name. Either one return value is expected, or none,
* for both methods and other objects.
*
* Exit now if there is no return object. Warning if one was expected.
*/
if (!return_object) {
if ((predefined->info.expected_btypes) &&
(!(predefined->info.expected_btypes & ACPI_RTYPE_NONE))) {
ACPI_WARN_PREDEFINED((AE_INFO, pathname,
ACPI_WARN_ALWAYS,
"Missing expected return value"));
status = AE_AML_NO_RETURN_VALUE;
}
goto cleanup;
}
/* /*
* Return value validation and possible repair. * Return value validation and possible repair.
* *
...@@ -310,8 +278,10 @@ acpi_ns_check_parameter_count(char *pathname, ...@@ -310,8 +278,10 @@ acpi_ns_check_parameter_count(char *pathname,
* Validate the user-supplied parameter count. * Validate the user-supplied parameter count.
* Allow two different legal argument counts (_SCP, etc.) * Allow two different legal argument counts (_SCP, etc.)
*/ */
required_params_current = predefined->info.param_count & 0x0F; required_params_current =
required_params_old = predefined->info.param_count >> 4; predefined->info.argument_list & METHOD_ARG_MASK;
required_params_old =
predefined->info.argument_list >> METHOD_ARG_BIT_WIDTH;
if (user_param_count != ACPI_UINT32_MAX) { if (user_param_count != ACPI_UINT32_MAX) {
if ((user_param_count != required_params_current) && if ((user_param_count != required_params_current) &&
...@@ -338,52 +308,6 @@ acpi_ns_check_parameter_count(char *pathname, ...@@ -338,52 +308,6 @@ acpi_ns_check_parameter_count(char *pathname,
} }
} }
/*******************************************************************************
*
* FUNCTION: acpi_ns_check_for_predefined_name
*
* PARAMETERS: node - Namespace node for the method/object
*
* RETURN: Pointer to entry in predefined table. NULL indicates not found.
*
* DESCRIPTION: Check an object name against the predefined object list.
*
******************************************************************************/
const union acpi_predefined_info *acpi_ns_check_for_predefined_name(struct
acpi_namespace_node
*node)
{
const union acpi_predefined_info *this_name;
/* Quick check for a predefined name, first character must be underscore */
if (node->name.ascii[0] != '_') {
return (NULL);
}
/* Search info table for a predefined method/object name */
this_name = predefined_names;
while (this_name->info.name[0]) {
if (ACPI_COMPARE_NAME(node->name.ascii, this_name->info.name)) {
return (this_name);
}
/*
* Skip next entry in the table if this name returns a Package
* (next entry contains the package info)
*/
if (this_name->info.expected_btypes & ACPI_RTYPE_PACKAGE) {
this_name++;
}
this_name++;
}
return (NULL); /* Not found */
}
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_ns_check_object_type * FUNCTION: acpi_ns_check_object_type
...@@ -410,28 +334,12 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data, ...@@ -410,28 +334,12 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
{ {
union acpi_operand_object *return_object = *return_object_ptr; union acpi_operand_object *return_object = *return_object_ptr;
acpi_status status = AE_OK; acpi_status status = AE_OK;
u32 return_btype;
char type_buffer[48]; /* Room for 5 types */ char type_buffer[48]; /* Room for 5 types */
/*
* If we get a NULL return_object here, it is a NULL package element.
* Since all extraneous NULL package elements were removed earlier by a
* call to acpi_ns_remove_null_elements, this is an unexpected NULL element.
* We will attempt to repair it.
*/
if (!return_object) {
status = acpi_ns_repair_null_element(data, expected_btypes,
package_index,
return_object_ptr);
if (ACPI_SUCCESS(status)) {
return (AE_OK); /* Repair was successful */
}
goto type_error_exit;
}
/* A Namespace node should not get here, but make sure */ /* A Namespace node should not get here, but make sure */
if (ACPI_GET_DESCRIPTOR_TYPE(return_object) == ACPI_DESC_TYPE_NAMED) { if (return_object &&
ACPI_GET_DESCRIPTOR_TYPE(return_object) == ACPI_DESC_TYPE_NAMED) {
ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags, ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
"Invalid return type - Found a Namespace node [%4.4s] type %s", "Invalid return type - Found a Namespace node [%4.4s] type %s",
return_object->node.name.ascii, return_object->node.name.ascii,
...@@ -448,59 +356,31 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data, ...@@ -448,59 +356,31 @@ acpi_ns_check_object_type(struct acpi_predefined_data *data,
* from all of the predefined names (including elements of returned * from all of the predefined names (including elements of returned
* packages) * packages)
*/ */
switch (return_object->common.type) { data->return_btype = acpi_ns_get_bitmapped_type(return_object);
case ACPI_TYPE_INTEGER: if (data->return_btype == ACPI_RTYPE_ANY) {
return_btype = ACPI_RTYPE_INTEGER;
break;
case ACPI_TYPE_BUFFER:
return_btype = ACPI_RTYPE_BUFFER;
break;
case ACPI_TYPE_STRING:
return_btype = ACPI_RTYPE_STRING;
break;
case ACPI_TYPE_PACKAGE:
return_btype = ACPI_RTYPE_PACKAGE;
break;
case ACPI_TYPE_LOCAL_REFERENCE:
return_btype = ACPI_RTYPE_REFERENCE;
break;
default:
/* Not one of the supported objects, must be incorrect */ /* Not one of the supported objects, must be incorrect */
goto type_error_exit; goto type_error_exit;
} }
/* Is the object one of the expected types? */
if (return_btype & expected_btypes) {
/* For reference objects, check that the reference type is correct */ /* For reference objects, check that the reference type is correct */
if (return_object->common.type == ACPI_TYPE_LOCAL_REFERENCE) { if ((data->return_btype & expected_btypes) == ACPI_RTYPE_REFERENCE) {
status = acpi_ns_check_reference(data, return_object); status = acpi_ns_check_reference(data, return_object);
}
return (status); return (status);
} }
/* Type mismatch -- attempt repair of the returned object */ /* Attempt simple repair of the returned object if necessary */
status = acpi_ns_repair_object(data, expected_btypes, status = acpi_ns_simple_repair(data, expected_btypes,
package_index, return_object_ptr); package_index, return_object_ptr);
if (ACPI_SUCCESS(status)) { return (status);
return (AE_OK); /* Repair was successful */
}
type_error_exit: type_error_exit:
/* Create a string with all expected types for this predefined object */ /* Create a string with all expected types for this predefined object */
acpi_ns_get_expected_types(type_buffer, expected_btypes); acpi_ut_get_expected_return_types(type_buffer, expected_btypes);
if (package_index == ACPI_NOT_PACKAGE_ELEMENT) { if (package_index == ACPI_NOT_PACKAGE_ELEMENT) {
ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags, ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
...@@ -558,36 +438,55 @@ acpi_ns_check_reference(struct acpi_predefined_data *data, ...@@ -558,36 +438,55 @@ acpi_ns_check_reference(struct acpi_predefined_data *data,
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_ns_get_expected_types * FUNCTION: acpi_ns_get_bitmapped_type
* *
* PARAMETERS: buffer - Pointer to where the string is returned * PARAMETERS: return_object - Object returned from method/obj evaluation
* expected_btypes - Bitmap of expected return type(s)
* *
* RETURN: Buffer is populated with type names. * RETURN: Object return type. ACPI_RTYPE_ANY indicates that the object
* type is not supported. ACPI_RTYPE_NONE indicates that no
* object was returned (return_object is NULL).
* *
* DESCRIPTION: Translate the expected types bitmap into a string of ascii * DESCRIPTION: Convert object type into a bitmapped object return type.
* names of expected types, for use in warning messages.
* *
******************************************************************************/ ******************************************************************************/
static void acpi_ns_get_expected_types(char *buffer, u32 expected_btypes) static u32 acpi_ns_get_bitmapped_type(union acpi_operand_object *return_object)
{ {
u32 this_rtype; u32 return_btype;
u32 i;
u32 j;
j = 1; if (!return_object) {
buffer[0] = 0; return (ACPI_RTYPE_NONE);
this_rtype = ACPI_RTYPE_INTEGER; }
for (i = 0; i < ACPI_NUM_RTYPES; i++) { /* Map acpi_object_type to internal bitmapped type */
/* If one of the expected types, concatenate the name of this type */ switch (return_object->common.type) {
case ACPI_TYPE_INTEGER:
return_btype = ACPI_RTYPE_INTEGER;
break;
if (expected_btypes & this_rtype) { case ACPI_TYPE_BUFFER:
ACPI_STRCAT(buffer, &acpi_rtype_names[i][j]); return_btype = ACPI_RTYPE_BUFFER;
j = 0; /* Use name separator from now on */ break;
}
this_rtype <<= 1; /* Next Rtype */ case ACPI_TYPE_STRING:
return_btype = ACPI_RTYPE_STRING;
break;
case ACPI_TYPE_PACKAGE:
return_btype = ACPI_RTYPE_PACKAGE;
break;
case ACPI_TYPE_LOCAL_REFERENCE:
return_btype = ACPI_RTYPE_REFERENCE;
break;
default:
/* Not one of the supported objects, must be incorrect */
return_btype = ACPI_RTYPE_ANY;
break;
} }
return (return_btype);
} }
drivers/acpi/acpica/nsprepkg.c
View file @ 0ad4991c
...@@ -112,9 +112,15 @@ acpi_ns_check_package(struct acpi_predefined_data *data, ...@@ -112,9 +112,15 @@ acpi_ns_check_package(struct acpi_predefined_data *data,
elements = return_object->package.elements; elements = return_object->package.elements;
count = return_object->package.count; count = return_object->package.count;
/* The package must have at least one element, else invalid */ /*
* Most packages must have at least one element. The only exception
* is the variable-length package (ACPI_PTYPE1_VAR).
*/
if (!count) { if (!count) {
if (package->ret_info.type == ACPI_PTYPE1_VAR) {
return (AE_OK);
}
ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags, ACPI_WARN_PREDEFINED((AE_INFO, data->pathname, data->node_flags,
"Return Package has no elements (empty)")); "Return Package has no elements (empty)"));
......
drivers/acpi/acpica/nsrepair.c
View file @ 0ad4991c
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "acnamesp.h" #include "acnamesp.h"
#include "acinterp.h" #include "acinterp.h"
#include "acpredef.h" #include "acpredef.h"
#include "amlresrc.h"
#define _COMPONENT ACPI_NAMESPACE #define _COMPONENT ACPI_NAMESPACE
ACPI_MODULE_NAME("nsrepair") ACPI_MODULE_NAME("nsrepair")
...@@ -71,6 +72,11 @@ ACPI_MODULE_NAME("nsrepair") ...@@ -71,6 +72,11 @@ ACPI_MODULE_NAME("nsrepair")
* Buffer -> String * Buffer -> String
* Buffer -> Package of Integers * Buffer -> Package of Integers
* Package -> Package of one Package * Package -> Package of one Package
*
* Additional conversions that are available:
* Convert a null return or zero return value to an end_tag descriptor
* Convert an ASCII string to a Unicode buffer
*
* An incorrect standalone object is wrapped with required outer package * An incorrect standalone object is wrapped with required outer package
* *
* Additional possible repairs: * Additional possible repairs:
...@@ -78,21 +84,51 @@ ACPI_MODULE_NAME("nsrepair") ...@@ -78,21 +84,51 @@ ACPI_MODULE_NAME("nsrepair")
* *
******************************************************************************/ ******************************************************************************/
/* Local prototypes */ /* Local prototypes */
static acpi_status static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct
acpi_ns_convert_to_integer(union acpi_operand_object *original_object, acpi_namespace_node
union acpi_operand_object **return_object); *node,
u32
static acpi_status return_btype,
acpi_ns_convert_to_string(union acpi_operand_object *original_object, u32
union acpi_operand_object **return_object); package_index);
static acpi_status /*
acpi_ns_convert_to_buffer(union acpi_operand_object *original_object, * Special but simple repairs for some names.
union acpi_operand_object **return_object); *
* 2nd argument: Unexpected types that can be repaired
*/
static const struct acpi_simple_repair_info acpi_object_repair_info[] = {
/* Resource descriptor conversions */
{"_CRS",
ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER |
ACPI_RTYPE_NONE,
ACPI_NOT_PACKAGE_ELEMENT,
acpi_ns_convert_to_resource},
{"_DMA",
ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER |
ACPI_RTYPE_NONE,
ACPI_NOT_PACKAGE_ELEMENT,
acpi_ns_convert_to_resource},
{"_PRS",
ACPI_RTYPE_INTEGER | ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER |
ACPI_RTYPE_NONE,
ACPI_NOT_PACKAGE_ELEMENT,
acpi_ns_convert_to_resource},
/* Unicode conversions */
{"_MLS", ACPI_RTYPE_STRING, 1,
acpi_ns_convert_to_unicode},
{"_STR", ACPI_RTYPE_STRING | ACPI_RTYPE_BUFFER,
ACPI_NOT_PACKAGE_ELEMENT,
acpi_ns_convert_to_unicode},
{{0, 0, 0, 0}, 0, 0, NULL} /* Table terminator */
};
/******************************************************************************* /*******************************************************************************
* *
* FUNCTION: acpi_ns_repair_object * FUNCTION: acpi_ns_simple_repair
* *
* PARAMETERS: data - Pointer to validation data structure * PARAMETERS: data - Pointer to validation data structure
* expected_btypes - Object types expected * expected_btypes - Object types expected
...@@ -110,16 +146,54 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object, ...@@ -110,16 +146,54 @@ acpi_ns_convert_to_buffer(union acpi_operand_object *original_object,
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status
acpi_ns_repair_object(struct acpi_predefined_data *data, acpi_ns_simple_repair(struct acpi_predefined_data *data,
u32 expected_btypes, u32 expected_btypes,
u32 package_index, u32 package_index,
union acpi_operand_object **return_object_ptr) union acpi_operand_object **return_object_ptr)
{ {
union acpi_operand_object *return_object = *return_object_ptr; union acpi_operand_object *return_object = *return_object_ptr;
union acpi_operand_object *new_object; union acpi_operand_object *new_object = NULL;
acpi_status status; acpi_status status;
const struct acpi_simple_repair_info *predefined;
ACPI_FUNCTION_NAME(ns_simple_repair);
/*
* Special repairs for certain names that are in the repair table.
* Check if this name is in the list of repairable names.
*/
predefined = acpi_ns_match_simple_repair(data->node,
data->return_btype,
package_index);
if (predefined) {
if (!return_object) {
ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
ACPI_WARN_ALWAYS,
"Missing expected return value"));
}
status =
predefined->object_converter(return_object, &new_object);
if (ACPI_FAILURE(status)) {
/* A fatal error occurred during a conversion */
ACPI_EXCEPTION((AE_INFO, status,
"During return object analysis"));
return (status);
}
if (new_object) {
goto object_repaired;
}
}
ACPI_FUNCTION_NAME(ns_repair_object); /*
* Do not perform simple object repair unless the return type is not
* expected.
*/
if (data->return_btype & expected_btypes) {
return (AE_OK);
}
/* /*
* At this point, we know that the type of the returned object was not * At this point, we know that the type of the returned object was not
...@@ -127,6 +201,24 @@ acpi_ns_repair_object(struct acpi_predefined_data *data, ...@@ -127,6 +201,24 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
* repair the object by converting it to one of the expected object * repair the object by converting it to one of the expected object
* types for this predefined name. * types for this predefined name.
*/ */
/*
* If there is no return value, check if we require a return value for
* this predefined name. Either one return value is expected, or none,
* for both methods and other objects.
*
* Exit now if there is no return object. Warning if one was expected.
*/
if (!return_object) {
if (expected_btypes && (!(expected_btypes & ACPI_RTYPE_NONE))) {
ACPI_WARN_PREDEFINED((AE_INFO, data->pathname,
ACPI_WARN_ALWAYS,
"Missing expected return value"));
return (AE_AML_NO_RETURN_VALUE);
}
}
if (expected_btypes & ACPI_RTYPE_INTEGER) { if (expected_btypes & ACPI_RTYPE_INTEGER) {
status = acpi_ns_convert_to_integer(return_object, &new_object); status = acpi_ns_convert_to_integer(return_object, &new_object);
if (ACPI_SUCCESS(status)) { if (ACPI_SUCCESS(status)) {
...@@ -216,254 +308,51 @@ acpi_ns_repair_object(struct acpi_predefined_data *data, ...@@ -216,254 +308,51 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
return (AE_OK); return (AE_OK);
} }
/******************************************************************************* /******************************************************************************
*
* FUNCTION: acpi_ns_convert_to_integer
*
* 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 String/Buffer object to an Integer.
*
******************************************************************************/
static acpi_status
acpi_ns_convert_to_integer(union acpi_operand_object *original_object,
union acpi_operand_object **return_object)
{
union acpi_operand_object *new_object;
acpi_status status;
u64 value = 0;
u32 i;
switch (original_object->common.type) {
case ACPI_TYPE_STRING:
/* String-to-Integer conversion */
status = acpi_ut_strtoul64(original_object->string.pointer,
ACPI_ANY_BASE, &value);
if (ACPI_FAILURE(status)) {
return (status);
}
break;
case ACPI_TYPE_BUFFER:
/* Buffer-to-Integer conversion. Max buffer size is 64 bits. */
if (original_object->buffer.length > 8) {
return (AE_AML_OPERAND_TYPE);
}
/* Extract each buffer byte to create the integer */
for (i = 0; i < original_object->buffer.length; i++) {
value |=
((u64) original_object->buffer.
pointer[i] << (i * 8));
}
break;
default:
return (AE_AML_OPERAND_TYPE);
}
new_object = acpi_ut_create_integer_object(value);
if (!new_object) {
return (AE_NO_MEMORY);
}
*return_object = new_object;
return (AE_OK);
}
/*******************************************************************************
*
* FUNCTION: acpi_ns_convert_to_string
*
* 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 Integer/Buffer object to a String.
*
******************************************************************************/
static acpi_status
acpi_ns_convert_to_string(union acpi_operand_object *original_object,
union acpi_operand_object **return_object)
{
union acpi_operand_object *new_object;
acpi_size length;
acpi_status status;
switch (original_object->common.type) {
case ACPI_TYPE_INTEGER:
/*
* Integer-to-String conversion. Commonly, convert
* an integer of value 0 to a NULL string. The last element of
* _BIF and _BIX packages occasionally need this fix.
*/
if (original_object->integer.value == 0) {
/* Allocate a new NULL string object */
new_object = acpi_ut_create_string_object(0);
if (!new_object) {
return (AE_NO_MEMORY);
}
} else {
status =
acpi_ex_convert_to_string(original_object,
&new_object,
ACPI_IMPLICIT_CONVERT_HEX);
if (ACPI_FAILURE(status)) {
return (status);
}
}
break;
case ACPI_TYPE_BUFFER:
/*
* Buffer-to-String conversion. Use a to_string
* conversion, no transform performed on the buffer data. The best
* example of this is the _BIF method, where the string data from
* the battery is often (incorrectly) returned as buffer object(s).
*/
length = 0;
while ((length < original_object->buffer.length) &&
(original_object->buffer.pointer[length])) {
length++;
}
/* Allocate a new string object */
new_object = acpi_ut_create_string_object(length);
if (!new_object) {
return (AE_NO_MEMORY);
}
/*
* Copy the raw buffer data with no transform. String is already NULL
* terminated at Length+1.
*/
ACPI_MEMCPY(new_object->string.pointer,
original_object->buffer.pointer, length);
break;
default:
return (AE_AML_OPERAND_TYPE);
}
*return_object = new_object;
return (AE_OK);
}
/*******************************************************************************
* *
* FUNCTION: acpi_ns_convert_to_buffer * FUNCTION: acpi_ns_match_simple_repair
* *
* PARAMETERS: original_object - Object to be converted * PARAMETERS: node - Namespace node for the method/object
* return_object - Where the new converted object is returned * return_btype - Object type that was returned
* package_index - Index of object within parent package (if
* applicable - ACPI_NOT_PACKAGE_ELEMENT
* otherwise)
* *
* RETURN: Status. AE_OK if conversion was successful. * RETURN: Pointer to entry in repair table. NULL indicates not found.
* *
* DESCRIPTION: Attempt to convert a Integer/String/Package object to a Buffer. * DESCRIPTION: Check an object name against the repairable object list.
* *
******************************************************************************/ *****************************************************************************/
static acpi_status static const struct acpi_simple_repair_info *acpi_ns_match_simple_repair(struct
acpi_ns_convert_to_buffer(union acpi_operand_object *original_object, acpi_namespace_node
union acpi_operand_object **return_object) *node,
u32
return_btype,
u32
package_index)
{ {
union acpi_operand_object *new_object; const struct acpi_simple_repair_info *this_name;
acpi_status status;
union acpi_operand_object **elements;
u32 *dword_buffer;
u32 count;
u32 i;
switch (original_object->common.type) { /* Search info table for a repairable predefined method/object name */
case ACPI_TYPE_INTEGER:
/*
* Integer-to-Buffer conversion.
* Convert the Integer to a packed-byte buffer. _MAT and other
* objects need this sometimes, if a read has been performed on a
* Field object that is less than or equal to the global integer
* size (32 or 64 bits).
*/
status =
acpi_ex_convert_to_buffer(original_object, &new_object);
if (ACPI_FAILURE(status)) {
return (status);
}
break;
case ACPI_TYPE_STRING: this_name = acpi_object_repair_info;
while (this_name->object_converter) {
if (ACPI_COMPARE_NAME(node->name.ascii, this_name->name)) {
/* String-to-Buffer conversion. Simple data copy */ /* Check if we can actually repair this name/type combination */
new_object = if ((return_btype & this_name->unexpected_btypes) &&
acpi_ut_create_buffer_object(original_object->string. (package_index == this_name->package_index)) {
length); return (this_name);
if (!new_object) {
return (AE_NO_MEMORY);
} }
ACPI_MEMCPY(new_object->buffer.pointer, return (NULL);
original_object->string.pointer,
original_object->string.length);
break;
case ACPI_TYPE_PACKAGE:
/*
* This case is often seen for predefined names that must return a
* Buffer object with multiple DWORD integers within. For example,
* _FDE and _GTM. The Package can be converted to a Buffer.
*/
/* All elements of the Package must be integers */
elements = original_object->package.elements;
count = original_object->package.count;
for (i = 0; i < count; i++) {
if ((!*elements) ||
((*elements)->common.type != ACPI_TYPE_INTEGER)) {
return (AE_AML_OPERAND_TYPE);
}
elements++;
}
/* Create the new buffer object to replace the Package */
new_object = acpi_ut_create_buffer_object(ACPI_MUL_4(count));
if (!new_object) {
return (AE_NO_MEMORY);
} }
this_name++;
/* Copy the package elements (integers) to the buffer as DWORDs */
elements = original_object->package.elements;
dword_buffer = ACPI_CAST_PTR(u32, new_object->buffer.pointer);
for (i = 0; i < count; i++) {
*dword_buffer = (u32) (*elements)->integer.value;
dword_buffer++;
elements++;
}
break;
default:
return (AE_AML_OPERAND_TYPE);
} }
*return_object = new_object; return (NULL); /* Name was not found in the repair table */
return (AE_OK);
} }
/******************************************************************************* /*******************************************************************************
......
drivers/acpi/acpica/nsrepair2.c
View file @ 0ad4991c
...@@ -66,7 +66,7 @@ typedef struct acpi_repair_info { ...@@ -66,7 +66,7 @@ typedef struct acpi_repair_info {
/* Local prototypes */ /* Local prototypes */
static const struct acpi_repair_info *acpi_ns_match_repairable_name(struct static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
acpi_namespace_node acpi_namespace_node
*node); *node);
...@@ -175,7 +175,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data, ...@@ -175,7 +175,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
/* Check if this name is in the list of repairable names */ /* Check if this name is in the list of repairable names */
predefined = acpi_ns_match_repairable_name(node); predefined = acpi_ns_match_complex_repair(node);
if (!predefined) { if (!predefined) {
return (validate_status); return (validate_status);
} }
...@@ -186,7 +186,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data, ...@@ -186,7 +186,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
/****************************************************************************** /******************************************************************************
* *
* FUNCTION: acpi_ns_match_repairable_name * FUNCTION: acpi_ns_match_complex_repair
* *
* PARAMETERS: node - Namespace node for the method/object * PARAMETERS: node - Namespace node for the method/object
* *
...@@ -196,7 +196,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data, ...@@ -196,7 +196,7 @@ acpi_ns_complex_repairs(struct acpi_predefined_data *data,
* *
*****************************************************************************/ *****************************************************************************/
static const struct acpi_repair_info *acpi_ns_match_repairable_name(struct static const struct acpi_repair_info *acpi_ns_match_complex_repair(struct
acpi_namespace_node acpi_namespace_node
*node) *node)
{ {
......
drivers/acpi/acpica/nsutils.c
View file @ 0ad4991c
...@@ -112,10 +112,10 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node) ...@@ -112,10 +112,10 @@ acpi_object_type acpi_ns_get_type(struct acpi_namespace_node * node)
if (!node) { if (!node) {
ACPI_WARNING((AE_INFO, "Null Node parameter")); ACPI_WARNING((AE_INFO, "Null Node parameter"));
return_VALUE(ACPI_TYPE_ANY); return_UINT8(ACPI_TYPE_ANY);
} }
return_VALUE(node->type); return_UINT8(node->type);
} }
/******************************************************************************* /*******************************************************************************
...@@ -140,10 +140,10 @@ u32 acpi_ns_local(acpi_object_type type) ...@@ -140,10 +140,10 @@ u32 acpi_ns_local(acpi_object_type type)
/* Type code out of range */ /* Type code out of range */
ACPI_WARNING((AE_INFO, "Invalid Object Type 0x%X", type)); ACPI_WARNING((AE_INFO, "Invalid Object Type 0x%X", type));
return_VALUE(ACPI_NS_NORMAL); return_UINT32(ACPI_NS_NORMAL);
} }
return_VALUE(acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL); return_UINT32(acpi_gbl_ns_properties[type] & ACPI_NS_LOCAL);
} }
/******************************************************************************* /*******************************************************************************
......
drivers/acpi/acpica/psargs.c
View file @ 0ad4991c
...@@ -108,7 +108,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state) ...@@ -108,7 +108,7 @@ acpi_ps_get_next_package_length(struct acpi_parse_state *parser_state)
/* Byte 0 is a special case, either bits [0:3] or [0:5] are used */ /* Byte 0 is a special case, either bits [0:3] or [0:5] are used */
package_length |= (aml[0] & byte_zero_mask); package_length |= (aml[0] & byte_zero_mask);
return_VALUE(package_length); return_UINT32(package_length);
} }
/******************************************************************************* /*******************************************************************************
......
drivers/acpi/acpica/rscalc.c
View file @ 0ad4991c
...@@ -202,6 +202,12 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed) ...@@ -202,6 +202,12 @@ acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE); return_ACPI_STATUS(AE_AML_INVALID_RESOURCE_TYPE);
} }
/* Sanity check the length. It must not be zero, or we loop forever */
if (!resource->length) {
return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
}
/* Get the base size of the (external stream) resource descriptor */ /* Get the base size of the (external stream) resource descriptor */
total_size = acpi_gbl_aml_resource_sizes[resource->type]; total_size = acpi_gbl_aml_resource_sizes[resource->type];
......
drivers/acpi/acpica/rsdump.c
View file @ 0ad4991c
...@@ -385,6 +385,14 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list) ...@@ -385,6 +385,14 @@ void acpi_rs_dump_resource_list(struct acpi_resource *resource_list)
return; return;
} }
/* Sanity check the length. It must not be zero, or we loop forever */
if (!resource_list->length) {
acpi_os_printf
("Invalid zero length descriptor in resource list\n");
return;
}
/* Dump the resource descriptor */ /* Dump the resource descriptor */
if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) { if (type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
......
drivers/acpi/acpica/rslist.c
View file @ 0ad4991c
...@@ -178,6 +178,14 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource, ...@@ -178,6 +178,14 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource,
return_ACPI_STATUS(AE_BAD_DATA); return_ACPI_STATUS(AE_BAD_DATA);
} }
/* Sanity check the length. It must not be zero, or we loop forever */
if (!resource->length) {
ACPI_ERROR((AE_INFO,
"Invalid zero length descriptor in resource list\n"));
return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
}
/* Perform the conversion */ /* Perform the conversion */
if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) { if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) {
......
drivers/acpi/acpica/rsxface.c
View file @ 0ad4991c
...@@ -563,13 +563,19 @@ acpi_walk_resource_buffer(struct acpi_buffer * buffer, ...@@ -563,13 +563,19 @@ acpi_walk_resource_buffer(struct acpi_buffer * buffer,
while (resource < resource_end) { while (resource < resource_end) {
/* Sanity check the resource */ /* Sanity check the resource type */
if (resource->type > ACPI_RESOURCE_TYPE_MAX) { if (resource->type > ACPI_RESOURCE_TYPE_MAX) {
status = AE_AML_INVALID_RESOURCE_TYPE; status = AE_AML_INVALID_RESOURCE_TYPE;
break; break;
} }
/* Sanity check the length. It must not be zero, or we loop forever */
if (!resource->length) {
return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
}
/* Invoke the user function, abort on any error returned */ /* Invoke the user function, abort on any error returned */
status = user_function(resource, context); status = user_function(resource, context);
......
drivers/acpi/acpica/tbfadt.c
View file @ 0ad4991c
...@@ -559,8 +559,12 @@ static void acpi_tb_validate_fadt(void) ...@@ -559,8 +559,12 @@ static void acpi_tb_validate_fadt(void)
/* /*
* For each extended field, check for length mismatch between the * For each extended field, check for length mismatch between the
* legacy length field and the corresponding 64-bit X length field. * legacy length field and the corresponding 64-bit X length field.
* Note: If the legacy length field is > 0xFF bits, ignore this
* check. (GPE registers can be larger than the 64-bit GAS structure
* can accomodate, 0xFF bits).
*/ */
if (address64->address && if (address64->address &&
(ACPI_MUL_8(length) <= ACPI_UINT8_MAX) &&
(address64->bit_width != ACPI_MUL_8(length))) { (address64->bit_width != ACPI_MUL_8(length))) {
ACPI_BIOS_WARNING((AE_INFO, ACPI_BIOS_WARNING((AE_INFO,
"32/64X length mismatch in FADT/%s: %u/%u", "32/64X length mismatch in FADT/%s: %u/%u",
......
drivers/acpi/acpica/tbxface.c
View file @ 0ad4991c
/****************************************************************************** /******************************************************************************
* *
* Module Name: tbxface - ACPI table oriented external interfaces * Module Name: tbxface - ACPI table-oriented external interfaces
* *
*****************************************************************************/ *****************************************************************************/
...@@ -80,7 +80,7 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count) ...@@ -80,7 +80,7 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count)
* array is dynamically allocated. * array is dynamically allocated.
* initial_table_count - Size of initial_table_array, in number of * initial_table_count - Size of initial_table_array, in number of
* struct acpi_table_desc structures * struct acpi_table_desc structures
* allow_realloc - Flag to tell Table Manager if resize of * allow_resize - Flag to tell Table Manager if resize of
* pre-allocated array is allowed. Ignored * pre-allocated array is allowed. Ignored
* if initial_table_array is NULL. * if initial_table_array is NULL.
* *
...@@ -107,8 +107,8 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array, ...@@ -107,8 +107,8 @@ acpi_initialize_tables(struct acpi_table_desc * initial_table_array,
ACPI_FUNCTION_TRACE(acpi_initialize_tables); ACPI_FUNCTION_TRACE(acpi_initialize_tables);
/* /*
* Set up the Root Table Array * Setup the Root Table Array and allocate the table array
* Allocate the table array if requested * if requested
*/ */
if (!initial_table_array) { if (!initial_table_array) {
status = acpi_allocate_root_table(initial_table_count); status = acpi_allocate_root_table(initial_table_count);
...@@ -305,9 +305,10 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id) ...@@ -305,9 +305,10 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
* instance - Which instance (for SSDTs) * instance - Which instance (for SSDTs)
* out_table - Where the pointer to the table is returned * out_table - Where the pointer to the table is returned
* *
* RETURN: Status and pointer to table * RETURN: Status and pointer to the requested table
* *
* DESCRIPTION: Finds and verifies an ACPI table. * DESCRIPTION: Finds and verifies an ACPI table. Table must be in the
* RSDT/XSDT.
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status
...@@ -375,9 +376,10 @@ ACPI_EXPORT_SYMBOL(acpi_get_table) ...@@ -375,9 +376,10 @@ ACPI_EXPORT_SYMBOL(acpi_get_table)
* PARAMETERS: table_index - Table index * PARAMETERS: table_index - Table index
* table - Where the pointer to the table is returned * table - Where the pointer to the table is returned
* *
* RETURN: Status and pointer to the table * RETURN: Status and pointer to the requested table
* *
* DESCRIPTION: Obtain a table by an index into the global table list. * DESCRIPTION: Obtain a table by an index into the global table list. Used
* internally also.
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status
...@@ -432,7 +434,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_index) ...@@ -432,7 +434,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_by_index)
* *
* RETURN: Status * RETURN: Status
* *
* DESCRIPTION: Install table event handler * DESCRIPTION: Install a global table event handler.
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_status
...@@ -479,7 +481,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_table_handler) ...@@ -479,7 +481,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_table_handler)
* *
* RETURN: Status * RETURN: Status
* *
* DESCRIPTION: Remove table event handler * DESCRIPTION: Remove a table event handler
* *
******************************************************************************/ ******************************************************************************/
acpi_status acpi_remove_table_handler(acpi_table_handler handler) acpi_status acpi_remove_table_handler(acpi_table_handler handler)
......
drivers/acpi/acpica/utaddress.c
View file @ 0ad4991c
...@@ -214,7 +214,7 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id, ...@@ -214,7 +214,7 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) && if ((space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) &&
(space_id != ACPI_ADR_SPACE_SYSTEM_IO)) { (space_id != ACPI_ADR_SPACE_SYSTEM_IO)) {
return_VALUE(0); return_UINT32(0);
} }
range_info = acpi_gbl_address_range_list[space_id]; range_info = acpi_gbl_address_range_list[space_id];
...@@ -256,7 +256,7 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id, ...@@ -256,7 +256,7 @@ acpi_ut_check_address_range(acpi_adr_space_type space_id,
range_info = range_info->next; range_info = range_info->next;
} }
return_VALUE(overlap_count); return_UINT32(overlap_count);
} }
/******************************************************************************* /*******************************************************************************
......
drivers/acpi/acpica/utcache.c
View file @ 0ad4991c
...@@ -85,7 +85,6 @@ acpi_os_create_cache(char *cache_name, ...@@ -85,7 +85,6 @@ acpi_os_create_cache(char *cache_name,
/* Populate the cache object and return it */ /* Populate the cache object and return it */
ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list)); ACPI_MEMSET(cache, 0, sizeof(struct acpi_memory_list));
cache->link_offset = 8;
cache->list_name = cache_name; cache->list_name = cache_name;
cache->object_size = object_size; cache->object_size = object_size;
cache->max_depth = max_depth; cache->max_depth = max_depth;
...@@ -108,7 +107,7 @@ acpi_os_create_cache(char *cache_name, ...@@ -108,7 +107,7 @@ acpi_os_create_cache(char *cache_name,
acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache) acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
{ {
char *next; void *next;
acpi_status status; acpi_status status;
ACPI_FUNCTION_ENTRY(); ACPI_FUNCTION_ENTRY();
...@@ -128,10 +127,7 @@ acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache) ...@@ -128,10 +127,7 @@ acpi_status acpi_os_purge_cache(struct acpi_memory_list * cache)
/* Delete and unlink one cached state object */ /* Delete and unlink one cached state object */
next = *(ACPI_CAST_INDIRECT_PTR(char, next = ACPI_GET_DESCRIPTOR_PTR(cache->list_head);
&(((char *)cache->
list_head)[cache->
link_offset])));
ACPI_FREE(cache->list_head); ACPI_FREE(cache->list_head);
cache->list_head = next; cache->list_head = next;
...@@ -221,10 +217,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object) ...@@ -221,10 +217,7 @@ acpi_os_release_object(struct acpi_memory_list * cache, void *object)
/* Put the object at the head of the cache list */ /* Put the object at the head of the cache list */
*(ACPI_CAST_INDIRECT_PTR(char, ACPI_SET_DESCRIPTOR_PTR(object, cache->list_head);
&(((char *)object)[cache->
link_offset]))) =
cache->list_head;
cache->list_head = object; cache->list_head = object;
cache->current_depth++; cache->current_depth++;
...@@ -272,10 +265,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache) ...@@ -272,10 +265,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)
/* There is an object available, use it */ /* There is an object available, use it */
object = cache->list_head; object = cache->list_head;
cache->list_head = *(ACPI_CAST_INDIRECT_PTR(char, cache->list_head = ACPI_GET_DESCRIPTOR_PTR(object);
&(((char *)
object)[cache->
link_offset])));
cache->current_depth--; cache->current_depth--;
......
drivers/acpi/acpica/utdelete.c
View file @ 0ad4991c
...@@ -359,19 +359,20 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list) ...@@ -359,19 +359,20 @@ void acpi_ut_delete_internal_object_list(union acpi_operand_object **obj_list)
* FUNCTION: acpi_ut_update_ref_count * FUNCTION: acpi_ut_update_ref_count
* *
* PARAMETERS: object - Object whose ref count is to be updated * PARAMETERS: object - Object whose ref count is to be updated
* action - What to do * action - What to do (REF_INCREMENT or REF_DECREMENT)
* *
* RETURN: New ref count * RETURN: None. Sets new reference count within the object
* *
* DESCRIPTION: Modify the ref count and return it. * DESCRIPTION: Modify the reference count for an internal acpi object
* *
******************************************************************************/ ******************************************************************************/
static void static void
acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action) acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
{ {
u16 count; u16 original_count;
u16 new_count; u16 new_count = 0;
acpi_cpu_flags lock_flags;
ACPI_FUNCTION_NAME(ut_update_ref_count); ACPI_FUNCTION_NAME(ut_update_ref_count);
...@@ -379,76 +380,79 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action) ...@@ -379,76 +380,79 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
return; return;
} }
count = object->common.reference_count;
new_count = count;
/* /*
* Perform the reference count action (increment, decrement, force delete) * Always get the reference count lock. Note: Interpreter and/or
* Namespace is not always locked when this function is called.
*/ */
lock_flags = acpi_os_acquire_lock(acpi_gbl_reference_count_lock);
original_count = object->common.reference_count;
/* Perform the reference count action (increment, decrement) */
switch (action) { switch (action) {
case REF_INCREMENT: case REF_INCREMENT:
new_count++; new_count = original_count + 1;
object->common.reference_count = new_count; object->common.reference_count = new_count;
acpi_os_release_lock(acpi_gbl_reference_count_lock, lock_flags);
/* The current reference count should never be zero here */
if (!original_count) {
ACPI_WARNING((AE_INFO,
"Obj %p, Reference Count was zero before increment\n",
object));
}
ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
"Obj %p Refs=%X, [Incremented]\n", "Obj %p Type %.2X Refs %.2X [Incremented]\n",
object, new_count)); object, object->common.type, new_count));
break; break;
case REF_DECREMENT: case REF_DECREMENT:
if (count < 1) { /* The current reference count must be non-zero */
ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
"Obj %p Refs=%X, can't decrement! (Set to 0)\n",
object, new_count));
new_count = 0;
} else {
new_count--;
ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, if (original_count) {
"Obj %p Refs=%X, [Decremented]\n", new_count = original_count - 1;
object, new_count)); object->common.reference_count = new_count;
} }
if (object->common.type == ACPI_TYPE_METHOD) { acpi_os_release_lock(acpi_gbl_reference_count_lock, lock_flags);
ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
"Method Obj %p Refs=%X, [Decremented]\n",
object, new_count));
}
object->common.reference_count = new_count; if (!original_count) {
if (new_count == 0) { ACPI_WARNING((AE_INFO,
acpi_ut_delete_internal_obj(object); "Obj %p, Reference Count is already zero, cannot decrement\n",
object));
} }
break;
case REF_FORCE_DELETE:
ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS, ACPI_DEBUG_PRINT((ACPI_DB_ALLOCATIONS,
"Obj %p Refs=%X, Force delete! (Set to 0)\n", "Obj %p Type %.2X Refs %.2X [Decremented]\n",
object, count)); object, object->common.type, new_count));
new_count = 0; /* Actually delete the object on a reference count of zero */
object->common.reference_count = new_count;
if (new_count == 0) {
acpi_ut_delete_internal_obj(object); acpi_ut_delete_internal_obj(object);
}
break; break;
default: default:
ACPI_ERROR((AE_INFO, "Unknown action (0x%X)", action)); acpi_os_release_lock(acpi_gbl_reference_count_lock, lock_flags);
break; ACPI_ERROR((AE_INFO, "Unknown Reference Count action (0x%X)",
action));
return;
} }
/* /*
* Sanity check the reference count, for debug purposes only. * Sanity check the reference count, for debug purposes only.
* (A deleted object will have a huge reference count) * (A deleted object will have a huge reference count)
*/ */
if (count > ACPI_MAX_REFERENCE_COUNT) { if (new_count > ACPI_MAX_REFERENCE_COUNT) {
ACPI_WARNING((AE_INFO, ACPI_WARNING((AE_INFO,
"Large Reference Count (0x%X) in object %p", "Large Reference Count (0x%X) in object %p, Type=0x%.2X",
count, object)); new_count, object, object->common.type));
} }
} }
...@@ -458,8 +462,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action) ...@@ -458,8 +462,7 @@ acpi_ut_update_ref_count(union acpi_operand_object *object, u32 action)
* *
* PARAMETERS: object - Increment ref count for this object * PARAMETERS: object - Increment ref count for this object
* and all sub-objects * and all sub-objects
* action - Either REF_INCREMENT or REF_DECREMENT or * action - Either REF_INCREMENT or REF_DECREMENT
* REF_FORCE_DELETE
* *
* RETURN: Status * RETURN: Status
* *
...@@ -714,7 +717,6 @@ void acpi_ut_remove_reference(union acpi_operand_object *object) ...@@ -714,7 +717,6 @@ void acpi_ut_remove_reference(union acpi_operand_object *object)
/* /*
* Allow a NULL pointer to be passed in, just ignore it. This saves * Allow a NULL pointer to be passed in, just ignore it. This saves
* each caller from having to check. Also, ignore NS nodes. * each caller from having to check. Also, ignore NS nodes.
*
*/ */
if (!object || if (!object ||
(ACPI_GET_DESCRIPTOR_TYPE(object) == ACPI_DESC_TYPE_NAMED)) { (ACPI_GET_DESCRIPTOR_TYPE(object) == ACPI_DESC_TYPE_NAMED)) {
......
drivers/acpi/acpica/utexcep.c
View file @ 0ad4991c
...@@ -64,7 +64,7 @@ ACPI_MODULE_NAME("utexcep") ...@@ -64,7 +64,7 @@ ACPI_MODULE_NAME("utexcep")
******************************************************************************/ ******************************************************************************/
const char *acpi_format_exception(acpi_status status) const char *acpi_format_exception(acpi_status status)
{ {
const char *exception = NULL; const struct acpi_exception_info *exception;
ACPI_FUNCTION_ENTRY(); ACPI_FUNCTION_ENTRY();
...@@ -76,10 +76,10 @@ const char *acpi_format_exception(acpi_status status) ...@@ -76,10 +76,10 @@ const char *acpi_format_exception(acpi_status status)
ACPI_ERROR((AE_INFO, ACPI_ERROR((AE_INFO,
"Unknown exception code: 0x%8.8X", status)); "Unknown exception code: 0x%8.8X", status));
exception = "UNKNOWN_STATUS_CODE"; return ("UNKNOWN_STATUS_CODE");
} }
return (ACPI_CAST_PTR(const char, exception)); return (exception->name);
} }
ACPI_EXPORT_SYMBOL(acpi_format_exception) ACPI_EXPORT_SYMBOL(acpi_format_exception)
...@@ -97,10 +97,10 @@ ACPI_EXPORT_SYMBOL(acpi_format_exception) ...@@ -97,10 +97,10 @@ ACPI_EXPORT_SYMBOL(acpi_format_exception)
* an ASCII string. * an ASCII string.
* *
******************************************************************************/ ******************************************************************************/
const char *acpi_ut_validate_exception(acpi_status status) const struct acpi_exception_info *acpi_ut_validate_exception(acpi_status status)
{ {
u32 sub_status; u32 sub_status;
const char *exception = NULL; const struct acpi_exception_info *exception = NULL;
ACPI_FUNCTION_ENTRY(); ACPI_FUNCTION_ENTRY();
...@@ -113,35 +113,35 @@ const char *acpi_ut_validate_exception(acpi_status status) ...@@ -113,35 +113,35 @@ const char *acpi_ut_validate_exception(acpi_status status)
case AE_CODE_ENVIRONMENTAL: case AE_CODE_ENVIRONMENTAL:
if (sub_status <= AE_CODE_ENV_MAX) { if (sub_status <= AE_CODE_ENV_MAX) {
exception = acpi_gbl_exception_names_env[sub_status]; exception = &acpi_gbl_exception_names_env[sub_status];
} }
break; break;
case AE_CODE_PROGRAMMER: case AE_CODE_PROGRAMMER:
if (sub_status <= AE_CODE_PGM_MAX) { if (sub_status <= AE_CODE_PGM_MAX) {
exception = acpi_gbl_exception_names_pgm[sub_status]; exception = &acpi_gbl_exception_names_pgm[sub_status];
} }
break; break;
case AE_CODE_ACPI_TABLES: case AE_CODE_ACPI_TABLES:
if (sub_status <= AE_CODE_TBL_MAX) { if (sub_status <= AE_CODE_TBL_MAX) {
exception = acpi_gbl_exception_names_tbl[sub_status]; exception = &acpi_gbl_exception_names_tbl[sub_status];
} }
break; break;
case AE_CODE_AML: case AE_CODE_AML:
if (sub_status <= AE_CODE_AML_MAX) { if (sub_status <= AE_CODE_AML_MAX) {
exception = acpi_gbl_exception_names_aml[sub_status]; exception = &acpi_gbl_exception_names_aml[sub_status];
} }
break; break;
case AE_CODE_CONTROL: case AE_CODE_CONTROL:
if (sub_status <= AE_CODE_CTRL_MAX) { if (sub_status <= AE_CODE_CTRL_MAX) {
exception = acpi_gbl_exception_names_ctrl[sub_status]; exception = &acpi_gbl_exception_names_ctrl[sub_status];
} }
break; break;
...@@ -149,5 +149,9 @@ const char *acpi_ut_validate_exception(acpi_status status) ...@@ -149,5 +149,9 @@ const char *acpi_ut_validate_exception(acpi_status status)
break; break;
} }
return (ACPI_CAST_PTR(const char, exception)); if (!exception || !exception->name) {
return (NULL);
}
return (exception);
} }
drivers/acpi/acpica/utglobal.c
View file @ 0ad4991c
...@@ -359,6 +359,8 @@ acpi_status acpi_ut_init_globals(void) ...@@ -359,6 +359,8 @@ acpi_status acpi_ut_init_globals(void)
#ifdef ACPI_DISASSEMBLER #ifdef ACPI_DISASSEMBLER
acpi_gbl_external_list = NULL; acpi_gbl_external_list = NULL;
acpi_gbl_num_external_methods = 0;
acpi_gbl_resolved_external_methods = 0;
#endif #endif
#ifdef ACPI_DEBUG_OUTPUT #ifdef ACPI_DEBUG_OUTPUT
......
drivers/acpi/acpica/utmutex.c
View file @ 0ad4991c
...@@ -81,7 +81,7 @@ acpi_status acpi_ut_mutex_initialize(void) ...@@ -81,7 +81,7 @@ acpi_status acpi_ut_mutex_initialize(void)
} }
} }
/* Create the spinlocks for use at interrupt level */ /* Create the spinlocks for use at interrupt level or for speed */
status = acpi_os_create_lock (&acpi_gbl_gpe_lock); status = acpi_os_create_lock (&acpi_gbl_gpe_lock);
if (ACPI_FAILURE (status)) { if (ACPI_FAILURE (status)) {
...@@ -93,7 +93,13 @@ acpi_status acpi_ut_mutex_initialize(void) ...@@ -93,7 +93,13 @@ acpi_status acpi_ut_mutex_initialize(void)
return_ACPI_STATUS (status); return_ACPI_STATUS (status);
} }
status = acpi_os_create_lock(&acpi_gbl_reference_count_lock);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
/* Mutex for _OSI support */ /* Mutex for _OSI support */
status = acpi_os_create_mutex(&acpi_gbl_osi_mutex); status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
...@@ -136,6 +142,7 @@ void acpi_ut_mutex_terminate(void) ...@@ -136,6 +142,7 @@ void acpi_ut_mutex_terminate(void)
acpi_os_delete_lock(acpi_gbl_gpe_lock); acpi_os_delete_lock(acpi_gbl_gpe_lock);
acpi_os_delete_lock(acpi_gbl_hardware_lock); acpi_os_delete_lock(acpi_gbl_hardware_lock);
acpi_os_delete_lock(acpi_gbl_reference_count_lock);
/* Delete the reader/writer lock */ /* Delete the reader/writer lock */
......
drivers/acpi/acpica/utosi.c
View file @ 0ad4991c
...@@ -108,9 +108,14 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = { ...@@ -108,9 +108,14 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = {
acpi_status acpi_ut_initialize_interfaces(void) acpi_status acpi_ut_initialize_interfaces(void)
{ {
acpi_status status;
u32 i; u32 i;
(void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER); status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
if (ACPI_FAILURE(status)) {
return (status);
}
acpi_gbl_supported_interfaces = acpi_default_supported_interfaces; acpi_gbl_supported_interfaces = acpi_default_supported_interfaces;
/* Link the static list of supported interfaces */ /* Link the static list of supported interfaces */
...@@ -132,20 +137,24 @@ acpi_status acpi_ut_initialize_interfaces(void) ...@@ -132,20 +137,24 @@ acpi_status acpi_ut_initialize_interfaces(void)
* *
* PARAMETERS: None * PARAMETERS: None
* *
* RETURN: None * RETURN: Status
* *
* DESCRIPTION: Delete all interfaces in the global list. Sets * DESCRIPTION: Delete all interfaces in the global list. Sets
* acpi_gbl_supported_interfaces to NULL. * acpi_gbl_supported_interfaces to NULL.
* *
******************************************************************************/ ******************************************************************************/
void acpi_ut_interface_terminate(void) acpi_status acpi_ut_interface_terminate(void)
{ {
acpi_status status;
struct acpi_interface_info *next_interface; struct acpi_interface_info *next_interface;
(void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER); status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
next_interface = acpi_gbl_supported_interfaces; if (ACPI_FAILURE(status)) {
return (status);
}
next_interface = acpi_gbl_supported_interfaces;
while (next_interface) { while (next_interface) {
acpi_gbl_supported_interfaces = next_interface->next; acpi_gbl_supported_interfaces = next_interface->next;
...@@ -160,6 +169,7 @@ void acpi_ut_interface_terminate(void) ...@@ -160,6 +169,7 @@ void acpi_ut_interface_terminate(void)
} }
acpi_os_release_mutex(acpi_gbl_osi_mutex); acpi_os_release_mutex(acpi_gbl_osi_mutex);
return (AE_OK);
} }
/******************************************************************************* /*******************************************************************************
...@@ -315,6 +325,7 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state) ...@@ -315,6 +325,7 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state)
union acpi_operand_object *return_desc; union acpi_operand_object *return_desc;
struct acpi_interface_info *interface_info; struct acpi_interface_info *interface_info;
acpi_interface_handler interface_handler; acpi_interface_handler interface_handler;
acpi_status status;
u32 return_value; u32 return_value;
ACPI_FUNCTION_TRACE(ut_osi_implementation); ACPI_FUNCTION_TRACE(ut_osi_implementation);
...@@ -336,7 +347,10 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state) ...@@ -336,7 +347,10 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state * walk_state)
/* Default return value is 0, NOT SUPPORTED */ /* Default return value is 0, NOT SUPPORTED */
return_value = 0; return_value = 0;
(void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER); status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
if (ACPI_FAILURE(status)) {
return (status);
}
/* Lookup the interface in the global _OSI list */ /* Lookup the interface in the global _OSI list */
......
drivers/acpi/acpica/utpredef.c 0 → 100644
View file @ 0ad4991c
/******************************************************************************
*
* Module Name: utpredef - support functions for predefined names
*
*****************************************************************************/
/*
* Copyright (C) 2000 - 2013, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions, and the following disclaimer,
* without modification.
* 2. Redistributions in binary form must reproduce at minimum a disclaimer
* substantially similar to the "NO WARRANTY" disclaimer below
* ("Disclaimer") and any redistribution must be conditioned upon
* including a substantially similar Disclaimer requirement for further
* binary redistribution.
* 3. Neither the names of the above-listed copyright holders nor the names
* of any contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* Alternatively, this software may be distributed under the terms of the
* GNU General Public License ("GPL") version 2 as published by the Free
* Software Foundation.
*
* NO WARRANTY
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*/
#include <acpi/acpi.h>
#include "accommon.h"
#include "acpredef.h"
#define _COMPONENT ACPI_UTILITIES
ACPI_MODULE_NAME("utpredef")
/*
* Names for the types that can be returned by the predefined objects.
* Used for warning messages. Must be in the same order as the ACPI_RTYPEs
*/
static const char *ut_rtype_names[] = {
"/Integer",
"/String",
"/Buffer",
"/Package",
"/Reference",
};
/*******************************************************************************
*
* FUNCTION: acpi_ut_get_next_predefined_method
*
* PARAMETERS: this_name - Entry in the predefined method/name table
*
* RETURN: Pointer to next entry in predefined table.
*
* DESCRIPTION: Get the next entry in the predefine method table. Handles the
* cases where a package info entry follows a method name that
* returns a package.
*
******************************************************************************/
const union acpi_predefined_info *acpi_ut_get_next_predefined_method(const union
acpi_predefined_info
*this_name)
{
/*
* Skip next entry in the table if this name returns a Package
* (next entry contains the package info)
*/
if ((this_name->info.expected_btypes & ACPI_RTYPE_PACKAGE) &&
(this_name->info.expected_btypes != ACPI_RTYPE_ALL)) {
this_name++;
}
this_name++;
return (this_name);
}
/*******************************************************************************
*
* FUNCTION: acpi_ut_match_predefined_method
*
* PARAMETERS: name - Name to find
*
* RETURN: Pointer to entry in predefined table. NULL indicates not found.
*
* DESCRIPTION: Check an object name against the predefined object list.
*
******************************************************************************/
const union acpi_predefined_info *acpi_ut_match_predefined_method(char *name)
{
const union acpi_predefined_info *this_name;
/* Quick check for a predefined name, first character must be underscore */
if (name[0] != '_') {
return (NULL);
}
/* Search info table for a predefined method/object name */
this_name = acpi_gbl_predefined_methods;
while (this_name->info.name[0]) {
if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
return (this_name);
}
this_name = acpi_ut_get_next_predefined_method(this_name);
}
return (NULL); /* Not found */
}
/*******************************************************************************
*
* FUNCTION: acpi_ut_get_expected_return_types
*
* PARAMETERS: buffer - Where the formatted string is returned
* expected_Btypes - Bitfield of expected data types
*
* RETURN: Formatted string in Buffer.
*
* DESCRIPTION: Format the expected object types into a printable string.
*
******************************************************************************/
void acpi_ut_get_expected_return_types(char *buffer, u32 expected_btypes)
{
u32 this_rtype;
u32 i;
u32 j;
j = 1;
buffer[0] = 0;
this_rtype = ACPI_RTYPE_INTEGER;
for (i = 0; i < ACPI_NUM_RTYPES; i++) {
/* If one of the expected types, concatenate the name of this type */
if (expected_btypes & this_rtype) {
ACPI_STRCAT(buffer, &ut_rtype_names[i][j]);
j = 0; /* Use name separator from now on */
}
this_rtype <<= 1; /* Next Rtype */
}
}
/*******************************************************************************
*
* The remaining functions are used by iASL and acpi_help only
*
******************************************************************************/
#if (defined ACPI_ASL_COMPILER || defined ACPI_HELP_APP)
#include <stdio.h>
#include <string.h>
/* Local prototypes */
static u32 acpi_ut_get_argument_types(char *buffer, u16 argument_types);
/* Types that can be returned externally by a predefined name */
static const char *ut_external_type_names[] = /* Indexed by ACPI_TYPE_* */
{
", UNSUPPORTED-TYPE",
", Integer",
", String",
", Buffer",
", Package"
};
/* Bit widths for resource descriptor predefined names */
static const char *ut_resource_type_names[] = {
"/1",
"/2",
"/3",
"/8",
"/16",
"/32",
"/64",
"/variable",
};
/*******************************************************************************
*
* FUNCTION: acpi_ut_match_resource_name
*
* PARAMETERS: name - Name to find
*
* RETURN: Pointer to entry in the resource table. NULL indicates not
* found.
*
* DESCRIPTION: Check an object name against the predefined resource
* descriptor object list.
*
******************************************************************************/
const union acpi_predefined_info *acpi_ut_match_resource_name(char *name)
{
const union acpi_predefined_info *this_name;
/* Quick check for a predefined name, first character must be underscore */
if (name[0] != '_') {
return (NULL);
}
/* Search info table for a predefined method/object name */
this_name = acpi_gbl_resource_names;
while (this_name->info.name[0]) {
if (ACPI_COMPARE_NAME(name, this_name->info.name)) {
return (this_name);
}
this_name++;
}
return (NULL); /* Not found */
}
/*******************************************************************************
*
* FUNCTION: acpi_ut_display_predefined_method
*
* PARAMETERS: buffer - Scratch buffer for this function
* this_name - Entry in the predefined method/name table
* multi_line - TRUE if output should be on >1 line
*
* RETURN: None
*
* DESCRIPTION: Display information about a predefined method. Number and
* type of the input arguments, and expected type(s) for the
* return value, if any.
*
******************************************************************************/
void
acpi_ut_display_predefined_method(char *buffer,
const union acpi_predefined_info *this_name,
u8 multi_line)
{
u32 arg_count;
/*
* Get the argument count and the string buffer
* containing all argument types
*/
arg_count = acpi_ut_get_argument_types(buffer,
this_name->info.argument_list);
if (multi_line) {
printf(" ");
}
printf("%4.4s Requires %s%u argument%s",
this_name->info.name,
(this_name->info.argument_list & ARG_COUNT_IS_MINIMUM) ?
"(at least) " : "", arg_count, arg_count != 1 ? "s" : "");
/* Display the types for any arguments */
if (arg_count > 0) {
printf(" (%s)", buffer);
}
if (multi_line) {
printf("\n ");
}
/* Get the return value type(s) allowed */
if (this_name->info.expected_btypes) {
acpi_ut_get_expected_return_types(buffer,
this_name->info.
expected_btypes);
printf(" Return value types: %s\n", buffer);
} else {
printf(" No return value\n");
}
}
/*******************************************************************************
*
* FUNCTION: acpi_ut_get_argument_types
*
* PARAMETERS: buffer - Where to return the formatted types
* argument_types - Types field for this method
*
* RETURN: count - the number of arguments required for this method
*
* DESCRIPTION: Format the required data types for this method (Integer,
* String, Buffer, or Package) and return the required argument
* count.
*
******************************************************************************/
static u32 acpi_ut_get_argument_types(char *buffer, u16 argument_types)
{
u16 this_argument_type;
u16 sub_index;
u16 arg_count;
u32 i;
*buffer = 0;
sub_index = 2;
/* First field in the types list is the count of args to follow */
arg_count = (argument_types & METHOD_ARG_MASK);
argument_types >>= METHOD_ARG_BIT_WIDTH;
if (arg_count > METHOD_PREDEF_ARGS_MAX) {
printf("**** Invalid argument count (%u) "
"in predefined info structure\n", arg_count);
return (arg_count);
}
/* Get each argument from the list, convert to ascii, store to buffer */
for (i = 0; i < arg_count; i++) {
this_argument_type = (argument_types & METHOD_ARG_MASK);
if (!this_argument_type
|| (this_argument_type > METHOD_MAX_ARG_TYPE)) {
printf("**** Invalid argument type (%u) "
"in predefined info structure\n",
this_argument_type);
return (arg_count);
}
strcat(buffer,
ut_external_type_names[this_argument_type] + sub_index);
/* Shift to next argument type field */
argument_types >>= METHOD_ARG_BIT_WIDTH;
sub_index = 0;
}
return (arg_count);
}
/*******************************************************************************
*
* FUNCTION: acpi_ut_get_resource_bit_width
*
* PARAMETERS: buffer - Where the formatted string is returned
* types - Bitfield of expected data types
*
* RETURN: Count of return types. Formatted string in Buffer.
*
* DESCRIPTION: Format the resource bit widths into a printable string.
*
******************************************************************************/
u32 acpi_ut_get_resource_bit_width(char *buffer, u16 types)
{
u32 i;
u16 sub_index;
u32 found;
*buffer = 0;
sub_index = 1;
found = 0;
for (i = 0; i < NUM_RESOURCE_WIDTHS; i++) {
if (types & 1) {
strcat(buffer, &(ut_resource_type_names[i][sub_index]));
sub_index = 0;
found++;
}
types >>= 1;
}
return (found);
}
#endif
drivers/acpi/acpica/utxface.c
View file @ 0ad4991c
...@@ -287,7 +287,10 @@ acpi_status acpi_install_interface(acpi_string interface_name) ...@@ -287,7 +287,10 @@ acpi_status acpi_install_interface(acpi_string interface_name)
return (AE_BAD_PARAMETER); return (AE_BAD_PARAMETER);
} }
(void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER); status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
if (ACPI_FAILURE(status)) {
return (status);
}
/* Check if the interface name is already in the global list */ /* Check if the interface name is already in the global list */
...@@ -336,7 +339,10 @@ acpi_status acpi_remove_interface(acpi_string interface_name) ...@@ -336,7 +339,10 @@ acpi_status acpi_remove_interface(acpi_string interface_name)
return (AE_BAD_PARAMETER); return (AE_BAD_PARAMETER);
} }
(void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER); status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
if (ACPI_FAILURE(status)) {
return (status);
}
status = acpi_ut_remove_interface(interface_name); status = acpi_ut_remove_interface(interface_name);
...@@ -362,9 +368,12 @@ ACPI_EXPORT_SYMBOL(acpi_remove_interface) ...@@ -362,9 +368,12 @@ ACPI_EXPORT_SYMBOL(acpi_remove_interface)
****************************************************************************/ ****************************************************************************/
acpi_status acpi_install_interface_handler(acpi_interface_handler handler) acpi_status acpi_install_interface_handler(acpi_interface_handler handler)
{ {
acpi_status status = AE_OK; acpi_status status;
(void)acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER); status = acpi_os_acquire_mutex(acpi_gbl_osi_mutex, ACPI_WAIT_FOREVER);
if (ACPI_FAILURE(status)) {
return (status);
}
if (handler && acpi_gbl_interface_handler) { if (handler && acpi_gbl_interface_handler) {
status = AE_ALREADY_EXISTS; status = AE_ALREADY_EXISTS;
......
drivers/acpi/pci_link.c
View file @ 0ad4991c
...@@ -354,6 +354,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) ...@@ -354,6 +354,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
} }
resource->end.type = ACPI_RESOURCE_TYPE_END_TAG; resource->end.type = ACPI_RESOURCE_TYPE_END_TAG;
resource->end.length = sizeof(struct acpi_resource);
/* Attempt to set the resource */ /* Attempt to set the resource */
status = acpi_set_current_resources(link->device->handle, &buffer); status = acpi_set_current_resources(link->device->handle, &buffer);
......
drivers/platform/x86/sony-laptop.c
View file @ 0ad4991c
...@@ -4121,7 +4121,7 @@ static int sony_pic_enable(struct acpi_device *device, ...@@ -4121,7 +4121,7 @@ static int sony_pic_enable(struct acpi_device *device,
resource->res3.data.irq.sharable = ACPI_SHARED; resource->res3.data.irq.sharable = ACPI_SHARED;
resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG; resource->res4.type = ACPI_RESOURCE_TYPE_END_TAG;
resource->res4.length = sizeof(struct acpi_resource);
} }
/* setup Type 2/3 resources */ /* setup Type 2/3 resources */
else { else {
...@@ -4140,6 +4140,7 @@ static int sony_pic_enable(struct acpi_device *device, ...@@ -4140,6 +4140,7 @@ static int sony_pic_enable(struct acpi_device *device,
resource->res2.data.irq.sharable = ACPI_SHARED; resource->res2.data.irq.sharable = ACPI_SHARED;
resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG; resource->res3.type = ACPI_RESOURCE_TYPE_END_TAG;
resource->res3.length = sizeof(struct acpi_resource);
} }
/* Attempt to set the resource */ /* Attempt to set the resource */
......
drivers/pnp/pnpacpi/rsparser.c
View file @ 0ad4991c
...@@ -634,6 +634,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev, ...@@ -634,6 +634,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev,
} }
/* resource will pointer the end resource now */ /* resource will pointer the end resource now */
resource->type = ACPI_RESOURCE_TYPE_END_TAG; resource->type = ACPI_RESOURCE_TYPE_END_TAG;
resource->length = sizeof(struct acpi_resource);
return 0; return 0;
} }
......
include/acpi/acexcep.h
View file @ 0ad4991c
...@@ -44,17 +44,50 @@ ...@@ -44,17 +44,50 @@
#ifndef __ACEXCEP_H__ #ifndef __ACEXCEP_H__
#define __ACEXCEP_H__ #define __ACEXCEP_H__
/* This module contains all possible exception codes for acpi_status */
/* /*
* Exceptions returned by external ACPI interfaces * Exception code classes
*/ */
#define AE_CODE_ENVIRONMENTAL 0x0000 #define AE_CODE_ENVIRONMENTAL 0x0000 /* General ACPICA environment */
#define AE_CODE_PROGRAMMER 0x1000 #define AE_CODE_PROGRAMMER 0x1000 /* External ACPICA interface caller */
#define AE_CODE_ACPI_TABLES 0x2000 #define AE_CODE_ACPI_TABLES 0x2000 /* ACPI tables */
#define AE_CODE_AML 0x3000 #define AE_CODE_AML 0x3000 /* From executing AML code */
#define AE_CODE_CONTROL 0x4000 #define AE_CODE_CONTROL 0x4000 /* Internal control codes */
#define AE_CODE_MAX 0x4000 #define AE_CODE_MAX 0x4000
#define AE_CODE_MASK 0xF000 #define AE_CODE_MASK 0xF000
/*
* Macros to insert the exception code classes
*/
#define EXCEP_ENV(code) ((acpi_status) (code | AE_CODE_ENVIRONMENTAL))
#define EXCEP_PGM(code) ((acpi_status) (code | AE_CODE_PROGRAMMER))
#define EXCEP_TBL(code) ((acpi_status) (code | AE_CODE_ACPI_TABLES))
#define EXCEP_AML(code) ((acpi_status) (code | AE_CODE_AML))
#define EXCEP_CTL(code) ((acpi_status) (code | AE_CODE_CONTROL))
/*
* Exception info table. The "Description" field is used only by the
* ACPICA help application (acpihelp).
*/
struct acpi_exception_info {
char *name;
#ifdef ACPI_HELP_APP
char *description;
#endif
};
#ifdef ACPI_HELP_APP
#define EXCEP_TXT(name,description) {name, description}
#else
#define EXCEP_TXT(name,description) {name}
#endif
/*
* Success is always zero, failure is non-zero
*/
#define ACPI_SUCCESS(a) (!(a)) #define ACPI_SUCCESS(a) (!(a))
#define ACPI_FAILURE(a) (a) #define ACPI_FAILURE(a) (a)
...@@ -64,60 +97,60 @@ ...@@ -64,60 +97,60 @@
/* /*
* Environmental exceptions * Environmental exceptions
*/ */
#define AE_ERROR (acpi_status) (0x0001 | AE_CODE_ENVIRONMENTAL) #define AE_ERROR EXCEP_ENV (0x0001)
#define AE_NO_ACPI_TABLES (acpi_status) (0x0002 | AE_CODE_ENVIRONMENTAL) #define AE_NO_ACPI_TABLES EXCEP_ENV (0x0002)
#define AE_NO_NAMESPACE (acpi_status) (0x0003 | AE_CODE_ENVIRONMENTAL) #define AE_NO_NAMESPACE EXCEP_ENV (0x0003)
#define AE_NO_MEMORY (acpi_status) (0x0004 | AE_CODE_ENVIRONMENTAL) #define AE_NO_MEMORY EXCEP_ENV (0x0004)
#define AE_NOT_FOUND (acpi_status) (0x0005 | AE_CODE_ENVIRONMENTAL) #define AE_NOT_FOUND EXCEP_ENV (0x0005)
#define AE_NOT_EXIST (acpi_status) (0x0006 | AE_CODE_ENVIRONMENTAL) #define AE_NOT_EXIST EXCEP_ENV (0x0006)
#define AE_ALREADY_EXISTS (acpi_status) (0x0007 | AE_CODE_ENVIRONMENTAL) #define AE_ALREADY_EXISTS EXCEP_ENV (0x0007)
#define AE_TYPE (acpi_status) (0x0008 | AE_CODE_ENVIRONMENTAL) #define AE_TYPE EXCEP_ENV (0x0008)
#define AE_NULL_OBJECT (acpi_status) (0x0009 | AE_CODE_ENVIRONMENTAL) #define AE_NULL_OBJECT EXCEP_ENV (0x0009)
#define AE_NULL_ENTRY (acpi_status) (0x000A | AE_CODE_ENVIRONMENTAL) #define AE_NULL_ENTRY EXCEP_ENV (0x000A)
#define AE_BUFFER_OVERFLOW (acpi_status) (0x000B | AE_CODE_ENVIRONMENTAL) #define AE_BUFFER_OVERFLOW EXCEP_ENV (0x000B)
#define AE_STACK_OVERFLOW (acpi_status) (0x000C | AE_CODE_ENVIRONMENTAL) #define AE_STACK_OVERFLOW EXCEP_ENV (0x000C)
#define AE_STACK_UNDERFLOW (acpi_status) (0x000D | AE_CODE_ENVIRONMENTAL) #define AE_STACK_UNDERFLOW EXCEP_ENV (0x000D)
#define AE_NOT_IMPLEMENTED (acpi_status) (0x000E | AE_CODE_ENVIRONMENTAL) #define AE_NOT_IMPLEMENTED EXCEP_ENV (0x000E)
#define AE_SUPPORT (acpi_status) (0x000F | AE_CODE_ENVIRONMENTAL) #define AE_SUPPORT EXCEP_ENV (0x000F)
#define AE_LIMIT (acpi_status) (0x0010 | AE_CODE_ENVIRONMENTAL) #define AE_LIMIT EXCEP_ENV (0x0010)
#define AE_TIME (acpi_status) (0x0011 | AE_CODE_ENVIRONMENTAL) #define AE_TIME EXCEP_ENV (0x0011)
#define AE_ACQUIRE_DEADLOCK (acpi_status) (0x0012 | AE_CODE_ENVIRONMENTAL) #define AE_ACQUIRE_DEADLOCK EXCEP_ENV (0x0012)
#define AE_RELEASE_DEADLOCK (acpi_status) (0x0013 | AE_CODE_ENVIRONMENTAL) #define AE_RELEASE_DEADLOCK EXCEP_ENV (0x0013)
#define AE_NOT_ACQUIRED (acpi_status) (0x0014 | AE_CODE_ENVIRONMENTAL) #define AE_NOT_ACQUIRED EXCEP_ENV (0x0014)
#define AE_ALREADY_ACQUIRED (acpi_status) (0x0015 | AE_CODE_ENVIRONMENTAL) #define AE_ALREADY_ACQUIRED EXCEP_ENV (0x0015)
#define AE_NO_HARDWARE_RESPONSE (acpi_status) (0x0016 | AE_CODE_ENVIRONMENTAL) #define AE_NO_HARDWARE_RESPONSE EXCEP_ENV (0x0016)
#define AE_NO_GLOBAL_LOCK (acpi_status) (0x0017 | AE_CODE_ENVIRONMENTAL) #define AE_NO_GLOBAL_LOCK EXCEP_ENV (0x0017)
#define AE_ABORT_METHOD (acpi_status) (0x0018 | AE_CODE_ENVIRONMENTAL) #define AE_ABORT_METHOD EXCEP_ENV (0x0018)
#define AE_SAME_HANDLER (acpi_status) (0x0019 | AE_CODE_ENVIRONMENTAL) #define AE_SAME_HANDLER EXCEP_ENV (0x0019)
#define AE_NO_HANDLER (acpi_status) (0x001A | AE_CODE_ENVIRONMENTAL) #define AE_NO_HANDLER EXCEP_ENV (0x001A)
#define AE_OWNER_ID_LIMIT (acpi_status) (0x001B | AE_CODE_ENVIRONMENTAL) #define AE_OWNER_ID_LIMIT EXCEP_ENV (0x001B)
#define AE_NOT_CONFIGURED (acpi_status) (0x001C | AE_CODE_ENVIRONMENTAL) #define AE_NOT_CONFIGURED EXCEP_ENV (0x001C)
#define AE_CODE_ENV_MAX 0x001C #define AE_CODE_ENV_MAX 0x001C
/* /*
* Programmer exceptions * Programmer exceptions
*/ */
#define AE_BAD_PARAMETER (acpi_status) (0x0001 | AE_CODE_PROGRAMMER) #define AE_BAD_PARAMETER EXCEP_PGM (0x0001)
#define AE_BAD_CHARACTER (acpi_status) (0x0002 | AE_CODE_PROGRAMMER) #define AE_BAD_CHARACTER EXCEP_PGM (0x0002)
#define AE_BAD_PATHNAME (acpi_status) (0x0003 | AE_CODE_PROGRAMMER) #define AE_BAD_PATHNAME EXCEP_PGM (0x0003)
#define AE_BAD_DATA (acpi_status) (0x0004 | AE_CODE_PROGRAMMER) #define AE_BAD_DATA EXCEP_PGM (0x0004)
#define AE_BAD_HEX_CONSTANT (acpi_status) (0x0005 | AE_CODE_PROGRAMMER) #define AE_BAD_HEX_CONSTANT EXCEP_PGM (0x0005)
#define AE_BAD_OCTAL_CONSTANT (acpi_status) (0x0006 | AE_CODE_PROGRAMMER) #define AE_BAD_OCTAL_CONSTANT EXCEP_PGM (0x0006)
#define AE_BAD_DECIMAL_CONSTANT (acpi_status) (0x0007 | AE_CODE_PROGRAMMER) #define AE_BAD_DECIMAL_CONSTANT EXCEP_PGM (0x0007)
#define AE_MISSING_ARGUMENTS (acpi_status) (0x0008 | AE_CODE_PROGRAMMER) #define AE_MISSING_ARGUMENTS EXCEP_PGM (0x0008)
#define AE_BAD_ADDRESS (acpi_status) (0x0009 | AE_CODE_PROGRAMMER) #define AE_BAD_ADDRESS EXCEP_PGM (0x0009)
#define AE_CODE_PGM_MAX 0x0009 #define AE_CODE_PGM_MAX 0x0009
/* /*
* Acpi table exceptions * Acpi table exceptions
*/ */
#define AE_BAD_SIGNATURE (acpi_status) (0x0001 | AE_CODE_ACPI_TABLES) #define AE_BAD_SIGNATURE EXCEP_TBL (0x0001)
#define AE_BAD_HEADER (acpi_status) (0x0002 | AE_CODE_ACPI_TABLES) #define AE_BAD_HEADER EXCEP_TBL (0x0002)
#define AE_BAD_CHECKSUM (acpi_status) (0x0003 | AE_CODE_ACPI_TABLES) #define AE_BAD_CHECKSUM EXCEP_TBL (0x0003)
#define AE_BAD_VALUE (acpi_status) (0x0004 | AE_CODE_ACPI_TABLES) #define AE_BAD_VALUE EXCEP_TBL (0x0004)
#define AE_INVALID_TABLE_LENGTH (acpi_status) (0x0005 | AE_CODE_ACPI_TABLES) #define AE_INVALID_TABLE_LENGTH EXCEP_TBL (0x0005)
#define AE_CODE_TBL_MAX 0x0005 #define AE_CODE_TBL_MAX 0x0005
...@@ -125,58 +158,58 @@ ...@@ -125,58 +158,58 @@
* AML exceptions. These are caused by problems with * AML exceptions. These are caused by problems with
* the actual AML byte stream * the actual AML byte stream
*/ */
#define AE_AML_BAD_OPCODE (acpi_status) (0x0001 | AE_CODE_AML) #define AE_AML_BAD_OPCODE EXCEP_AML (0x0001)
#define AE_AML_NO_OPERAND (acpi_status) (0x0002 | AE_CODE_AML) #define AE_AML_NO_OPERAND EXCEP_AML (0x0002)
#define AE_AML_OPERAND_TYPE (acpi_status) (0x0003 | AE_CODE_AML) #define AE_AML_OPERAND_TYPE EXCEP_AML (0x0003)
#define AE_AML_OPERAND_VALUE (acpi_status) (0x0004 | AE_CODE_AML) #define AE_AML_OPERAND_VALUE EXCEP_AML (0x0004)
#define AE_AML_UNINITIALIZED_LOCAL (acpi_status) (0x0005 | AE_CODE_AML) #define AE_AML_UNINITIALIZED_LOCAL EXCEP_AML (0x0005)
#define AE_AML_UNINITIALIZED_ARG (acpi_status) (0x0006 | AE_CODE_AML) #define AE_AML_UNINITIALIZED_ARG EXCEP_AML (0x0006)
#define AE_AML_UNINITIALIZED_ELEMENT (acpi_status) (0x0007 | AE_CODE_AML) #define AE_AML_UNINITIALIZED_ELEMENT EXCEP_AML (0x0007)
#define AE_AML_NUMERIC_OVERFLOW (acpi_status) (0x0008 | AE_CODE_AML) #define AE_AML_NUMERIC_OVERFLOW EXCEP_AML (0x0008)
#define AE_AML_REGION_LIMIT (acpi_status) (0x0009 | AE_CODE_AML) #define AE_AML_REGION_LIMIT EXCEP_AML (0x0009)
#define AE_AML_BUFFER_LIMIT (acpi_status) (0x000A | AE_CODE_AML) #define AE_AML_BUFFER_LIMIT EXCEP_AML (0x000A)
#define AE_AML_PACKAGE_LIMIT (acpi_status) (0x000B | AE_CODE_AML) #define AE_AML_PACKAGE_LIMIT EXCEP_AML (0x000B)
#define AE_AML_DIVIDE_BY_ZERO (acpi_status) (0x000C | AE_CODE_AML) #define AE_AML_DIVIDE_BY_ZERO EXCEP_AML (0x000C)
#define AE_AML_BAD_NAME (acpi_status) (0x000D | AE_CODE_AML) #define AE_AML_BAD_NAME EXCEP_AML (0x000D)
#define AE_AML_NAME_NOT_FOUND (acpi_status) (0x000E | AE_CODE_AML) #define AE_AML_NAME_NOT_FOUND EXCEP_AML (0x000E)
#define AE_AML_INTERNAL (acpi_status) (0x000F | AE_CODE_AML) #define AE_AML_INTERNAL EXCEP_AML (0x000F)
#define AE_AML_INVALID_SPACE_ID (acpi_status) (0x0010 | AE_CODE_AML) #define AE_AML_INVALID_SPACE_ID EXCEP_AML (0x0010)
#define AE_AML_STRING_LIMIT (acpi_status) (0x0011 | AE_CODE_AML) #define AE_AML_STRING_LIMIT EXCEP_AML (0x0011)
#define AE_AML_NO_RETURN_VALUE (acpi_status) (0x0012 | AE_CODE_AML) #define AE_AML_NO_RETURN_VALUE EXCEP_AML (0x0012)
#define AE_AML_METHOD_LIMIT (acpi_status) (0x0013 | AE_CODE_AML) #define AE_AML_METHOD_LIMIT EXCEP_AML (0x0013)
#define AE_AML_NOT_OWNER (acpi_status) (0x0014 | AE_CODE_AML) #define AE_AML_NOT_OWNER EXCEP_AML (0x0014)
#define AE_AML_MUTEX_ORDER (acpi_status) (0x0015 | AE_CODE_AML) #define AE_AML_MUTEX_ORDER EXCEP_AML (0x0015)
#define AE_AML_MUTEX_NOT_ACQUIRED (acpi_status) (0x0016 | AE_CODE_AML) #define AE_AML_MUTEX_NOT_ACQUIRED EXCEP_AML (0x0016)
#define AE_AML_INVALID_RESOURCE_TYPE (acpi_status) (0x0017 | AE_CODE_AML) #define AE_AML_INVALID_RESOURCE_TYPE EXCEP_AML (0x0017)
#define AE_AML_INVALID_INDEX (acpi_status) (0x0018 | AE_CODE_AML) #define AE_AML_INVALID_INDEX EXCEP_AML (0x0018)
#define AE_AML_REGISTER_LIMIT (acpi_status) (0x0019 | AE_CODE_AML) #define AE_AML_REGISTER_LIMIT EXCEP_AML (0x0019)
#define AE_AML_NO_WHILE (acpi_status) (0x001A | AE_CODE_AML) #define AE_AML_NO_WHILE EXCEP_AML (0x001A)
#define AE_AML_ALIGNMENT (acpi_status) (0x001B | AE_CODE_AML) #define AE_AML_ALIGNMENT EXCEP_AML (0x001B)
#define AE_AML_NO_RESOURCE_END_TAG (acpi_status) (0x001C | AE_CODE_AML) #define AE_AML_NO_RESOURCE_END_TAG EXCEP_AML (0x001C)
#define AE_AML_BAD_RESOURCE_VALUE (acpi_status) (0x001D | AE_CODE_AML) #define AE_AML_BAD_RESOURCE_VALUE EXCEP_AML (0x001D)
#define AE_AML_CIRCULAR_REFERENCE (acpi_status) (0x001E | AE_CODE_AML) #define AE_AML_CIRCULAR_REFERENCE EXCEP_AML (0x001E)
#define AE_AML_BAD_RESOURCE_LENGTH (acpi_status) (0x001F | AE_CODE_AML) #define AE_AML_BAD_RESOURCE_LENGTH EXCEP_AML (0x001F)
#define AE_AML_ILLEGAL_ADDRESS (acpi_status) (0x0020 | AE_CODE_AML) #define AE_AML_ILLEGAL_ADDRESS EXCEP_AML (0x0020)
#define AE_AML_INFINITE_LOOP (acpi_status) (0x0021 | AE_CODE_AML) #define AE_AML_INFINITE_LOOP EXCEP_AML (0x0021)
#define AE_CODE_AML_MAX 0x0021 #define AE_CODE_AML_MAX 0x0021
/* /*
* Internal exceptions used for control * Internal exceptions used for control
*/ */
#define AE_CTRL_RETURN_VALUE (acpi_status) (0x0001 | AE_CODE_CONTROL) #define AE_CTRL_RETURN_VALUE EXCEP_CTL (0x0001)
#define AE_CTRL_PENDING (acpi_status) (0x0002 | AE_CODE_CONTROL) #define AE_CTRL_PENDING EXCEP_CTL (0x0002)
#define AE_CTRL_TERMINATE (acpi_status) (0x0003 | AE_CODE_CONTROL) #define AE_CTRL_TERMINATE EXCEP_CTL (0x0003)
#define AE_CTRL_TRUE (acpi_status) (0x0004 | AE_CODE_CONTROL) #define AE_CTRL_TRUE EXCEP_CTL (0x0004)
#define AE_CTRL_FALSE (acpi_status) (0x0005 | AE_CODE_CONTROL) #define AE_CTRL_FALSE EXCEP_CTL (0x0005)
#define AE_CTRL_DEPTH (acpi_status) (0x0006 | AE_CODE_CONTROL) #define AE_CTRL_DEPTH EXCEP_CTL (0x0006)
#define AE_CTRL_END (acpi_status) (0x0007 | AE_CODE_CONTROL) #define AE_CTRL_END EXCEP_CTL (0x0007)
#define AE_CTRL_TRANSFER (acpi_status) (0x0008 | AE_CODE_CONTROL) #define AE_CTRL_TRANSFER EXCEP_CTL (0x0008)
#define AE_CTRL_BREAK (acpi_status) (0x0009 | AE_CODE_CONTROL) #define AE_CTRL_BREAK EXCEP_CTL (0x0009)
#define AE_CTRL_CONTINUE (acpi_status) (0x000A | AE_CODE_CONTROL) #define AE_CTRL_CONTINUE EXCEP_CTL (0x000A)
#define AE_CTRL_SKIP (acpi_status) (0x000B | AE_CODE_CONTROL) #define AE_CTRL_SKIP EXCEP_CTL (0x000B)
#define AE_CTRL_PARSE_CONTINUE (acpi_status) (0x000C | AE_CODE_CONTROL) #define AE_CTRL_PARSE_CONTINUE EXCEP_CTL (0x000C)
#define AE_CTRL_PARSE_PENDING (acpi_status) (0x000D | AE_CODE_CONTROL) #define AE_CTRL_PARSE_PENDING EXCEP_CTL (0x000D)
#define AE_CODE_CTRL_MAX 0x000D #define AE_CODE_CTRL_MAX 0x000D
...@@ -188,112 +221,156 @@ ...@@ -188,112 +221,156 @@
* String versions of the exception codes above * String versions of the exception codes above
* These strings must match the corresponding defines exactly * These strings must match the corresponding defines exactly
*/ */
char const *acpi_gbl_exception_names_env[] = { static const struct acpi_exception_info acpi_gbl_exception_names_env[] = {
"AE_OK", EXCEP_TXT("AE_OK", "No error"),
"AE_ERROR", EXCEP_TXT("AE_ERROR", "Unspecified error"),
"AE_NO_ACPI_TABLES", EXCEP_TXT("AE_NO_ACPI_TABLES", "ACPI tables could not be found"),
"AE_NO_NAMESPACE", EXCEP_TXT("AE_NO_NAMESPACE", "A namespace has not been loaded"),
"AE_NO_MEMORY", EXCEP_TXT("AE_NO_MEMORY", "Insufficient dynamic memory"),
"AE_NOT_FOUND", EXCEP_TXT("AE_NOT_FOUND", "The name was not found in the namespace"),
"AE_NOT_EXIST", EXCEP_TXT("AE_NOT_EXIST", "A required entity does not exist"),
"AE_ALREADY_EXISTS", EXCEP_TXT("AE_ALREADY_EXISTS", "An entity already exists"),
"AE_TYPE", EXCEP_TXT("AE_TYPE", "The object type is incorrect"),
"AE_NULL_OBJECT", EXCEP_TXT("AE_NULL_OBJECT", "A required object was missing"),
"AE_NULL_ENTRY", EXCEP_TXT("AE_NULL_ENTRY", "The requested object does not exist"),
"AE_BUFFER_OVERFLOW", EXCEP_TXT("AE_BUFFER_OVERFLOW", "The buffer provided is too small"),
"AE_STACK_OVERFLOW", EXCEP_TXT("AE_STACK_OVERFLOW", "An internal stack overflowed"),
"AE_STACK_UNDERFLOW", EXCEP_TXT("AE_STACK_UNDERFLOW", "An internal stack underflowed"),
"AE_NOT_IMPLEMENTED", EXCEP_TXT("AE_NOT_IMPLEMENTED", "The feature is not implemented"),
"AE_SUPPORT", EXCEP_TXT("AE_SUPPORT", "The feature is not supported"),
"AE_LIMIT", EXCEP_TXT("AE_LIMIT", "A predefined limit was exceeded"),
"AE_TIME", EXCEP_TXT("AE_TIME", "A time limit or timeout expired"),
"AE_ACQUIRE_DEADLOCK", EXCEP_TXT("AE_ACQUIRE_DEADLOCK",
"AE_RELEASE_DEADLOCK", "Internal error, attempt was made to acquire a mutex in improper order"),
"AE_NOT_ACQUIRED", EXCEP_TXT("AE_RELEASE_DEADLOCK",
"AE_ALREADY_ACQUIRED", "Internal error, attempt was made to release a mutex in improper order"),
"AE_NO_HARDWARE_RESPONSE", EXCEP_TXT("AE_NOT_ACQUIRED",
"AE_NO_GLOBAL_LOCK", "An attempt to release a mutex or Global Lock without a previous acquire"),
"AE_ABORT_METHOD", EXCEP_TXT("AE_ALREADY_ACQUIRED",
"AE_SAME_HANDLER", "Internal error, attempt was made to acquire a mutex twice"),
"AE_NO_HANDLER", EXCEP_TXT("AE_NO_HARDWARE_RESPONSE",
"AE_OWNER_ID_LIMIT", "Hardware did not respond after an I/O operation"),
"AE_NOT_CONFIGURED" EXCEP_TXT("AE_NO_GLOBAL_LOCK", "There is no FACS Global Lock"),
EXCEP_TXT("AE_ABORT_METHOD", "A control method was aborted"),
EXCEP_TXT("AE_SAME_HANDLER",
"Attempt was made to install the same handler that is already installed"),
EXCEP_TXT("AE_NO_HANDLER",
"A handler for the operation is not installed"),
EXCEP_TXT("AE_OWNER_ID_LIMIT",
"There are no more Owner IDs available for ACPI tables or control methods"),
EXCEP_TXT("AE_NOT_CONFIGURED",
"The interface is not part of the current subsystem configuration")
}; };
char const *acpi_gbl_exception_names_pgm[] = { static const struct acpi_exception_info acpi_gbl_exception_names_pgm[] = {
NULL, EXCEP_TXT(NULL, NULL),
"AE_BAD_PARAMETER", EXCEP_TXT("AE_BAD_PARAMETER", "A parameter is out of range or invalid"),
"AE_BAD_CHARACTER", EXCEP_TXT("AE_BAD_CHARACTER",
"AE_BAD_PATHNAME", "An invalid character was found in a name"),
"AE_BAD_DATA", EXCEP_TXT("AE_BAD_PATHNAME",
"AE_BAD_HEX_CONSTANT", "An invalid character was found in a pathname"),
"AE_BAD_OCTAL_CONSTANT", EXCEP_TXT("AE_BAD_DATA",
"AE_BAD_DECIMAL_CONSTANT", "A package or buffer contained incorrect data"),
"AE_MISSING_ARGUMENTS", EXCEP_TXT("AE_BAD_HEX_CONSTANT", "Invalid character in a Hex constant"),
"AE_BAD_ADDRESS" EXCEP_TXT("AE_BAD_OCTAL_CONSTANT",
"Invalid character in an Octal constant"),
EXCEP_TXT("AE_BAD_DECIMAL_CONSTANT",
"Invalid character in a Decimal constant"),
EXCEP_TXT("AE_MISSING_ARGUMENTS",
"Too few arguments were passed to a control method"),
EXCEP_TXT("AE_BAD_ADDRESS", "An illegal null I/O address")
}; };
char const *acpi_gbl_exception_names_tbl[] = { static const struct acpi_exception_info acpi_gbl_exception_names_tbl[] = {
NULL, EXCEP_TXT(NULL, NULL),
"AE_BAD_SIGNATURE", EXCEP_TXT("AE_BAD_SIGNATURE", "An ACPI table has an invalid signature"),
"AE_BAD_HEADER", EXCEP_TXT("AE_BAD_HEADER", "Invalid field in an ACPI table header"),
"AE_BAD_CHECKSUM", EXCEP_TXT("AE_BAD_CHECKSUM", "An ACPI table checksum is not correct"),
"AE_BAD_VALUE", EXCEP_TXT("AE_BAD_VALUE", "An invalid value was found in a table"),
"AE_INVALID_TABLE_LENGTH" EXCEP_TXT("AE_INVALID_TABLE_LENGTH",
"The FADT or FACS has improper length")
}; };
char const *acpi_gbl_exception_names_aml[] = { static const struct acpi_exception_info acpi_gbl_exception_names_aml[] = {
NULL, EXCEP_TXT(NULL, NULL),
"AE_AML_BAD_OPCODE", EXCEP_TXT("AE_AML_BAD_OPCODE", "Invalid AML opcode encountered"),
"AE_AML_NO_OPERAND", EXCEP_TXT("AE_AML_NO_OPERAND", "A required operand is missing"),
"AE_AML_OPERAND_TYPE", EXCEP_TXT("AE_AML_OPERAND_TYPE",
"AE_AML_OPERAND_VALUE", "An operand of an incorrect type was encountered"),
"AE_AML_UNINITIALIZED_LOCAL", EXCEP_TXT("AE_AML_OPERAND_VALUE",
"AE_AML_UNINITIALIZED_ARG", "The operand had an inappropriate or invalid value"),
"AE_AML_UNINITIALIZED_ELEMENT", EXCEP_TXT("AE_AML_UNINITIALIZED_LOCAL",
"AE_AML_NUMERIC_OVERFLOW", "Method tried to use an uninitialized local variable"),
"AE_AML_REGION_LIMIT", EXCEP_TXT("AE_AML_UNINITIALIZED_ARG",
"AE_AML_BUFFER_LIMIT", "Method tried to use an uninitialized argument"),
"AE_AML_PACKAGE_LIMIT", EXCEP_TXT("AE_AML_UNINITIALIZED_ELEMENT",
"AE_AML_DIVIDE_BY_ZERO", "Method tried to use an empty package element"),
"AE_AML_BAD_NAME", EXCEP_TXT("AE_AML_NUMERIC_OVERFLOW",
"AE_AML_NAME_NOT_FOUND", "Overflow during BCD conversion or other"),
"AE_AML_INTERNAL", EXCEP_TXT("AE_AML_REGION_LIMIT",
"AE_AML_INVALID_SPACE_ID", "Tried to access beyond the end of an Operation Region"),
"AE_AML_STRING_LIMIT", EXCEP_TXT("AE_AML_BUFFER_LIMIT",
"AE_AML_NO_RETURN_VALUE", "Tried to access beyond the end of a buffer"),
"AE_AML_METHOD_LIMIT", EXCEP_TXT("AE_AML_PACKAGE_LIMIT",
"AE_AML_NOT_OWNER", "Tried to access beyond the end of a package"),
"AE_AML_MUTEX_ORDER", EXCEP_TXT("AE_AML_DIVIDE_BY_ZERO",
"AE_AML_MUTEX_NOT_ACQUIRED", "During execution of AML Divide operator"),
"AE_AML_INVALID_RESOURCE_TYPE", EXCEP_TXT("AE_AML_BAD_NAME",
"AE_AML_INVALID_INDEX", "An ACPI name contains invalid character(s)"),
"AE_AML_REGISTER_LIMIT", EXCEP_TXT("AE_AML_NAME_NOT_FOUND",
"AE_AML_NO_WHILE", "Could not resolve a named reference"),
"AE_AML_ALIGNMENT", EXCEP_TXT("AE_AML_INTERNAL", "An internal error within the interprete"),
"AE_AML_NO_RESOURCE_END_TAG", EXCEP_TXT("AE_AML_INVALID_SPACE_ID",
"AE_AML_BAD_RESOURCE_VALUE", "An Operation Region SpaceID is invalid"),
"AE_AML_CIRCULAR_REFERENCE", EXCEP_TXT("AE_AML_STRING_LIMIT",
"AE_AML_BAD_RESOURCE_LENGTH", "String is longer than 200 characters"),
"AE_AML_ILLEGAL_ADDRESS", EXCEP_TXT("AE_AML_NO_RETURN_VALUE",
"AE_AML_INFINITE_LOOP" "A method did not return a required value"),
EXCEP_TXT("AE_AML_METHOD_LIMIT",
"A control method reached the maximum reentrancy limit of 255"),
EXCEP_TXT("AE_AML_NOT_OWNER",
"A thread tried to release a mutex that it does not own"),
EXCEP_TXT("AE_AML_MUTEX_ORDER", "Mutex SyncLevel release mismatch"),
EXCEP_TXT("AE_AML_MUTEX_NOT_ACQUIRED",
"Attempt to release a mutex that was not previously acquired"),
EXCEP_TXT("AE_AML_INVALID_RESOURCE_TYPE",
"Invalid resource type in resource list"),
EXCEP_TXT("AE_AML_INVALID_INDEX",
"Invalid Argx or Localx (x too large)"),
EXCEP_TXT("AE_AML_REGISTER_LIMIT",
"Bank value or Index value beyond range of register"),
EXCEP_TXT("AE_AML_NO_WHILE", "Break or Continue without a While"),
EXCEP_TXT("AE_AML_ALIGNMENT",
"Non-aligned memory transfer on platform that does not support this"),
EXCEP_TXT("AE_AML_NO_RESOURCE_END_TAG",
"No End Tag in a resource list"),
EXCEP_TXT("AE_AML_BAD_RESOURCE_VALUE",
"Invalid value of a resource element"),
EXCEP_TXT("AE_AML_CIRCULAR_REFERENCE",
"Two references refer to each other"),
EXCEP_TXT("AE_AML_BAD_RESOURCE_LENGTH",
"The length of a Resource Descriptor in the AML is incorrect"),
EXCEP_TXT("AE_AML_ILLEGAL_ADDRESS",
"A memory, I/O, or PCI configuration address is invalid"),
EXCEP_TXT("AE_AML_INFINITE_LOOP",
"An apparent infinite AML While loop, method was aborted")
}; };
char const *acpi_gbl_exception_names_ctrl[] = { static const struct acpi_exception_info acpi_gbl_exception_names_ctrl[] = {
NULL, EXCEP_TXT(NULL, NULL),
"AE_CTRL_RETURN_VALUE", EXCEP_TXT("AE_CTRL_RETURN_VALUE", "A Method returned a value"),
"AE_CTRL_PENDING", EXCEP_TXT("AE_CTRL_PENDING", "Method is calling another method"),
"AE_CTRL_TERMINATE", EXCEP_TXT("AE_CTRL_TERMINATE", "Terminate the executing method"),
"AE_CTRL_TRUE", EXCEP_TXT("AE_CTRL_TRUE", "An If or While predicate result"),
"AE_CTRL_FALSE", EXCEP_TXT("AE_CTRL_FALSE", "An If or While predicate result"),
"AE_CTRL_DEPTH", EXCEP_TXT("AE_CTRL_DEPTH", "Maximum search depth has been reached"),
"AE_CTRL_END", EXCEP_TXT("AE_CTRL_END", "An If or While predicate is false"),
"AE_CTRL_TRANSFER", EXCEP_TXT("AE_CTRL_TRANSFER", "Transfer control to called method"),
"AE_CTRL_BREAK", EXCEP_TXT("AE_CTRL_BREAK", "A Break has been executed"),
"AE_CTRL_CONTINUE", EXCEP_TXT("AE_CTRL_CONTINUE", "A Continue has been executed"),
"AE_CTRL_SKIP", EXCEP_TXT("AE_CTRL_SKIP", "Not currently used"),
"AE_CTRL_PARSE_CONTINUE", EXCEP_TXT("AE_CTRL_PARSE_CONTINUE", "Used to skip over bad opcodes"),
"AE_CTRL_PARSE_PENDING" EXCEP_TXT("AE_CTRL_PARSE_PENDING", "Used to implement AML While loops")
}; };
#endif /* EXCEPTION_TABLE */ #endif /* EXCEPTION_TABLE */
......
include/acpi/acoutput.h
View file @ 0ad4991c
...@@ -324,9 +324,9 @@ ...@@ -324,9 +324,9 @@
/* Helper macro */ /* Helper macro */
#define ACPI_TRACE_ENTRY(name, function, cast, param) \ #define ACPI_TRACE_ENTRY(name, function, type, param) \
ACPI_FUNCTION_NAME (name) \ ACPI_FUNCTION_NAME (name) \
function (ACPI_DEBUG_PARAMETERS, cast (param)) function (ACPI_DEBUG_PARAMETERS, (type) (param))
/* The actual entry trace macros */ /* The actual entry trace macros */
...@@ -335,13 +335,13 @@ ...@@ -335,13 +335,13 @@
acpi_ut_trace (ACPI_DEBUG_PARAMETERS) acpi_ut_trace (ACPI_DEBUG_PARAMETERS)
#define ACPI_FUNCTION_TRACE_PTR(name, pointer) \ #define ACPI_FUNCTION_TRACE_PTR(name, pointer) \
ACPI_TRACE_ENTRY (name, acpi_ut_trace_ptr, (void *), pointer) ACPI_TRACE_ENTRY (name, acpi_ut_trace_ptr, void *, pointer)
#define ACPI_FUNCTION_TRACE_U32(name, value) \ #define ACPI_FUNCTION_TRACE_U32(name, value) \
ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, (u32), value) ACPI_TRACE_ENTRY (name, acpi_ut_trace_u32, u32, value)
#define ACPI_FUNCTION_TRACE_STR(name, string) \ #define ACPI_FUNCTION_TRACE_STR(name, string) \
ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, (char *), string) ACPI_TRACE_ENTRY (name, acpi_ut_trace_str, char *, string)
#define ACPI_FUNCTION_ENTRY() \ #define ACPI_FUNCTION_ENTRY() \
acpi_ut_track_stack_ptr() acpi_ut_track_stack_ptr()
...@@ -355,16 +355,37 @@ ...@@ -355,16 +355,37 @@
* *
* One of the FUNCTION_TRACE macros above must be used in conjunction * One of the FUNCTION_TRACE macros above must be used in conjunction
* with these macros so that "_AcpiFunctionName" is defined. * with these macros so that "_AcpiFunctionName" is defined.
*
* There are two versions of most of the return macros. The default version is
* safer, since it avoids side-effects by guaranteeing that the argument will
* not be evaluated twice.
*
* A less-safe version of the macros is provided for optional use if the
* compiler uses excessive CPU stack (for example, this may happen in the
* debug case if code optimzation is disabled.)
*/ */
/* Exit trace helper macro */ /* Exit trace helper macro */
#define ACPI_TRACE_EXIT(function, cast, param) \ #ifndef ACPI_SIMPLE_RETURN_MACROS
#define ACPI_TRACE_EXIT(function, type, param) \
ACPI_DO_WHILE0 ({ \
register type _param = (type) (param); \
function (ACPI_DEBUG_PARAMETERS, _param); \
return (_param); \
})
#else /* Use original less-safe macros */
#define ACPI_TRACE_EXIT(function, type, param) \
ACPI_DO_WHILE0 ({ \ ACPI_DO_WHILE0 ({ \
function (ACPI_DEBUG_PARAMETERS, cast (param)); \ function (ACPI_DEBUG_PARAMETERS, (type) (param)); \
return ((param)); \ return (param); \
}) })
#endif /* ACPI_SIMPLE_RETURN_MACROS */
/* The actual exit macros */ /* The actual exit macros */
#define return_VOID \ #define return_VOID \
...@@ -374,13 +395,19 @@ ...@@ -374,13 +395,19 @@
}) })
#define return_ACPI_STATUS(status) \ #define return_ACPI_STATUS(status) \
ACPI_TRACE_EXIT (acpi_ut_status_exit, (acpi_status), status) ACPI_TRACE_EXIT (acpi_ut_status_exit, acpi_status, status)
#define return_PTR(pointer) \ #define return_PTR(pointer) \
ACPI_TRACE_EXIT (acpi_ut_ptr_exit, (u8 *), pointer) ACPI_TRACE_EXIT (acpi_ut_ptr_exit, void *, pointer)
#define return_VALUE(value) \ #define return_VALUE(value) \
ACPI_TRACE_EXIT (acpi_ut_value_exit, (u64), value) ACPI_TRACE_EXIT (acpi_ut_value_exit, u64, value)
#define return_UINT32(value) \
ACPI_TRACE_EXIT (acpi_ut_value_exit, u32, value)
#define return_UINT8(value) \
ACPI_TRACE_EXIT (acpi_ut_value_exit, u8, value)
/* Conditional execution */ /* Conditional execution */
...@@ -428,8 +455,10 @@ ...@@ -428,8 +455,10 @@
#define return_VOID return #define return_VOID return
#define return_ACPI_STATUS(s) return(s) #define return_ACPI_STATUS(s) return(s)
#define return_VALUE(s) return(s)
#define return_PTR(s) return(s) #define return_PTR(s) return(s)
#define return_VALUE(s) return(s)
#define return_UINT8(s) return(s)
#define return_UINT32(s) return(s)
#endif /* ACPI_DEBUG_OUTPUT */ #endif /* ACPI_DEBUG_OUTPUT */
......
include/acpi/acpixf.h
View file @ 0ad4991c
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */ /* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20130117 #define ACPI_CA_VERSION 0x20130328
#include <acpi/acconfig.h> #include <acpi/acconfig.h>
#include <acpi/actypes.h> #include <acpi/actypes.h>
......
include/acpi/actbl2.h
View file @ 0ad4991c
...@@ -72,11 +72,13 @@ ...@@ -72,11 +72,13 @@
#define ACPI_SIG_IVRS "IVRS" /* I/O Virtualization Reporting Structure */ #define ACPI_SIG_IVRS "IVRS" /* I/O Virtualization Reporting Structure */
#define ACPI_SIG_MCFG "MCFG" /* PCI Memory Mapped Configuration table */ #define ACPI_SIG_MCFG "MCFG" /* PCI Memory Mapped Configuration table */
#define ACPI_SIG_MCHI "MCHI" /* Management Controller Host Interface table */ #define ACPI_SIG_MCHI "MCHI" /* Management Controller Host Interface table */
#define ACPI_SIG_MTMR "MTMR" /* MID Timer table */
#define ACPI_SIG_SLIC "SLIC" /* Software Licensing Description Table */ #define ACPI_SIG_SLIC "SLIC" /* Software Licensing Description Table */
#define ACPI_SIG_SPCR "SPCR" /* Serial Port Console Redirection table */ #define ACPI_SIG_SPCR "SPCR" /* Serial Port Console Redirection table */
#define ACPI_SIG_SPMI "SPMI" /* Server Platform Management Interface table */ #define ACPI_SIG_SPMI "SPMI" /* Server Platform Management Interface table */
#define ACPI_SIG_TCPA "TCPA" /* Trusted Computing Platform Alliance table */ #define ACPI_SIG_TCPA "TCPA" /* Trusted Computing Platform Alliance table */
#define ACPI_SIG_UEFI "UEFI" /* Uefi Boot Optimization Table */ #define ACPI_SIG_UEFI "UEFI" /* Uefi Boot Optimization Table */
#define ACPI_SIG_VRTC "VRTC" /* Virtual Real Time Clock Table */
#define ACPI_SIG_WAET "WAET" /* Windows ACPI Emulated devices Table */ #define ACPI_SIG_WAET "WAET" /* Windows ACPI Emulated devices Table */
#define ACPI_SIG_WDAT "WDAT" /* Watchdog Action Table */ #define ACPI_SIG_WDAT "WDAT" /* Watchdog Action Table */
#define ACPI_SIG_WDDT "WDDT" /* Watchdog Timer Description Table */ #define ACPI_SIG_WDDT "WDDT" /* Watchdog Timer Description Table */
...@@ -850,6 +852,29 @@ struct acpi_table_mchi { ...@@ -850,6 +852,29 @@ struct acpi_table_mchi {
u8 pci_function; u8 pci_function;
}; };
/*******************************************************************************
*
* MTMR - MID Timer Table
* Version 1
*
* Conforms to "Simple Firmware Interface Specification",
* Draft 0.8.2, Oct 19, 2010
* NOTE: The ACPI MTMR is equivalent to the SFI MTMR table.
*
******************************************************************************/
struct acpi_table_mtmr {
struct acpi_table_header header; /* Common ACPI table header */
};
/* MTMR entry */
struct acpi_mtmr_entry {
struct acpi_generic_address physical_address;
u32 frequency;
u32 irq;
};
/******************************************************************************* /*******************************************************************************
* *
* SLIC - Software Licensing Description Table * SLIC - Software Licensing Description Table
...@@ -1023,6 +1048,28 @@ struct acpi_table_uefi { ...@@ -1023,6 +1048,28 @@ struct acpi_table_uefi {
u16 data_offset; /* Offset of remaining data in table */ u16 data_offset; /* Offset of remaining data in table */
}; };
/*******************************************************************************
*
* VRTC - Virtual Real Time Clock Table
* Version 1
*
* Conforms to "Simple Firmware Interface Specification",
* Draft 0.8.2, Oct 19, 2010
* NOTE: The ACPI VRTC is equivalent to The SFI MRTC table.
*
******************************************************************************/
struct acpi_table_vrtc {
struct acpi_table_header header; /* Common ACPI table header */
};
/* VRTC entry */
struct acpi_vrtc_entry {
struct acpi_generic_address physical_address;
u32 irq;
};
/******************************************************************************* /*******************************************************************************
* *
* WAET - Windows ACPI Emulated devices Table * WAET - Windows ACPI Emulated devices Table
......
include/acpi/actbl3.h
View file @ 0ad4991c
...@@ -174,7 +174,7 @@ struct acpi_fpdt_header { ...@@ -174,7 +174,7 @@ struct acpi_fpdt_header {
enum acpi_fpdt_type { enum acpi_fpdt_type {
ACPI_FPDT_TYPE_BOOT = 0, ACPI_FPDT_TYPE_BOOT = 0,
ACPI_FPDT_TYPE_S3PERF = 1, ACPI_FPDT_TYPE_S3PERF = 1
}; };
/* /*
...@@ -223,7 +223,7 @@ struct acpi_s3pt_header { ...@@ -223,7 +223,7 @@ struct acpi_s3pt_header {
enum acpi_s3pt_type { enum acpi_s3pt_type {
ACPI_S3PT_TYPE_RESUME = 0, ACPI_S3PT_TYPE_RESUME = 0,
ACPI_S3PT_TYPE_SUSPEND = 1, ACPI_S3PT_TYPE_SUSPEND = 1
}; };
struct acpi_s3pt_resume { struct acpi_s3pt_resume {
...@@ -505,26 +505,59 @@ struct acpi_rasf_shared_memory { ...@@ -505,26 +505,59 @@ struct acpi_rasf_shared_memory {
u32 signature; u32 signature;
u16 command; u16 command;
u16 status; u16 status;
u64 requested_address; u16 version;
u64 requested_length; u8 capabilities[16];
u64 actual_address; u8 set_capabilities[16];
u64 actual_length; u16 num_parameter_blocks;
u32 set_capabilities_status;
};
/* RASF Parameter Block Structure Header */
struct acpi_rasf_parameter_block {
u16 type;
u16 version;
u16 length;
};
/* RASF Parameter Block Structure for PATROL_SCRUB */
struct acpi_rasf_patrol_scrub_parameter {
struct acpi_rasf_parameter_block header;
u16 patrol_scrub_command;
u64 requested_address_range[2];
u64 actual_address_range[2];
u16 flags; u16 flags;
u8 speed; u8 requested_speed;
}; };
/* Masks for Flags and Speed fields above */ /* Masks for Flags and Speed fields above */
#define ACPI_RASF_SCRUBBER_RUNNING 1 #define ACPI_RASF_SCRUBBER_RUNNING 1
#define ACPI_RASF_SPEED (7<<1) #define ACPI_RASF_SPEED (7<<1)
#define ACPI_RASF_SPEED_SLOW (0<<1)
#define ACPI_RASF_SPEED_MEDIUM (4<<1)
#define ACPI_RASF_SPEED_FAST (7<<1)
/* Channel Commands */ /* Channel Commands */
enum acpi_rasf_commands { enum acpi_rasf_commands {
ACPI_RASF_GET_RAS_CAPABILITIES = 1, ACPI_RASF_EXECUTE_RASF_COMMAND = 1
ACPI_RASF_GET_PATROL_PARAMETERS = 2, };
ACPI_RASF_START_PATROL_SCRUBBER = 3,
ACPI_RASF_STOP_PATROL_SCRUBBER = 4 /* Platform RAS Capabilities */
enum acpi_rasf_capabiliities {
ACPI_HW_PATROL_SCRUB_SUPPORTED = 0,
ACPI_SW_PATROL_SCRUB_EXPOSED = 1
};
/* Patrol Scrub Commands */
enum acpi_rasf_patrol_scrub_commands {
ACPI_RASF_GET_PATROL_PARAMETERS = 1,
ACPI_RASF_START_PATROL_SCRUBBER = 2,
ACPI_RASF_STOP_PATROL_SCRUBBER = 3
}; };
/* Channel Command flags */ /* Channel Command flags */
......
include/acpi/actypes.h
View file @ 0ad4991c
...@@ -1128,7 +1128,6 @@ struct acpi_memory_list { ...@@ -1128,7 +1128,6 @@ struct acpi_memory_list {
u16 object_size; u16 object_size;
u16 max_depth; u16 max_depth;
u16 current_depth; u16 current_depth;
u16 link_offset;
#ifdef ACPI_DBG_TRACK_ALLOCATIONS #ifdef ACPI_DBG_TRACK_ALLOCATIONS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7