---

yaml
---
r: 286491
b: refs/heads/master
c: c130bd6
h: refs/heads/master
i:
  286489: 88946cf
  286487: 183413a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb7971756b901abd61d47f6eb1011066abfb348d
+refs/heads/master: c130bd6f82e5dda28b1a19741c4c2fe269713199

trunk/Documentation/acpi/apei/einj.txt

@@ -47,20 +47,53 @@ directory apei/einj. The following files are provided.
 
 - param1
   This file is used to set the first error parameter value. Effect of
-  parameter depends on error_type specified. For memory error, this is
-  physical memory address.  Only available if param_extension module
-  parameter is specified.
+  parameter depends on error_type specified.
 
 - param2
   This file is used to set the second error parameter value. Effect of
-  parameter depends on error_type specified. For memory error, this is
-  physical memory address mask.  Only available if param_extension
-  module parameter is specified.
+  parameter depends on error_type specified.
+
+BIOS versions based in the ACPI 4.0 specification have limited options
+to control where the errors are injected.  Your BIOS may support an
+extension (enabled with the param_extension=1 module parameter, or
+boot command line einj.param_extension=1). This allows the address
+and mask for memory injections to be specified by the param1 and
+param2 files in apei/einj.
+
+BIOS versions using the ACPI 5.0 specification have more control over
+the target of the injection. For processor related errors (type 0x1,
+0x2 and 0x4) the APICID of the target should be provided using the
+param1 file in apei/einj. For memory errors (type 0x8, 0x10 and 0x20)
+the address is set using param1 with a mask in param2 (0x0 is equivalent
+to all ones). For PCI express errors (type 0x40, 0x80 and 0x100) the
+segment, bus, device and function are specified using param1:
+
+         31     24 23    16 15    11 10      8  7        0
+	+-------------------------------------------------+
+	| segment |   bus  | device | function | reserved |
+	+-------------------------------------------------+
+
+An ACPI 5.0 BIOS may also allow vendor specific errors to be injected.
+In this case a file named vendor will contain identifying information
+from the BIOS that hopefully will allow an application wishing to use
+the vendor specific extension to tell that they are running on a BIOS
+that supports it. All vendor extensions have the 0x80000000 bit set in
+error_type. A file vendor_flags controls the interpretation of param1
+and param2 (1 = PROCESSOR, 2 = MEMORY, 4 = PCI). See your BIOS vendor
+documentation for details (and expect changes to this API if vendors
+creativity in using this feature expands beyond our expectations).
+
+Example:
+# cd /sys/kernel/debug/apei/einj
+# cat available_error_type		# See which errors can be injected
+0x00000002	Processor Uncorrectable non-fatal
+0x00000008	Memory Correctable
+0x00000010	Memory Uncorrectable non-fatal
+# echo 0x12345000 > param1		# Set memory address for injection
+# echo 0xfffffffffffff000 > param2	# Mask - anywhere in this page
+# echo 0x8 > error_type			# Choose correctable memory error
+# echo 1 > error_inject			# Inject now
 
-Injecting parameter support is a BIOS version specific extension, that
-is, it only works on some BIOS version.  If you want to use it, please
-make sure your BIOS version has the proper support and specify
-"param_extension=y" in module parameter.
 
 For more information about EINJ, please refer to ACPI specification
-version 4.0, section 17.5.
+version 4.0, section 17.5 and ACPI 5.0, section 18.6.

trunk/arch/x86/kernel/e820.c

@@ -714,7 +714,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn)
 }
 #endif
 
