Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 (9a90e098) · Commits · 戴 / test

Documentation/acpi/apei/einj.txt

0 → 100644

+59 −0

Original line number	Diff line number	Diff line
		APEI Error INJection
		~~~~~~~~~~~~~~~~~~~~

		EINJ provides a hardware error injection mechanism
		It is very useful for debugging and testing of other APEI and RAS features.

		To use EINJ, make sure the following are enabled in your kernel
		configuration:

		CONFIG_DEBUG_FS
		CONFIG_ACPI_APEI
		CONFIG_ACPI_APEI_EINJ

		The user interface of EINJ is debug file system, under the
		directory apei/einj. The following files are provided.

		- available_error_type
		Reading this file returns the error injection capability of the
		platform, that is, which error types are supported. The error type
		definition is as follow, the left field is the error type value, the
		right field is error description.

		0x00000001 Processor Correctable
		0x00000002 Processor Uncorrectable non-fatal
		0x00000004 Processor Uncorrectable fatal
		0x00000008 Memory Correctable
		0x00000010 Memory Uncorrectable non-fatal
		0x00000020 Memory Uncorrectable fatal
		0x00000040 PCI Express Correctable
		0x00000080 PCI Express Uncorrectable fatal
		0x00000100 PCI Express Uncorrectable non-fatal
		0x00000200 Platform Correctable
		0x00000400 Platform Uncorrectable non-fatal
		0x00000800 Platform Uncorrectable fatal

		The format of file contents are as above, except there are only the
		available error type lines.

		- error_type
		This file is used to set the error type value. The error type value
		is defined in "available_error_type" description.

		- error_inject
		Write any integer to this file to trigger the error
		injection. Before this, please specify all necessary error
		parameters.

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

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

		For more information about EINJ, please refer to ACPI specification
		version 4.0, section 17.5.

Documentation/kernel-parameters.txt

+10 −2

Original line number	Diff line number	Diff line
		@@ -145,11 +145,10 @@ and is between 256 and 4096 characters. It is defined in the file

		acpi= [HW,ACPI,X86]
		Advanced Configuration and Power Interface
		Format: { force \| off \| ht \| strict \| noirq \| rsdt }
		Format: { force \| off \| strict \| noirq \| rsdt }
		force -- enable ACPI if default was off
		off -- disable ACPI if default was on
		noirq -- do not use ACPI for IRQ routing
		ht -- run only enough ACPI to enable Hyper Threading
		strict -- Be less tolerant of platforms that are not
		strictly ACPI specification compliant.
		rsdt -- prefer RSDT over (default) XSDT
		@@ -758,6 +757,10 @@ and is between 256 and 4096 characters. It is defined in the file
		Default value is 0.
		Value can be changed at runtime via /selinux/enforce.

		erst_disable [ACPI]
		Disable Error Record Serialization Table (ERST)
		support.

		ether= [HW,NET] Ethernet cards parameters
		This option is obsoleted by the "netdev=" option, which
		has equivalent usage. See its documentation for details.
		@@ -852,6 +855,11 @@ and is between 256 and 4096 characters. It is defined in the file
		hd= [EIDE] (E)IDE hard drive subsystem geometry
		Format: <cyl>,<head>,<sect>

		hest_disable [ACPI]
		Disable Hardware Error Source Table (HEST) support;
		corresponding firmware-first mode error processing
		logic will be disabled.

		highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact
		size of <nn>. This works even on boxes that have no
		highmem otherwise. This also works to reduce highmem

arch/ia64/include/asm/acpi.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -94,7 +94,6 @@ ia64_acpi_release_global_lock (unsigned int *lock)
		#define acpi_noirq 0 /* ACPI always enabled on IA64 */
		#define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */
		#define acpi_strict 1 /* no ACPI spec workarounds on IA64 */
		#define acpi_ht 0 /* no HT-only mode on IA64 */
		#endif
		#define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */
		static inline void disable_acpi(void) { }

arch/ia64/pci/pci.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -335,8 +335,11 @@ pcibios_setup_root_windows(struct pci_bus bus, struct pci_controller ctrl)
		}

		struct pci_bus * __devinit
		pci_acpi_scan_root(struct acpi_device *device, int domain, int bus)
		pci_acpi_scan_root(struct acpi_pci_root *root)
		{
		struct acpi_device *device = root->device;
		int domain = root->segment;
		int bus = root->secondary.start;
		struct pci_controller *controller;
		unsigned int windows = 0;
		struct pci_bus *pbus;

arch/x86/include/asm/acpi.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -85,7 +85,6 @@ extern int acpi_ioapic;
		extern int acpi_noirq;
		extern int acpi_strict;
		extern int acpi_disabled;
		extern int acpi_ht;
		extern int acpi_pci_disabled;
		extern int acpi_skip_timer_override;
		extern int acpi_use_timer_override;
		@@ -97,7 +96,6 @@ void acpi_pic_sci_set_trigger(unsigned int, u16);
		static inline void disable_acpi(void)
		{
		acpi_disabled = 1;
		acpi_ht = 0;
		acpi_pci_disabled = 1;
		acpi_noirq = 1;
		}

Admin message