ACPICA: Cleanup/improve global variable declarations. (3aa0b085) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/acpi/acpica/acglobal.h

+171 −182

Original line number	Original line	Diff line number	Diff line
	@@ -53,11 +53,19 @@
	* to simplify maintenance of the code.		* to simplify maintenance of the code.
	*/		*/
	#ifdef DEFINE_ACPI_GLOBALS		#ifdef DEFINE_ACPI_GLOBALS
	#define ACPI_EXTERN		#define ACPI_GLOBAL(type,name) \
	#define ACPI_INIT_GLOBAL(a,b) a=b		extern type name; \
			type name

			#define ACPI_INIT_GLOBAL(type,name,value) \
			type name=value

	#else		#else
	#define ACPI_EXTERN extern		#define ACPI_GLOBAL(type,name) \
	#define ACPI_INIT_GLOBAL(a,b) a		extern type name

			#define ACPI_INIT_GLOBAL(type,name,value) \
			extern type name
	#endif		#endif

	#ifdef DEFINE_ACPI_GLOBALS		#ifdef DEFINE_ACPI_GLOBALS
	@@ -84,7 +92,7 @@
	* 5) Allow unresolved references (invalid target name) in package objects		* 5) Allow unresolved references (invalid target name) in package objects
	* 6) Enable warning messages for behavior that is not ACPI spec compliant		* 6) Enable warning messages for behavior that is not ACPI spec compliant
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_enable_interpreter_slack, FALSE);

	/*		/*
	* Automatically serialize ALL control methods? Default is FALSE, meaning		* Automatically serialize ALL control methods? Default is FALSE, meaning
	@@ -92,25 +100,25 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_interpreter_slack, FALSE);
	* Only change this if the ASL code is poorly written and cannot handle		* Only change this if the ASL code is poorly written and cannot handle
	* reentrancy even though methods are marked "NotSerialized".		* reentrancy even though methods are marked "NotSerialized".
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_all_methods_serialized, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_all_methods_serialized, FALSE);

	/*		/*
	* Create the predefined _OSI method in the namespace? Default is TRUE		* Create the predefined _OSI method in the namespace? Default is TRUE
	* because ACPI CA is fully compatible with other ACPI implementations.		* because ACPI CA is fully compatible with other ACPI implementations.
	* Changing this will revert ACPI CA (and machine ASL) to pre-OSI behavior.		* Changing this will revert ACPI CA (and machine ASL) to pre-OSI behavior.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_create_osi_method, TRUE);

	/*		/*
	* Optionally use default values for the ACPI register widths. Set this to		* Optionally use default values for the ACPI register widths. Set this to
	* TRUE to use the defaults, if an FADT contains incorrect widths/lengths.		* TRUE to use the defaults, if an FADT contains incorrect widths/lengths.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, TRUE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_use_default_register_widths, TRUE);

	/*		/*
	* Optionally enable output from the AML Debug Object.		* Optionally enable output from the AML Debug Object.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_enable_aml_debug_object, FALSE);

	/*		/*
	* Optionally copy the entire DSDT to local memory (instead of simply		* Optionally copy the entire DSDT to local memory (instead of simply
	@@ -118,7 +126,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE);
	* DSDT, creating the need for this option. Default is FALSE, do not copy		* DSDT, creating the need for this option. Default is FALSE, do not copy
	* the DSDT.		* the DSDT.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_copy_dsdt_locally, FALSE);

	/*		/*
	* Optionally ignore an XSDT if present and use the RSDT instead.		* Optionally ignore an XSDT if present and use the RSDT instead.
	@@ -126,7 +134,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE);
	* of the RSDT, the XSDT has been found to be corrupt or ill-formed on		* of the RSDT, the XSDT has been found to be corrupt or ill-formed on
	* some machines. Default behavior is to use the XSDT if present.		* some machines. Default behavior is to use the XSDT if present.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_do_not_use_xsdt, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_do_not_use_xsdt, FALSE);

	/*		/*
	* Optionally use 32-bit FADT addresses if and when there is a conflict		* Optionally use 32-bit FADT addresses if and when there is a conflict
	@@ -136,7 +144,7 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_do_not_use_xsdt, FALSE);
	* some machines have been found to have a corrupted non-zero 64-bit		* some machines have been found to have a corrupted non-zero 64-bit
	* address. Default is FALSE, do not favor the 32-bit addresses.		* address. Default is FALSE, do not favor the 32-bit addresses.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_use32_bit_fadt_addresses, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_use32_bit_fadt_addresses, FALSE);

	/*		/*
	* Optionally truncate I/O addresses to 16 bits. Provides compatibility		* Optionally truncate I/O addresses to 16 bits. Provides compatibility
	@@ -144,47 +152,28 @@ u8 ACPI_INIT_GLOBAL(acpi_gbl_use32_bit_fadt_addresses, FALSE);
	* this value is set to TRUE if any Windows OSI strings have been		* this value is set to TRUE if any Windows OSI strings have been
	* requested by the BIOS.		* requested by the BIOS.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_truncate_io_addresses, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_truncate_io_addresses, FALSE);

	/*		/*
	* Disable runtime checking and repair of values returned by control methods.		* Disable runtime checking and repair of values returned by control methods.
	* Use only if the repair is causing a problem on a particular machine.		* Use only if the repair is causing a problem on a particular machine.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_auto_repair, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_auto_repair, FALSE);

	/*		/*
	* Optionally do not load any SSDTs from the RSDT/XSDT during initialization.		* Optionally do not load any SSDTs from the RSDT/XSDT during initialization.
	* This can be useful for debugging ACPI problems on some machines.		* This can be useful for debugging ACPI problems on some machines.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_disable_ssdt_table_load, FALSE);		ACPI_INIT_GLOBAL(u8, acpi_gbl_disable_ssdt_table_load, FALSE);

	/*		/*
	* We keep track of the latest version of Windows that has been requested by		* We keep track of the latest version of Windows that has been requested by
	* the BIOS.		* the BIOS.
	*/		*/
	u8 ACPI_INIT_GLOBAL(acpi_gbl_osi_data, 0);		ACPI_INIT_GLOBAL(u8, acpi_gbl_osi_data, 0);

	/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */

	struct acpi_table_fadt acpi_gbl_FADT;
	u32 acpi_current_gpe_count;
	u32 acpi_gbl_trace_flags;
	acpi_name acpi_gbl_trace_method_name;
	u8 acpi_gbl_system_awake_and_running;

	/*
	* ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
	* that the ACPI hardware is no longer required. A flag in the FADT indicates
	* a reduced HW machine, and that flag is duplicated here for convenience.
	*/
	u8 acpi_gbl_reduced_hardware;

	#endif /* DEFINE_ACPI_GLOBALS */		#endif /* DEFINE_ACPI_GLOBALS */

	/* Do not disassemble buffers to resource descriptors */

	ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);

	/*****************************************************************************		/*****************************************************************************
	*		*
	* ACPI Table globals		* ACPI Table globals
	@@ -192,37 +181,36 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);
	****************************************************************************/		****************************************************************************/

	/*		/*
	* acpi_gbl_root_table_list is the master list of ACPI tables that were		* Master list of all ACPI tables that were found in the RSDT/XSDT.
	* found in the RSDT/XSDT.
	*/		*/
	ACPI_EXTERN struct acpi_table_list acpi_gbl_root_table_list;		ACPI_GLOBAL(struct acpi_table_list, acpi_gbl_root_table_list);

			/* DSDT information. Used to check for DSDT corruption */

			ACPI_GLOBAL(struct acpi_table_header *, acpi_gbl_DSDT);
			ACPI_GLOBAL(struct acpi_table_header, acpi_gbl_original_dsdt_header);

	#if (!ACPI_REDUCED_HARDWARE)		#if (!ACPI_REDUCED_HARDWARE)
	ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;		ACPI_GLOBAL(struct acpi_table_facs *, acpi_gbl_FACS);

	#endif /* !ACPI_REDUCED_HARDWARE */		#endif /* !ACPI_REDUCED_HARDWARE */

	/* These addresses are calculated from the FADT Event Block addresses */		/* These addresses are calculated from the FADT Event Block addresses */

	ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_status;		ACPI_GLOBAL(struct acpi_generic_address, acpi_gbl_xpm1a_status);
	ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_enable;		ACPI_GLOBAL(struct acpi_generic_address, acpi_gbl_xpm1a_enable);

	ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_status;
	ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1b_enable;

	/* DSDT information. Used to check for DSDT corruption */		ACPI_GLOBAL(struct acpi_generic_address, acpi_gbl_xpm1b_status);
			ACPI_GLOBAL(struct acpi_generic_address, acpi_gbl_xpm1b_enable);
	ACPI_EXTERN struct acpi_table_header *acpi_gbl_DSDT;
	ACPI_EXTERN struct acpi_table_header acpi_gbl_original_dsdt_header;

	/*		/*
	* Handle both ACPI 1.0 and ACPI 2.0 Integer widths. The integer width is		* Handle both ACPI 1.0 and ACPI 2.0+ Integer widths. The integer width is
	* determined by the revision of the DSDT: If the DSDT revision is less than		* determined by the revision of the DSDT: If the DSDT revision is less than
	* 2, use only the lower 32 bits of the internal 64-bit Integer.		* 2, use only the lower 32 bits of the internal 64-bit Integer.
	*/		*/
	ACPI_EXTERN u8 acpi_gbl_integer_bit_width;		ACPI_GLOBAL(u8, acpi_gbl_integer_bit_width);
	ACPI_EXTERN u8 acpi_gbl_integer_byte_width;		ACPI_GLOBAL(u8, acpi_gbl_integer_byte_width);
	ACPI_EXTERN u8 acpi_gbl_integer_nybble_width;		ACPI_GLOBAL(u8, acpi_gbl_integer_nybble_width);

	/*****************************************************************************		/*****************************************************************************
	*		*
	@@ -235,36 +223,36 @@ ACPI_EXTERN u8 acpi_gbl_integer_nybble_width;
	* actual OS mutex handles, indexed by the local ACPI_MUTEX_HANDLEs.		* actual OS mutex handles, indexed by the local ACPI_MUTEX_HANDLEs.
	* (The table maps local handles to the real OS handles)		* (The table maps local handles to the real OS handles)
	*/		*/
	ACPI_EXTERN struct acpi_mutex_info acpi_gbl_mutex_info[ACPI_NUM_MUTEX];		ACPI_GLOBAL(struct acpi_mutex_info, acpi_gbl_mutex_info[ACPI_NUM_MUTEX]);

	/*		/*
	* Global lock mutex is an actual AML mutex object		* Global lock mutex is an actual AML mutex object
	* Global lock semaphore works in conjunction with the actual global lock		* Global lock semaphore works in conjunction with the actual global lock
	* Global lock spinlock is used for "pending" handshake		* Global lock spinlock is used for "pending" handshake
	*/		*/
	ACPI_EXTERN union acpi_operand_object *acpi_gbl_global_lock_mutex;		ACPI_GLOBAL(union acpi_operand_object *, acpi_gbl_global_lock_mutex);
	ACPI_EXTERN acpi_semaphore acpi_gbl_global_lock_semaphore;		ACPI_GLOBAL(acpi_semaphore, acpi_gbl_global_lock_semaphore);
	ACPI_EXTERN acpi_spinlock acpi_gbl_global_lock_pending_lock;		ACPI_GLOBAL(acpi_spinlock, acpi_gbl_global_lock_pending_lock);
	ACPI_EXTERN u16 acpi_gbl_global_lock_handle;		ACPI_GLOBAL(u16, acpi_gbl_global_lock_handle);
	ACPI_EXTERN u8 acpi_gbl_global_lock_acquired;		ACPI_GLOBAL(u8, acpi_gbl_global_lock_acquired);
	ACPI_EXTERN u8 acpi_gbl_global_lock_present;		ACPI_GLOBAL(u8, acpi_gbl_global_lock_present);
	ACPI_EXTERN u8 acpi_gbl_global_lock_pending;		ACPI_GLOBAL(u8, acpi_gbl_global_lock_pending);

	/*		/*
	* Spinlocks are used for interfaces that can be possibly called at		* Spinlocks are used for interfaces that can be possibly called at
	* interrupt level		* interrupt level
	*/		*/
	ACPI_EXTERN acpi_spinlock acpi_gbl_gpe_lock; /* For GPE data structs and registers */		ACPI_GLOBAL(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_GLOBAL(acpi_spinlock, acpi_gbl_hardware_lock); /* For ACPI H/W except GPE registers */
	ACPI_EXTERN acpi_spinlock acpi_gbl_reference_count_lock;		ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);

	/* Mutex for _OSI support */		/* Mutex for _OSI support */

	ACPI_EXTERN acpi_mutex acpi_gbl_osi_mutex;		ACPI_GLOBAL(acpi_mutex, acpi_gbl_osi_mutex);

	/* Reader/Writer lock is used for namespace walk and dynamic table unload */		/* Reader/Writer lock is used for namespace walk and dynamic table unload */

	ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;		ACPI_GLOBAL(struct acpi_rw_lock, acpi_gbl_namespace_rw_lock);

	/*****************************************************************************		/*****************************************************************************
	*		*
	@@ -274,70 +262,69 @@ ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;

	/* Object caches */		/* Object caches */

	ACPI_EXTERN acpi_cache_t *acpi_gbl_namespace_cache;		ACPI_GLOBAL(acpi_cache_t *, acpi_gbl_namespace_cache);
	ACPI_EXTERN acpi_cache_t *acpi_gbl_state_cache;		ACPI_GLOBAL(acpi_cache_t *, acpi_gbl_state_cache);
	ACPI_EXTERN acpi_cache_t *acpi_gbl_ps_node_cache;		ACPI_GLOBAL(acpi_cache_t *, acpi_gbl_ps_node_cache);
	ACPI_EXTERN acpi_cache_t *acpi_gbl_ps_node_ext_cache;		ACPI_GLOBAL(acpi_cache_t *, acpi_gbl_ps_node_ext_cache);
	ACPI_EXTERN acpi_cache_t *acpi_gbl_operand_cache;		ACPI_GLOBAL(acpi_cache_t *, acpi_gbl_operand_cache);

			/* System */

			ACPI_INIT_GLOBAL(u32, acpi_gbl_startup_flags, 0);
			ACPI_INIT_GLOBAL(u8, acpi_gbl_shutdown, TRUE);

	/* Global handlers */		/* Global handlers */

	ACPI_EXTERN struct acpi_global_notify_handler acpi_gbl_global_notify[2];		ACPI_GLOBAL(struct acpi_global_notify_handler, acpi_gbl_global_notify[2]);
	ACPI_EXTERN acpi_exception_handler acpi_gbl_exception_handler;		ACPI_GLOBAL(acpi_exception_handler, acpi_gbl_exception_handler);
	ACPI_EXTERN acpi_init_handler acpi_gbl_init_handler;		ACPI_GLOBAL(acpi_init_handler, acpi_gbl_init_handler);
	ACPI_EXTERN acpi_table_handler acpi_gbl_table_handler;		ACPI_GLOBAL(acpi_table_handler, acpi_gbl_table_handler);
	ACPI_EXTERN void *acpi_gbl_table_handler_context;		ACPI_GLOBAL(void *, acpi_gbl_table_handler_context);
	ACPI_EXTERN struct acpi_walk_state *acpi_gbl_breakpoint_walk;		ACPI_GLOBAL(struct acpi_walk_state *, acpi_gbl_breakpoint_walk);
	ACPI_EXTERN acpi_interface_handler acpi_gbl_interface_handler;		ACPI_GLOBAL(acpi_interface_handler, acpi_gbl_interface_handler);
	ACPI_EXTERN struct acpi_sci_handler_info *acpi_gbl_sci_handler_list;		ACPI_GLOBAL(struct acpi_sci_handler_info *, acpi_gbl_sci_handler_list);

	/* Owner ID support */		/* Owner ID support */

	ACPI_EXTERN u32 acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS];		ACPI_GLOBAL(u32, acpi_gbl_owner_id_mask[ACPI_NUM_OWNERID_MASKS]);
	ACPI_EXTERN u8 acpi_gbl_last_owner_id_index;		ACPI_GLOBAL(u8, acpi_gbl_last_owner_id_index);
	ACPI_EXTERN u8 acpi_gbl_next_owner_id_offset;		ACPI_GLOBAL(u8, acpi_gbl_next_owner_id_offset);

	/* Initialization sequencing */		/* Initialization sequencing */

	ACPI_EXTERN u8 acpi_gbl_reg_methods_executed;		ACPI_GLOBAL(u8, acpi_gbl_reg_methods_executed);

	/* Misc */		/* Misc */

	ACPI_EXTERN u32 acpi_gbl_original_mode;		ACPI_GLOBAL(u32, acpi_gbl_original_mode);
	ACPI_EXTERN u32 acpi_gbl_rsdp_original_location;		ACPI_GLOBAL(u32, acpi_gbl_rsdp_original_location);
	ACPI_EXTERN u32 acpi_gbl_ns_lookup_count;		ACPI_GLOBAL(u32, acpi_gbl_ns_lookup_count);
	ACPI_EXTERN u32 acpi_gbl_ps_find_count;		ACPI_GLOBAL(u32, acpi_gbl_ps_find_count);
	ACPI_EXTERN u16 acpi_gbl_pm1_enable_register_save;		ACPI_GLOBAL(u16, acpi_gbl_pm1_enable_register_save);
	ACPI_EXTERN u8 acpi_gbl_debugger_configuration;		ACPI_GLOBAL(u8, acpi_gbl_debugger_configuration);
	ACPI_EXTERN u8 acpi_gbl_step_to_next_call;		ACPI_GLOBAL(u8, acpi_gbl_step_to_next_call);
	ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;		ACPI_GLOBAL(u8, acpi_gbl_acpi_hardware_present);
	ACPI_EXTERN u8 acpi_gbl_events_initialized;		ACPI_GLOBAL(u8, acpi_gbl_events_initialized);
	ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;		ACPI_GLOBAL(struct acpi_interface_info *, acpi_gbl_supported_interfaces);
	ACPI_EXTERN struct acpi_address_range		ACPI_GLOBAL(struct acpi_address_range *,
	*acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX];		acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX]);

	#ifndef DEFINE_ACPI_GLOBALS		/* Other miscellaneous, declared and initialized in utglobal */

	/* Other miscellaneous */

	extern u8 acpi_gbl_shutdown;
	extern u32 acpi_gbl_startup_flags;
	extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT];		extern const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT];
	extern const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS];		extern const char *acpi_gbl_lowest_dstate_names[ACPI_NUM_sx_w_METHODS];
	extern const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS];		extern const char *acpi_gbl_highest_dstate_names[ACPI_NUM_sx_d_METHODS];
	extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];
	extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];		extern const char *acpi_gbl_region_types[ACPI_NUM_PREDEFINED_REGIONS];
			extern const struct acpi_opcode_info acpi_gbl_aml_op_info[AML_NUM_OPCODES];
	#endif

	#ifdef ACPI_DBG_TRACK_ALLOCATIONS		#ifdef ACPI_DBG_TRACK_ALLOCATIONS

	/* Lists for tracking memory allocations */		/* Lists for tracking memory allocations (debug only) */

	ACPI_EXTERN struct acpi_memory_list *acpi_gbl_global_list;		ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_global_list);
	ACPI_EXTERN struct acpi_memory_list *acpi_gbl_ns_node_list;		ACPI_GLOBAL(struct acpi_memory_list *, acpi_gbl_ns_node_list);
	ACPI_EXTERN u8 acpi_gbl_display_final_mem_stats;		ACPI_GLOBAL(u8, acpi_gbl_display_final_mem_stats);
	ACPI_EXTERN u8 acpi_gbl_disable_mem_tracking;		ACPI_GLOBAL(u8, acpi_gbl_disable_mem_tracking);
	#endif		#endif

	/*****************************************************************************		/*****************************************************************************
	@@ -352,22 +339,23 @@ ACPI_EXTERN u8 acpi_gbl_disable_mem_tracking;
	#define NUM_PREDEFINED_NAMES 9		#define NUM_PREDEFINED_NAMES 9
	#endif		#endif

	ACPI_EXTERN struct acpi_namespace_node acpi_gbl_root_node_struct;		ACPI_GLOBAL(struct acpi_namespace_node, acpi_gbl_root_node_struct);
	ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_root_node;		ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_root_node);
	ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_fadt_gpe_device;		ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_fadt_gpe_device);
	ACPI_EXTERN union acpi_operand_object *acpi_gbl_module_code_list;		ACPI_GLOBAL(union acpi_operand_object *, acpi_gbl_module_code_list);

	extern const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES];		extern const u8 acpi_gbl_ns_properties[ACPI_NUM_NS_TYPES];
	extern const struct acpi_predefined_names		extern const struct acpi_predefined_names
	acpi_gbl_pre_defined_names[NUM_PREDEFINED_NAMES];		acpi_gbl_pre_defined_names[NUM_PREDEFINED_NAMES];

	#ifdef ACPI_DEBUG_OUTPUT		#ifdef ACPI_DEBUG_OUTPUT
	ACPI_EXTERN u32 acpi_gbl_current_node_count;		ACPI_GLOBAL(u32, acpi_gbl_current_node_count);
	ACPI_EXTERN u32 acpi_gbl_current_node_size;		ACPI_GLOBAL(u32, acpi_gbl_current_node_size);
	ACPI_EXTERN u32 acpi_gbl_max_concurrent_node_count;		ACPI_GLOBAL(u32, acpi_gbl_max_concurrent_node_count);
	ACPI_EXTERN acpi_size *acpi_gbl_entry_stack_pointer;		ACPI_GLOBAL(acpi_size *, acpi_gbl_entry_stack_pointer);
	ACPI_EXTERN acpi_size *acpi_gbl_lowest_stack_pointer;		ACPI_GLOBAL(acpi_size *, acpi_gbl_lowest_stack_pointer);
	ACPI_EXTERN u32 acpi_gbl_deepest_nesting;		ACPI_GLOBAL(u32, acpi_gbl_deepest_nesting);
			ACPI_INIT_GLOBAL(u32, acpi_gbl_nesting_level, 0);
	#endif		#endif

	/*****************************************************************************		/*****************************************************************************
	@@ -376,11 +364,11 @@ ACPI_EXTERN u32 acpi_gbl_deepest_nesting;
	*		*
	****************************************************************************/		****************************************************************************/

	ACPI_EXTERN struct acpi_thread_state *acpi_gbl_current_walk_list;		ACPI_GLOBAL(struct acpi_thread_state *, acpi_gbl_current_walk_list);

	/* Control method single step flag */		/* Control method single step flag */

	ACPI_EXTERN u8 acpi_gbl_cm_single_step;		ACPI_GLOBAL(u8, acpi_gbl_cm_single_step);

	/*****************************************************************************		/*****************************************************************************
	*		*
	@@ -390,8 +378,9 @@ ACPI_EXTERN u8 acpi_gbl_cm_single_step;

	extern struct acpi_bit_register_info		extern struct acpi_bit_register_info
	acpi_gbl_bit_register_info[ACPI_NUM_BITREG];		acpi_gbl_bit_register_info[ACPI_NUM_BITREG];
	ACPI_EXTERN u8 acpi_gbl_sleep_type_a;
	ACPI_EXTERN u8 acpi_gbl_sleep_type_b;		ACPI_GLOBAL(u8, acpi_gbl_sleep_type_a);
			ACPI_GLOBAL(u8, acpi_gbl_sleep_type_b);

	/*****************************************************************************		/*****************************************************************************
	*		*
	@@ -401,14 +390,15 @@ ACPI_EXTERN u8 acpi_gbl_sleep_type_b;

	#if (!ACPI_REDUCED_HARDWARE)		#if (!ACPI_REDUCED_HARDWARE)

	ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;		ACPI_GLOBAL(u8, acpi_gbl_all_gpes_initialized);
	ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;		ACPI_GLOBAL(struct acpi_gpe_xrupt_info *, acpi_gbl_gpe_xrupt_list_head);
	ACPI_EXTERN struct acpi_gpe_block_info		ACPI_GLOBAL(struct acpi_gpe_block_info *,
	*acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];		acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS]);
	ACPI_EXTERN acpi_gbl_event_handler acpi_gbl_global_event_handler;		ACPI_GLOBAL(acpi_gbl_event_handler, acpi_gbl_global_event_handler);
	ACPI_EXTERN void *acpi_gbl_global_event_handler_context;		ACPI_GLOBAL(void *, acpi_gbl_global_event_handler_context);
	ACPI_EXTERN struct acpi_fixed_event_handler		ACPI_GLOBAL(struct acpi_fixed_event_handler,
	acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS];		acpi_gbl_fixed_event_handlers[ACPI_NUM_FIXED_EVENTS]);

	extern struct acpi_fixed_event_info		extern struct acpi_fixed_event_info
	acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];		acpi_gbl_fixed_event_info[ACPI_NUM_FIXED_EVENTS];

	@@ -420,23 +410,19 @@ extern struct acpi_fixed_event_info
	*		*
	****************************************************************************/		****************************************************************************/

	/* Procedure nesting level for debug output */

	extern u32 acpi_gbl_nesting_level;

	/* Event counters */		/* Event counters */

	ACPI_EXTERN u32 acpi_method_count;		ACPI_GLOBAL(u32, acpi_method_count);
	ACPI_EXTERN u32 acpi_gpe_count;		ACPI_GLOBAL(u32, acpi_gpe_count);
	ACPI_EXTERN u32 acpi_sci_count;		ACPI_GLOBAL(u32, acpi_sci_count);
	ACPI_EXTERN u32 acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS];		ACPI_GLOBAL(u32, acpi_fixed_event_count[ACPI_NUM_FIXED_EVENTS]);

	/* Support for dynamic control method tracing mechanism */		/* Support for dynamic control method tracing mechanism */

	ACPI_EXTERN u32 acpi_gbl_original_dbg_level;		ACPI_GLOBAL(u32, acpi_gbl_original_dbg_level);
	ACPI_EXTERN u32 acpi_gbl_original_dbg_layer;		ACPI_GLOBAL(u32, acpi_gbl_original_dbg_layer);
	ACPI_EXTERN u32 acpi_gbl_trace_dbg_level;		ACPI_GLOBAL(u32, acpi_gbl_trace_dbg_level);
	ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;		ACPI_GLOBAL(u32, acpi_gbl_trace_dbg_layer);

	/*****************************************************************************		/*****************************************************************************
	*		*
	@@ -444,61 +430,64 @@ ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
	*		*
	****************************************************************************/		****************************************************************************/

	ACPI_EXTERN u8 acpi_gbl_db_output_flags;		ACPI_GLOBAL(u8, acpi_gbl_db_output_flags);

	#ifdef ACPI_DISASSEMBLER		#ifdef ACPI_DISASSEMBLER

	ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_ignore_noop_operator, FALSE);		/* Do not disassemble buffers to resource descriptors */

			ACPI_INIT_GLOBAL(u8, acpi_gbl_no_resource_disassembly, FALSE);
			ACPI_INIT_GLOBAL(u8, acpi_gbl_ignore_noop_operator, FALSE);

	ACPI_EXTERN u8 acpi_gbl_db_opt_disasm;		ACPI_GLOBAL(u8, acpi_gbl_db_opt_disasm);
	ACPI_EXTERN u8 acpi_gbl_db_opt_verbose;		ACPI_GLOBAL(u8, acpi_gbl_db_opt_verbose);
	ACPI_EXTERN u8 acpi_gbl_num_external_methods;		ACPI_GLOBAL(u8, acpi_gbl_num_external_methods);
	ACPI_EXTERN u32 acpi_gbl_resolved_external_methods;		ACPI_GLOBAL(u32, acpi_gbl_resolved_external_methods);
	ACPI_EXTERN struct acpi_external_list *acpi_gbl_external_list;		ACPI_GLOBAL(struct acpi_external_list *, acpi_gbl_external_list);
	ACPI_EXTERN struct acpi_external_file *acpi_gbl_external_file_list;		ACPI_GLOBAL(struct acpi_external_file *, acpi_gbl_external_file_list);
	#endif		#endif

	#ifdef ACPI_DEBUGGER		#ifdef ACPI_DEBUGGER

	extern u8 acpi_gbl_method_executing;		ACPI_INIT_GLOBAL(u8, acpi_gbl_db_terminate_threads, FALSE);
	extern u8 acpi_gbl_abort_method;		ACPI_INIT_GLOBAL(u8, acpi_gbl_abort_method, FALSE);
	extern u8 acpi_gbl_db_terminate_threads;		ACPI_INIT_GLOBAL(u8, acpi_gbl_method_executing, FALSE);

	ACPI_EXTERN u8 acpi_gbl_db_opt_tables;		ACPI_GLOBAL(u8, acpi_gbl_db_opt_tables);
	ACPI_EXTERN u8 acpi_gbl_db_opt_stats;		ACPI_GLOBAL(u8, acpi_gbl_db_opt_stats);
	ACPI_EXTERN u8 acpi_gbl_db_opt_ini_methods;		ACPI_GLOBAL(u8, acpi_gbl_db_opt_ini_methods);
	ACPI_EXTERN u8 acpi_gbl_db_opt_no_region_support;		ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_region_support);
	ACPI_EXTERN u8 acpi_gbl_db_output_to_file;		ACPI_GLOBAL(u8, acpi_gbl_db_output_to_file);
	ACPI_EXTERN char *acpi_gbl_db_buffer;		ACPI_GLOBAL(char *, acpi_gbl_db_buffer);
	ACPI_EXTERN char *acpi_gbl_db_filename;		ACPI_GLOBAL(char *, acpi_gbl_db_filename);
	ACPI_EXTERN u32 acpi_gbl_db_debug_level;		ACPI_GLOBAL(u32, acpi_gbl_db_debug_level);
	ACPI_EXTERN u32 acpi_gbl_db_console_debug_level;		ACPI_GLOBAL(u32, acpi_gbl_db_console_debug_level);
	ACPI_EXTERN struct acpi_namespace_node *acpi_gbl_db_scope_node;		ACPI_GLOBAL(struct acpi_namespace_node *, acpi_gbl_db_scope_node);

	ACPI_EXTERN char *acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS];		ACPI_GLOBAL(char *, acpi_gbl_db_args[ACPI_DEBUGGER_MAX_ARGS]);
	ACPI_EXTERN acpi_object_type acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS];		ACPI_GLOBAL(acpi_object_type, acpi_gbl_db_arg_types[ACPI_DEBUGGER_MAX_ARGS]);

	/* These buffers should all be the same size */		/* These buffers should all be the same size */

	ACPI_EXTERN char acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE];		ACPI_GLOBAL(char, acpi_gbl_db_line_buf[ACPI_DB_LINE_BUFFER_SIZE]);
	ACPI_EXTERN char acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE];		ACPI_GLOBAL(char, acpi_gbl_db_parsed_buf[ACPI_DB_LINE_BUFFER_SIZE]);
	ACPI_EXTERN char acpi_gbl_db_scope_buf[ACPI_DB_LINE_BUFFER_SIZE];		ACPI_GLOBAL(char, acpi_gbl_db_scope_buf[ACPI_DB_LINE_BUFFER_SIZE]);
	ACPI_EXTERN char acpi_gbl_db_debug_filename[ACPI_DB_LINE_BUFFER_SIZE];		ACPI_GLOBAL(char, acpi_gbl_db_debug_filename[ACPI_DB_LINE_BUFFER_SIZE]);

	/*		/*
	* Statistic globals		* Statistic globals
	*/		*/
	ACPI_EXTERN u16 acpi_gbl_obj_type_count[ACPI_TYPE_NS_NODE_MAX + 1];		ACPI_GLOBAL(u16, acpi_gbl_obj_type_count[ACPI_TYPE_NS_NODE_MAX + 1]);
	ACPI_EXTERN u16 acpi_gbl_node_type_count[ACPI_TYPE_NS_NODE_MAX + 1];		ACPI_GLOBAL(u16, acpi_gbl_node_type_count[ACPI_TYPE_NS_NODE_MAX + 1]);
	ACPI_EXTERN u16 acpi_gbl_obj_type_count_misc;		ACPI_GLOBAL(u16, acpi_gbl_obj_type_count_misc);
	ACPI_EXTERN u16 acpi_gbl_node_type_count_misc;		ACPI_GLOBAL(u16, acpi_gbl_node_type_count_misc);
	ACPI_EXTERN u32 acpi_gbl_num_nodes;		ACPI_GLOBAL(u32, acpi_gbl_num_nodes);
	ACPI_EXTERN u32 acpi_gbl_num_objects;		ACPI_GLOBAL(u32, acpi_gbl_num_objects);

	ACPI_EXTERN u32 acpi_gbl_size_of_parse_tree;		ACPI_GLOBAL(u32, acpi_gbl_size_of_parse_tree);
	ACPI_EXTERN u32 acpi_gbl_size_of_method_trees;		ACPI_GLOBAL(u32, acpi_gbl_size_of_method_trees);
	ACPI_EXTERN u32 acpi_gbl_size_of_node_entries;		ACPI_GLOBAL(u32, acpi_gbl_size_of_node_entries);
	ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;		ACPI_GLOBAL(u32, acpi_gbl_size_of_acpi_objects);

	#endif /* ACPI_DEBUGGER */		#endif /* ACPI_DEBUGGER */

	@@ -510,7 +499,7 @@ ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;

	#ifdef ACPI_APPLICATION		#ifdef ACPI_APPLICATION

	ACPI_FILE ACPI_INIT_GLOBAL(acpi_gbl_debug_file, NULL);		ACPI_INIT_GLOBAL(ACPI_FILE, acpi_gbl_debug_file, NULL);

	#endif /* ACPI_APPLICATION */		#endif /* ACPI_APPLICATION */

