Pull misc-for-upstream into release branch (fb165969) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/kernel-parameters.txt

+27 −5

Original line number	Original line	Diff line number	Diff line
	@@ -181,19 +181,41 @@ and is between 256 and 4096 characters. It is defined in the file
	that require a timer override, but don't have		that require a timer override, but don't have
	HPET		HPET

	acpi_dbg_layer= [HW,ACPI]		acpi.debug_layer= [HW,ACPI]
	Format: <int>		Format: <int>
	Each bit of the <int> indicates an ACPI debug layer,		Each bit of the <int> indicates an ACPI debug layer,
	1: enable, 0: disable. It is useful for boot time		1: enable, 0: disable. It is useful for boot time
	debugging. After system has booted up, it can be set		debugging. After system has booted up, it can be set
	via /proc/acpi/debug_layer.		via /sys/module/acpi/parameters/debug_layer.
			CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
	acpi_dbg_level= [HW,ACPI]		Available bits (add the numbers together) to enable debug output
			for specific parts of the ACPI subsystem:
			0x01 utilities 0x02 hardware 0x04 events 0x08 tables
			0x10 namespace 0x20 parser 0x40 dispatcher
			0x80 executer 0x100 resources 0x200 acpica debugger
			0x400 os services 0x800 acpica disassembler.
			The number can be in decimal or prefixed with 0x in hex.
			Warning: Many of these options can produce a lot of
			output and make your system unusable. Be very careful.

			acpi.debug_level= [HW,ACPI]
	Format: <int>		Format: <int>
	Each bit of the <int> indicates an ACPI debug level,		Each bit of the <int> indicates an ACPI debug level,
	1: enable, 0: disable. It is useful for boot time		1: enable, 0: disable. It is useful for boot time
	debugging. After system has booted up, it can be set		debugging. After system has booted up, it can be set
	via /proc/acpi/debug_level.		via /sys/module/acpi/parameters/debug_level.
			CONFIG_ACPI_DEBUG must be enabled for this to produce any output.
			Available bits (add the numbers together) to enable different
			debug output levels of the ACPI subsystem:
			0x01 error 0x02 warn 0x04 init 0x08 debug object
			0x10 info 0x20 init names 0x40 parse 0x80 load
			0x100 dispatch 0x200 execute 0x400 names 0x800 operation region
			0x1000 bfield 0x2000 tables 0x4000 values 0x8000 objects
			0x10000 resources 0x20000 user requests 0x40000 package.
			The number can be in decimal or prefixed with 0x in hex.
			Warning: Many of these options can produce a lot of
			output and make your system unusable. Be very careful.


	acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT		acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT

arch/i386/kernel/acpi/earlyquirk.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,10 +23,13 @@ static int __init nvidia_hpet_check(struct acpi_table_header *header)
	static int __init check_bridge(int vendor, int device)		static int __init check_bridge(int vendor, int device)
	{		{
	#ifdef CONFIG_ACPI		#ifdef CONFIG_ACPI
			static int warned;
	/* According to Nvidia all timer overrides are bogus unless HPET		/* According to Nvidia all timer overrides are bogus unless HPET
	is enabled. */		is enabled. */
	if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {		if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
	if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) {		if (!warned && acpi_table_parse(ACPI_SIG_HPET,
			nvidia_hpet_check)) {
			warned = 1;
	acpi_skip_timer_override = 1;		acpi_skip_timer_override = 1;
	printk(KERN_INFO "Nvidia board "		printk(KERN_INFO "Nvidia board "
	"detected. Ignoring ACPI "		"detected. Ignoring ACPI "

drivers/acpi/Kconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -85,8 +85,8 @@ config ACPI_PROCFS
	depends on ACPI		depends on ACPI
	default y		default y
	---help---		---help---
	Procfs interface for ACPI is made optional for back-compatible.		The Procfs interface for ACPI is made optional for backward compatibility.
	As the same functions are duplicated in sysfs interface		As the same functions are duplicated in the sysfs interface
	and this proc interface will be removed some time later,		and this proc interface will be removed some time later,
	it's marked as deprecated.		it's marked as deprecated.
	( /proc/acpi/debug_layer && debug_level are deprecated by		( /proc/acpi/debug_layer && debug_level are deprecated by

drivers/acpi/acpi_memhotplug.c

+4 −9

Original line number	Original line	Diff line number	Diff line
	@@ -44,11 +44,6 @@ MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");
	MODULE_DESCRIPTION("Hotplug Mem Driver");		MODULE_DESCRIPTION("Hotplug Mem Driver");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

	/* ACPI _STA method values */
	#define ACPI_MEMORY_STA_PRESENT (0x00000001UL)
	#define ACPI_MEMORY_STA_ENABLED (0x00000002UL)
	#define ACPI_MEMORY_STA_FUNCTIONAL (0x00000008UL)

	/* Memory Device States */		/* Memory Device States */
	#define MEMORY_INVALID_STATE 0		#define MEMORY_INVALID_STATE 0
	#define MEMORY_POWER_ON_STATE 1		#define MEMORY_POWER_ON_STATE 1
	@@ -204,9 +199,9 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device)
	* Check for device status. Device should be		* Check for device status. Device should be
	* present/enabled/functioning.		* present/enabled/functioning.
	*/		*/
	if (!((current_status & ACPI_MEMORY_STA_PRESENT)		if (!((current_status & ACPI_STA_DEVICE_PRESENT)
	&& (current_status & ACPI_MEMORY_STA_ENABLED)		&& (current_status & ACPI_STA_DEVICE_ENABLED)
	&& (current_status & ACPI_MEMORY_STA_FUNCTIONAL)))		&& (current_status & ACPI_STA_DEVICE_FUNCTIONING)))
	return -ENODEV;		return -ENODEV;

	return 0;		return 0;
	@@ -286,7 +281,7 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device)
	return -ENODEV;		return -ENODEV;

	/* Check for device status. Device should be disabled */		/* Check for device status. Device should be disabled */
	if (current_status & ACPI_MEMORY_STA_ENABLED)		if (current_status & ACPI_STA_DEVICE_ENABLED)
	return -EINVAL;		return -EINVAL;

	return 0;		return 0;

drivers/acpi/bus.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,9 @@ int acpi_bus_get_status(struct acpi_device *device)
	else if (device->parent)		else if (device->parent)
	device->status = device->parent->status;		device->status = device->parent->status;
	else		else
	STRUCT_TO_INT(device->status) = 0x0F;		STRUCT_TO_INT(device->status) =
			ACPI_STA_DEVICE_PRESENT \| ACPI_STA_DEVICE_ENABLED \|
			ACPI_STA_DEVICE_UI \| ACPI_STA_DEVICE_FUNCTIONING;

	if (device->status.functional && !device->status.present) {		if (device->status.functional && !device->status.present) {
	printk(KERN_WARNING PREFIX "Device [%s] status [%08x]: "		printk(KERN_WARNING PREFIX "Device [%s] status [%08x]: "