-#ifdef CONFIG_ACPI
+#ifdef CONFIG_HIBERNATION
 /**
  * Mark ACPI NVS memory region, so that we can save/restore it during
  * hibernation and the subsequent resume.
@@ -727,7 +727,7 @@ static int __init e820_mark_nvs_memory(void)
 		struct e820entry *ei = &e820.map[i];
 
 		if (ei->type == E820_NVS)
-			acpi_nvs_register(ei->addr, ei->size);
+			suspend_nvs_register(ei->addr, ei->size);
 	}
 
 	return 0;

trunk/drivers/acpi/Makefile

@@ -20,12 +20,11 @@ obj-y				+= acpi.o \
 # All the builtin files are in the "acpi." module_param namespace.
 acpi-y				+= osl.o utils.o reboot.o
 acpi-y				+= atomicio.o
-acpi-y				+= nvs.o
 
 # sleep related files
 acpi-y				+= wakeup.o
 acpi-y				+= sleep.o
-acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o
+acpi-$(CONFIG_ACPI_SLEEP)	+= proc.o nvs.o
 
 
 #

trunk/drivers/acpi/acpica/Makefile

@@ -8,151 +8,41 @@ ccflags-$(CONFIG_ACPI_DEBUG)	+= -DACPI_DEBUG_OUTPUT
 # use acpi.o to put all files here into acpi.o modparam namespace
 obj-y	+= acpi.o
 
-acpi-y :=		\
-	dsargs.o	\
-	dscontrol.o	\
-	dsfield.o	\
-	dsinit.o	\
-	dsmethod.o	\
-	dsmthdat.o	\
-	dsobject.o	\
-	dsopcode.o	\
-	dsutils.o	\
-	dswexec.o	\
-	dswload.o	\
-	dswload2.o	\
-	dswscope.o	\
-	dswstate.o
+acpi-y := dsfield.o   dsmthdat.o  dsopcode.o  dswexec.o  dswscope.o \
+	 dsmethod.o  dsobject.o  dsutils.o   dswload.o  dswstate.o \
+	 dsinit.o dsargs.o dscontrol.o dswload2.o
 
-acpi-y +=		\
-	evevent.o	\
-	evgpe.o		\
-	evgpeblk.o	\
-	evgpeinit.o	\
-	evgpeutil.o	\
-	evglock.o	\
-	evmisc.o	\
-	evregion.o	\
-	evrgnini.o	\
-	evsci.o		\
-	evxface.o	\
-	evxfevnt.o	\
-	evxfgpe.o	\
-	evxfregn.o
+acpi-y += evevent.o  evregion.o  evsci.o    evxfevnt.o \
+	 evmisc.o   evrgnini.o  evxface.o  evxfregn.o \
+	 evgpe.o    evgpeblk.o evgpeinit.o  evgpeutil.o evxfgpe.o evglock.o
 
-acpi-y +=		\
-	exconfig.o	\
-	exconvrt.o	\
-	excreate.o	\
-	exdebug.o	\
-	exdump.o	\
-	exfield.o	\
-	exfldio.o	\
-	exmutex.o	\
-	exnames.o	\
-	exoparg1.o	\
-	exoparg2.o	\
-	exoparg3.o	\
-	exoparg6.o	\
-	exprep.o	\
-	exmisc.o	\
-	exregion.o	\
-	exresnte.o	\
-	exresolv.o	\
-	exresop.o	\
-	exstore.o	\
-	exstoren.o	\
-	exstorob.o	\
-	exsystem.o	\
-	exutils.o
+acpi-y += exconfig.o  exfield.o  exnames.o   exoparg6.o  exresolv.o  exstorob.o\
+	 exconvrt.o  exfldio.o  exoparg1.o  exprep.o    exresop.o   exsystem.o\
+	 excreate.o  exmisc.o   exoparg2.o  exregion.o  exstore.o   exutils.o \
+	 exdump.o    exmutex.o  exoparg3.o  exresnte.o  exstoren.o  exdebug.o
 
-acpi-y +=		\
-	hwacpi.o	\
-	hwgpe.o		\
-	hwpci.o		\
-	hwregs.o	\
-	hwsleep.o	\
-	hwvalid.o	\
-	hwxface.o
+acpi-y += hwacpi.o  hwgpe.o  hwregs.o  hwsleep.o hwxface.o hwvalid.o hwpci.o
 
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 
-acpi-y +=		\
-	nsaccess.o	\
-	nsalloc.o	\
-	nsdump.o	\
-	nseval.o	\
-	nsinit.o	\
-	nsload.o	\
-	nsnames.o	\
-	nsobject.o	\
-	nsparse.o	\
-	nspredef.o	\
-	nsrepair.o	\
-	nsrepair2.o	\
-	nssearch.o	\
-	nsutils.o	\
-	nswalk.o	\
-	nsxfeval.o	\
-	nsxfname.o	\
-	nsxfobj.o
+acpi-y += nsaccess.o  nsload.o    nssearch.o  nsxfeval.o \
+	 nsalloc.o   nseval.o    nsnames.o   nsutils.o   nsxfname.o \
+	 nsdump.o    nsinit.o    nsobject.o  nswalk.o    nsxfobj.o  \
+	 nsparse.o   nspredef.o  nsrepair.o  nsrepair2.o
 
 acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o
 
-acpi-y +=		\
-	psargs.o	\
-	psloop.o	\
-	psopcode.o	\
-	psparse.o	\
-	psscope.o	\
-	pstree.o	\
-	psutils.o	\
-	pswalk.o	\
-	psxface.o
+acpi-y += psargs.o    psparse.o  psloop.o pstree.o   pswalk.o  \
+	 psopcode.o  psscope.o  psutils.o  psxface.o
 
-acpi-y +=		\
-	rsaddr.o	\
-	rscalc.o	\
-	rscreate.o	\
-	rsinfo.o	\
-	rsio.o		\
-	rsirq.o		\
-	rslist.o	\
-	rsmemory.o	\
-	rsmisc.o	\
-	rsserial.o	\
-	rsutils.o	\
-	rsxface.o
+acpi-y += rsaddr.o rscreate.o rsinfo.o rsio.o rslist.o rsmisc.o rsxface.o \
+	 rscalc.o  rsirq.o  rsmemory.o  rsutils.o
 
 acpi-$(ACPI_FUTURE_USAGE) += rsdump.o
 
-acpi-y +=		\
-	tbfadt.o	\
-	tbfind.o	\
-	tbinstal.o	\
-	tbutils.o	\
-	tbxface.o	\
-	tbxfroot.o
+acpi-y += tbxface.o tbinstal.o tbutils.o tbfind.o tbfadt.o tbxfroot.o
 
-acpi-y +=		\
-	utaddress.o	\
-	utalloc.o	\
-	utcopy.o	\
-	utdebug.o	\
-	utdecode.o	\
-	utdelete.o	\
-	uteval.o	\
-	utglobal.o	\
-	utids.o		\
-	utinit.o	\
-	utlock.o	\
-	utmath.o	\
-	utmisc.o	\
-	utmutex.o	\
-	utobject.o	\
-	utosi.o		\
-	utresrc.o	\
-	utstate.o	\
-	utxface.o	\
-	utxferror.o	\
-	utxfmutex.o
+acpi-y += utalloc.o utdebug.o uteval.o utinit.o utmisc.o utxface.o \
+		utcopy.o utdelete.o utglobal.o utmath.o utobject.o \
+		utstate.o utmutex.o utobject.o utresrc.o utlock.o utids.o \
+		utosi.o utxferror.o utdecode.o

trunk/drivers/acpi/acpica/accommon.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/drivers/acpi/acpica/acconfig.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,10 +123,6 @@
 
 #define ACPI_MAX_SLEEP                  2000	/* Two seconds */
 