drivers/acpi/acpica/utglobal.c

+18 −19

Original line number	Original line	Diff line number	Diff line
	@@ -55,31 +55,27 @@ ACPI_MODULE_NAME("utglobal")
	* Static global variable initialization.		* Static global variable initialization.
	*		*
	******************************************************************************/		******************************************************************************/
	/*		/* Debug output control masks */
	* We want the debug switches statically initialized so they
	* are already set when the debugger is entered.
	*/
	/* Debug switch - level and trace mask */
	u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;		u32 acpi_dbg_level = ACPI_DEBUG_DEFAULT;

	/* Debug switch - layer (component) mask */

	u32 acpi_dbg_layer = 0;		u32 acpi_dbg_layer = 0;
	u32 acpi_gbl_nesting_level = 0;

	/* Debugger globals */		/* acpi_gbl_FADT is a local copy of the FADT, converted to a common format. */

	u8 acpi_gbl_db_terminate_threads = FALSE;		struct acpi_table_fadt acpi_gbl_FADT;
	u8 acpi_gbl_abort_method = FALSE;		u32 acpi_gbl_trace_flags;
	u8 acpi_gbl_method_executing = FALSE;		acpi_name acpi_gbl_trace_method_name;
			u8 acpi_gbl_system_awake_and_running;
			u32 acpi_current_gpe_count;

	/* System flags */		/*
			* ACPI 5.0 introduces the concept of a "reduced hardware platform", meaning
	u32 acpi_gbl_startup_flags = 0;		* that the ACPI hardware is no longer required. A flag in the FADT indicates
			* a reduced HW machine, and that flag is duplicated here for convenience.
	/* System starts uninitialized */		*/
			u8 acpi_gbl_reduced_hardware;

	u8 acpi_gbl_shutdown = TRUE;		/* Various state name strings */

	const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT] = {		const char *acpi_gbl_sleep_state_names[ACPI_S_STATE_COUNT] = {
	"\\_S0_",		"\\_S0_",
	@@ -335,7 +331,6 @@ acpi_status acpi_ut_init_globals(void)

	acpi_gbl_DSDT = NULL;		acpi_gbl_DSDT = NULL;
	acpi_gbl_cm_single_step = FALSE;		acpi_gbl_cm_single_step = FALSE;
	acpi_gbl_db_terminate_threads = FALSE;
	acpi_gbl_shutdown = FALSE;		acpi_gbl_shutdown = FALSE;
	acpi_gbl_ns_lookup_count = 0;		acpi_gbl_ns_lookup_count = 0;
	acpi_gbl_ps_find_count = 0;		acpi_gbl_ps_find_count = 0;
	@@ -382,6 +377,10 @@ acpi_status acpi_ut_init_globals(void)
	acpi_gbl_disable_mem_tracking = FALSE;		acpi_gbl_disable_mem_tracking = FALSE;
	#endif		#endif

			#ifdef ACPI_DEBUGGER
			acpi_gbl_db_terminate_threads = FALSE;
			#endif

	return_ACPI_STATUS(AE_OK);		return_ACPI_STATUS(AE_OK);
	}		}