Commit 0e36d43c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpica' 

* acpica: (63 commits)
  ACPICA: Namespace: Remove _PRP method support.
  ACPI: Fix x86 regression related to early mapping size limitation
  ACPICA: Tables: Add mechanism to control early table checksum verification.
  ACPICA: acpidump: Fix repetitive table dump in -n mode.
  ACPI: Clean up acpi_os_map/unmap_memory() to eliminate __iomem.
  ACPICA: Clean up redudant definitions already defined elsewhere
  ACPICA: Linux headers: Add <asm/acenv.h> to remove mis-ordered inclusion of <asm/acpi.h>
  ACPICA: Linux headers: Add <acpi/platform/aclinuxex.h>
  ACPICA: Linux headers: Remove ACPI_PREEMPTION_POINT() due to no usages.
  ACPICA: Update version to 20140424.
  ACPICA: Comment/format update, no functional change.
  ACPICA: Events: Update GPE handling and initialization code.
  ACPICA: Remove extraneous error message for large number of GPEs.
  ACPICA: Tables: Remove old mechanism to validate if XSDT contains NULL entries.
  ACPICA: Tables: Add new mechanism to skip NULL entries in RSDT and XSDT.
  ACPICA: acpidump: Add support to force using RSDT.
  ACPICA: Back port of improvements on exception code.
  ACPICA: Back port of _PRP update.
  ACPICA: acpidump: Fix truncated RSDP signature validation.
  ACPICA: Linux header: Add support for stubbed externals.
  ...
parents b04c58b1 729ddb65

Documentation/kernel-parameters.txt

+14 −1
Original line number Diff line number Diff line
@@ -214,6 +214,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			unusable.  The "log_buf_len" parameter may be useful

			if you need to capture more output.



	acpi_force_table_verification	[HW,ACPI]

			Enable table checksum verification during early stage.

			By default, this is disabled due to x86 early mapping

			size limitation.



	acpi_irq_balance [HW,ACPI]

			ACPI will balance active IRQs

			default in APIC mode
@@ -237,7 +242,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			This feature is enabled by default.

			This option allows to turn off the feature.



	acpi_no_auto_ssdt	[HW,ACPI] Disable automatic loading of SSDT

	acpi_no_static_ssdt	[HW,ACPI]

			Disable installation of static SSDTs at early boot time

			By default, SSDTs contained in the RSDT/XSDT will be

			installed automatically and they will appear under

			/sys/firmware/acpi/tables.

			This option turns off this feature.

			Note that specifying this option does not affect

			dynamic table installation which will install SSDT

			tables to /sys/firmware/acpi/tables/dynamic.



	acpica_no_return_repair [HW, ACPI]

			Disable AML predefined validation mechanism

arch/ia64/include/asm/acenv.h

0 → 100644
+56 −0
Original line number Diff line number Diff line 
/*

 * IA64 specific ACPICA environments and implementation

 *

 * Copyright (C) 2014, Intel Corporation

 *   Author: Lv Zheng <lv.zheng@intel.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _ASM_IA64_ACENV_H

#define _ASM_IA64_ACENV_H



#include <asm/intrinsics.h>



#define COMPILER_DEPENDENT_INT64	long

#define COMPILER_DEPENDENT_UINT64	unsigned long



/* Asm macros */



#ifdef CONFIG_ACPI



static inline int

ia64_acpi_acquire_global_lock(unsigned int *lock)

{

	unsigned int old, new, val;

	do {

		old = *lock;

		new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));

		val = ia64_cmpxchg4_acq(lock, new, old);

	} while (unlikely (val != old));

	return (new < 3) ? -1 : 0;

}



static inline int

ia64_acpi_release_global_lock(unsigned int *lock)

{

	unsigned int old, new, val;

	do {

		old = *lock;

		new = old & ~0x3;

		val = ia64_cmpxchg4_acq(lock, new, old);

	} while (unlikely (val != old));

	return old & 0x1;

}



#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq)				\

	((Acq) = ia64_acpi_acquire_global_lock(&facs->global_lock))



#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)				\

	((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))



#endif



#endif /* _ASM_IA64_ACENV_H */

arch/ia64/include/asm/acpi.h

+0 −50
Original line number Diff line number Diff line
@@ -34,56 +34,6 @@ 
#include <linux/numa.h>

#include <asm/numa.h>



#define COMPILER_DEPENDENT_INT64	long

