Commit 3e7cc142 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica: (21 commits)
  ACPICA: Update version to 20131218.
  ACPICA: Utilities: Cleanup declarations of the acpi_gbl_debug_file global.
  ACPICA: Linuxize: Cleanup spaces after special macro invocations.
  ACPICA: Interpreter: Add additional debug info for an error case.
  ACPICA: Update ACPI example code to make it an actual working program.
  ACPICA: Add an error message if the Debugger fails initialization.
  ACPICA: Conditionally define a local variable that is used for debug only.
  ACPICA: Parser: Updates/fixes for debug output.
  ACPICA: Enhance ACPI warning for memory/IO address conflicts.
  ACPICA: Update several debug statements - no functional change.
  ACPICA: Improve exception handling for GPE block installation.
  ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
  ACPICA: Tables: Add full support for the PCCT table, update table definition.
  ACPICA: Tables: Add full support for the DBG2 table.
  ACPICA: Add option to favor 32-bit FADT addresses.
  ACPICA: Cleanup the option of forcing the use of the RSDT.
  ACPICA: Back port and refine validation of the XSDT root table.
  ACPICA: Linux Header: Remove unused OSL prototypes.
  ACPICA: Remove unused ACPI_FREE_BUFFER macro. No functional change.
  ACPICA: Disassembler: Improve pathname support for emitted External() statements.
  ...
parents 25d412d9 c14ced04

arch/ia64/kernel/acpi.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 


#define PREFIX			"ACPI: "



u32 acpi_rsdt_forced;

unsigned int acpi_cpei_override;

unsigned int acpi_cpei_phys_cpuid;

arch/x86/kernel/acpi/boot.c

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 


#include "sleep.h" /* To include x86_acpi_suspend_lowlevel */

static int __initdata acpi_force = 0;

u32 acpi_rsdt_forced;

int acpi_disabled;

EXPORT_SYMBOL(acpi_disabled);
@@ -1564,7 +1563,7 @@ static int __init parse_acpi(char *arg) 
	}

	/* acpi=rsdt use RSDT instead of XSDT */

	else if (strcmp(arg, "rsdt") == 0) {

		acpi_rsdt_forced = 1;

		acpi_gbl_do_not_use_xsdt = TRUE;

	}

	/* "acpi=noirq" disables ACPI interrupt routing */

	else if (strcmp(arg, "noirq") == 0) {

drivers/acpi/acpica/acdebug.h

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ void acpi_db_display_handlers(void); 
ACPI_HW_DEPENDENT_RETURN_VOID(void

			      acpi_db_generate_gpe(char *gpe_arg,

						   char *block_arg))



ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_generate_sci(void))



/*

drivers/acpi/acpica/acevents.h

+5 −4
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ acpi_status acpi_ev_init_global_lock_handler(void); 


ACPI_HW_DEPENDENT_RETURN_OK(acpi_status

			    acpi_ev_acquire_global_lock(u16 timeout))



ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))

acpi_status acpi_ev_remove_global_lock_handler(void);
@@ -149,7 +148,9 @@ acpi_status 
acpi_ev_get_gpe_device(struct acpi_gpe_xrupt_info *gpe_xrupt_info,

		       struct acpi_gpe_block_info *gpe_block, void *context);



struct acpi_gpe_xrupt_info *acpi_ev_get_gpe_xrupt_block(u32 interrupt_number);

acpi_status

acpi_ev_get_gpe_xrupt_block(u32 interrupt_number,

			    struct acpi_gpe_xrupt_info **gpe_xrupt_block);



acpi_status acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt);

drivers/acpi/acpica/acglobal.h

+30 −0
Original line number Diff line number Diff line
@@ -118,6 +118,24 @@ bool ACPI_INIT_GLOBAL(acpi_gbl_enable_aml_debug_object, FALSE); 
 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_copy_dsdt_locally, FALSE);



/*

 * Optionally ignore an XSDT if present and use the RSDT instead.

 * Although the ACPI specification requires that an XSDT be used instead

 * 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.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_do_not_use_xsdt, FALSE);



/*

 * Optionally use 32-bit FADT addresses if and when there is a conflict

 * (address mismatch) between the 32-bit and 64-bit versions of the

 * address. Although ACPICA adheres to the ACPI specification which

 * requires the use of the corresponding 64-bit address if it is non-zero,

 * some machines have been found to have a corrupted non-zero 64-bit

 * address. Default is FALSE, do not favor the 32-bit addresses.

 */

u8 ACPI_INIT_GLOBAL(acpi_gbl_use32_bit_fadt_addresses, FALSE);



/*

 * Optionally truncate I/O addresses to 16 bits. Provides compatibility

 * with other ACPI implementations. NOTE: During ACPICA initialization,
@@ -482,6 +500,18 @@ ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects; 


#endif				/* ACPI_DEBUGGER */



/*****************************************************************************

 *

 * Application globals

 *

 ****************************************************************************/



#ifdef ACPI_APPLICATION



ACPI_FILE ACPI_INIT_GLOBAL(acpi_gbl_debug_file, NULL);



#endif				/* ACPI_APPLICATION */



/*****************************************************************************

 *

 * Info/help support

CRA Git | Maintained and supported by SUSTech CRA and CCSE