ACPICA: Cleanup for internal Reference Object

Fix some sloppiness in the Reference object. No longer use AML
opcodes to differentiate the types, introduce new reference
Class. Cleanup the debug output code.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

3 files changed, 30 insertions, 11 deletions

diff --git a/include/acpi/acdebug.h b/include/acpi/acdebug.h
index c5a1b50d8d94..a4fb001d96f1 100644
--- a/include/acpi/acdebug.h
+++ b/include/acpi/acdebug.h
@@ -123,6 +123,10 @@ void acpi_db_check_integrity(void);
 
 void acpi_db_generate_gpe(char *gpe_arg, char *block_arg);
 
+void acpi_db_check_predefined_names(void);
+
+void acpi_db_batch_execute(void);
+
 /*
  * dbdisply - debug display commands
  */
diff --git a/include/acpi/acdispat.h b/include/acpi/acdispat.h
index 21a73a105d0a..6291904be01e 100644
--- a/include/acpi/acdispat.h
+++ b/include/acpi/acdispat.h
@@ -157,7 +157,7 @@ acpi_ds_init_callbacks(struct acpi_walk_state *walk_state, u32 pass_number);
  * dsmthdat - method data (locals/args)
  */
 acpi_status
-acpi_ds_store_object_to_local(u16 opcode,
+acpi_ds_store_object_to_local(u8 type,
                               u32 index,
                               union acpi_operand_object *src_desc,
                               struct acpi_walk_state *walk_state);
@@ -173,7 +173,7 @@ void acpi_ds_method_data_delete_all(struct acpi_walk_state *walk_state);
 u8 acpi_ds_is_method_value(union acpi_operand_object *obj_desc);
 
 acpi_status
-acpi_ds_method_data_get_value(u16 opcode,
+acpi_ds_method_data_get_value(u8 type,
                               u32 index,
                               struct acpi_walk_state *walk_state,
                               union acpi_operand_object **dest_desc);
@@ -184,7 +184,7 @@ acpi_ds_method_data_init_args(union acpi_operand_object **params,
                               struct acpi_walk_state *walk_state);
 
 acpi_status
-acpi_ds_method_data_get_node(u16 opcode,
+acpi_ds_method_data_get_node(u8 type,
                              u32 index,
                              struct acpi_walk_state *walk_state,
                              struct acpi_namespace_node **node);
diff --git a/include/acpi/acobject.h b/include/acpi/acobject.h
index 7a8a652ffb78..eb6f038b03d9 100644
--- a/include/acpi/acobject.h
+++ b/include/acpi/acobject.h
@@ -308,19 +308,34 @@ struct acpi_object_addr_handler {
  *****************************************************************************/
 
 /*
- * The Reference object type is used for these opcodes:
- * Arg[0-6], Local[0-7], index_op, name_op, zero_op, one_op, ones_op, debug_op
+ * The Reference object is used for these opcodes:
+ * Arg[0-6], Local[0-7], index_op, name_op, ref_of_op, load_op, load_table_op, debug_op
+ * The Reference.Class differentiates these types.
  */
 struct acpi_object_reference {
-        ACPI_OBJECT_COMMON_HEADER u8 target_type;       /* Used for index_op */
-        u16 opcode;
+        ACPI_OBJECT_COMMON_HEADER u8 class;     /* Reference Class */
+        u8 target_type;         /* Used for Index Op */
+        u8 reserved;
         void *object;           /* name_op=>HANDLE to obj, index_op=>union acpi_operand_object */
-        struct acpi_namespace_node *node;
-        union acpi_operand_object **where;
-        u32 offset;             /* Used for arg_op, local_op, and index_op */
-        u32 value;              /* Used for ddb_handle */
+        struct acpi_namespace_node *node;       /* ref_of or Namepath */
+        union acpi_operand_object **where;      /* Target of Index */
+        u32 value;              /* Used for Local/Arg/Index/ddb_handle */
 };
 
+/* Values for Reference.Class above */
+
+typedef enum {
+        ACPI_REFCLASS_LOCAL = 0,        /* Method local */
+        ACPI_REFCLASS_ARG = 1,  /* Method argument */
+        ACPI_REFCLASS_REFOF = 2,        /* Result of ref_of() TBD: Split to Ref/Node and Ref/operand_obj? */
+        ACPI_REFCLASS_INDEX = 3,        /* Result of Index() */
+        ACPI_REFCLASS_TABLE = 4,        /* ddb_handle - Load(), load_table() */
+        ACPI_REFCLASS_NAME = 5, /* Reference to a named object */
+        ACPI_REFCLASS_DEBUG = 6,        /* Debug object */
+
+        ACPI_REFCLASS_MAX = 6
+} ACPI_REFERENCE_CLASSES;
+
 /*
  * Extra object is used as additional storage for types that
  * have AML code in their declarations (term_args) that must be