-/* Address Range lists are per-space_id (Memory and I/O only) */
-
-#define ACPI_ADDRESS_RANGE_MAX          2
-
 /******************************************************************************
  *
  * ACPI Specification constants (Do not change unless the specification changes)
@@ -206,10 +202,9 @@
 #define ACPI_RSDP_CHECKSUM_LENGTH       20
 #define ACPI_RSDP_XCHECKSUM_LENGTH      36
 
-/* SMBus, GSBus and IPMI bidirectional buffer size */
+/* SMBus and IPMI bidirectional buffer size */
 
 #define ACPI_SMBUS_BUFFER_SIZE          34
-#define ACPI_GSBUS_BUFFER_SIZE          34
 #define ACPI_IPMI_BUFFER_SIZE           66
 
 /* _sx_d and _sx_w control methods */

trunk/drivers/acpi/acpica/acdebug.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/drivers/acpi/acpica/acdispat.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

trunk/drivers/acpi/acpica/acevents.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -162,7 +162,6 @@ acpi_status acpi_ev_initialize_op_regions(void);
 
 acpi_status
 acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
-			       union acpi_operand_object *field_obj,
 			       u32 function,
 			       u32 region_offset, u32 bit_width, u64 *value);
 

trunk/drivers/acpi/acpica/acglobal.h

@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -140,19 +140,8 @@ 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
 
-/* Do not disassemble buffers to resource descriptors */
-
-ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_no_resource_disassembly, FALSE);
-
 /*****************************************************************************
  *
  * Debug support
@@ -218,7 +207,7 @@ ACPI_EXTERN struct acpi_rw_lock acpi_gbl_namespace_rw_lock;
 
 /*****************************************************************************
  *
- * Mutual exclusion within ACPICA subsystem
+ * Mutual exlusion within ACPICA subsystem
  *
  ****************************************************************************/
 
@@ -306,8 +295,6 @@ ACPI_EXTERN u8 acpi_gbl_acpi_hardware_present;
 ACPI_EXTERN u8 acpi_gbl_events_initialized;
 ACPI_EXTERN u8 acpi_gbl_osi_data;
 ACPI_EXTERN struct acpi_interface_info *acpi_gbl_supported_interfaces;
-ACPI_EXTERN struct acpi_address_range
-    *acpi_gbl_address_range_list[ACPI_ADDRESS_RANGE_MAX];
 
 #ifndef DEFINE_ACPI_GLOBALS