#define COMPILER_DEPENDENT_UINT64	unsigned long



/*

 * Calling conventions:

 *

 * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)

 * ACPI_EXTERNAL_XFACE      - External ACPI interfaces

 * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces

 * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces

 */

#define ACPI_SYSTEM_XFACE

#define ACPI_EXTERNAL_XFACE

#define ACPI_INTERNAL_XFACE

#define ACPI_INTERNAL_VAR_XFACE



/* Asm macros */



#define ACPI_FLUSH_CPU_CACHE()



static inline int

ia64_acpi_acquire_global_lock (unsigned int *lock)

{

	unsigned int old, new, val;

	do {

		old = *lock;

		new = (((old & ~0x3) + 2) + ((old >> 1) & 0x1));

		val = ia64_cmpxchg4_acq(lock, new, old);

	} while (unlikely (val != old));

	return (new < 3) ? -1 : 0;

}



static inline int

ia64_acpi_release_global_lock (unsigned int *lock)

{

	unsigned int old, new, val;

	do {

		old = *lock;

		new = old & ~0x3;

		val = ia64_cmpxchg4_acq(lock, new, old);

	} while (unlikely (val != old));

	return old & 0x1;

}



#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq)				\

	((Acq) = ia64_acpi_acquire_global_lock(&facs->global_lock))



#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq)				\

	((Acq) = ia64_acpi_release_global_lock(&facs->global_lock))



#ifdef	CONFIG_ACPI

extern int acpi_lapic;

#define acpi_disabled 0	/* ACPI always enabled on IA64 */

arch/x86/include/asm/acenv.h

0 → 100644
+49 −0
Original line number Diff line number Diff line 
/*

 * X86 specific ACPICA environments and implementation

 *

 * Copyright (C) 2014, Intel Corporation

 *   Author: Lv Zheng <lv.zheng@intel.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef _ASM_X86_ACENV_H

#define _ASM_X86_ACENV_H



#include <asm/special_insns.h>



/* Asm macros */



#define ACPI_FLUSH_CPU_CACHE()	wbinvd()



#ifdef CONFIG_ACPI



int __acpi_acquire_global_lock(unsigned int *lock);

int __acpi_release_global_lock(unsigned int *lock);



#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_acquire_global_lock(&facs->global_lock))



#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_release_global_lock(&facs->global_lock))



/*

 * Math helper asm macros

 */

#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \

	asm("divl %2;"				     \

	    : "=a"(q32), "=d"(r32)		     \

	    : "r"(d32),				     \

	     "0"(n_lo), "1"(n_hi))



#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \

	asm("shrl   $1,%2	;"	\

	    "rcrl   $1,%3;"		\

	    : "=r"(n_hi), "=r"(n_lo)	\

	    : "0"(n_hi), "1"(n_lo))



#endif



#endif /* _ASM_X86_ACENV_H */

arch/x86/include/asm/acpi.h

+0 −45
Original line number Diff line number Diff line
@@ -32,51 +32,6 @@ 
#include <asm/mpspec.h>

#include <asm/realmode.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long



/*

 * Calling conventions:

 *

 * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)

 * ACPI_EXTERNAL_XFACE      - External ACPI interfaces

 * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces

 * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces

 */

#define ACPI_SYSTEM_XFACE

#define ACPI_EXTERNAL_XFACE

#define ACPI_INTERNAL_XFACE

#define ACPI_INTERNAL_VAR_XFACE



/* Asm macros */



#define ACPI_FLUSH_CPU_CACHE()	wbinvd()



int __acpi_acquire_global_lock(unsigned int *lock);

int __acpi_release_global_lock(unsigned int *lock);



#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_acquire_global_lock(&facs->global_lock))



#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \

	((Acq) = __acpi_release_global_lock(&facs->global_lock))



/*

 * Math helper asm macros

 */

#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \

	asm("divl %2;"				     \

	    : "=a"(q32), "=d"(r32)		     \

	    : "r"(d32),				     \

	     "0"(n_lo), "1"(n_hi))





#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \

	asm("shrl   $1,%2	;"	\

	    "rcrl   $1,%3;"		\

	    : "=r"(n_hi), "=r"(n_lo)	\

	    : "0"(n_hi), "1"(n_lo))



#ifdef CONFIG_ACPI

extern int acpi_lapic;

extern int acpi_ioapic;

CRA Git | Maintained and supported by SUSTech CRA and CCSE