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

Merge branches 'acpi-init', 'acpi-osl', 'acpi-bus', 'acpi-tables' and 'acpi-misc' 

* acpi-init:
  ACPI: probe ECDT before loading AML tables regardless of module-level code flag

* acpi-osl:
  ACPI / OSL: Use 'jiffies' as the time bassis for acpi_os_get_timer()

* acpi-bus:
  ACPI / glue: Split dev_is_platform() out of module for wide use

* acpi-tables:
  ACPI/PPTT: Handle architecturally unknown cache types
  drivers: base: cacheinfo: Do not populate sysfs for unknown cache types

* acpi-misc:
  ACPI: remove redundant 'default n' from Kconfig
  ACPI: custom_method: remove meaningless null check before debugfs_remove()
parents 3c88a889 d737f333 83b2348e 719cf71c 59bbff37 56f57c07

drivers/acpi/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ config ACPI_REV_OVERRIDE_POSSIBLE 


config ACPI_EC_DEBUGFS

	tristate "EC read/write access through /sys/kernel/debug/ec"

	default n

	help

	  Say N to disable Embedded Controller /sys/kernel/debug interface
@@ -283,7 +282,6 @@ config ACPI_PROCESSOR 
config ACPI_IPMI

	tristate "IPMI"

	depends on IPMI_HANDLER

	default n

	help

	  This driver enables the ACPI to access the BMC controller. And it

	  uses the IPMI request/response message to communicate with BMC
@@ -361,7 +359,6 @@ config ACPI_TABLE_UPGRADE 


config ACPI_DEBUG

	bool "Debug Statements"

	default n

	help

	  The ACPI subsystem can produce debug output.  Saying Y enables this

	  output and increases the kernel size by around 50K.
@@ -374,7 +371,6 @@ config ACPI_DEBUG 
config ACPI_PCI_SLOT

	bool "PCI slot detection driver"

	depends on SYSFS

	default n

	help

	  This driver creates entries in /sys/bus/pci/slots/ for all PCI

	  slots in the system.  This can help correlate PCI bus addresses,
@@ -436,7 +432,6 @@ config ACPI_HED 
config ACPI_CUSTOM_METHOD

	tristate "Allow ACPI methods to be inserted/replaced at run time"

	depends on DEBUG_FS

	default n

	help

	  This debug facility allows ACPI AML methods to be inserted and/or

	  replaced without rebooting the system. For details refer to:
@@ -481,7 +476,6 @@ config ACPI_EXTLOG 
	tristate "Extended Error Log support"

	depends on X86_MCE && X86_LOCAL_APIC && EDAC

	select UEFI_CPER

	default n

	help

	  Certain usages such as Predictive Failure Analysis (PFA) require

	  more information about the error than what can be described in

drivers/acpi/bus.c

+16 −28
Original line number Diff line number Diff line
@@ -1054,15 +1054,17 @@ void __init acpi_early_init(void) 
		goto error0;

	}



	if (!acpi_gbl_execute_tables_as_methods &&

	    acpi_gbl_group_module_level_code) {

		status = acpi_load_tables();

		if (ACPI_FAILURE(status)) {

			printk(KERN_ERR PREFIX

			       "Unable to load the System Description Tables\n");

			goto error0;

		}

	}

	/*

	 * ACPI 2.0 requires the EC driver to be loaded and work before

	 * the EC device is found in the namespace (i.e. before

	 * acpi_load_tables() is called).

	 *

	 * This is accomplished by looking for the ECDT table, and getting

	 * the EC parameters out of that.

	 *

	 * Ignore the result. Not having an ECDT is not fatal.

	 */

	status = acpi_ec_ecdt_probe();



#ifdef CONFIG_X86

	if (!acpi_ioapic) {
@@ -1133,26 +1135,12 @@ static int __init acpi_bus_init(void) 


	acpi_os_initialize1();



	/*

	 * ACPI 2.0 requires the EC driver to be loaded and work before

	 * the EC device is found in the namespace (i.e. before

	 * acpi_load_tables() is called).

	 *

	 * This is accomplished by looking for the ECDT table, and getting

	 * the EC parameters out of that.

	 */

	status = acpi_ec_ecdt_probe();

	/* Ignore result. Not having an ECDT is not fatal. */



	if (acpi_gbl_execute_tables_as_methods ||

	    !acpi_gbl_group_module_level_code) {

	status = acpi_load_tables();

	if (ACPI_FAILURE(status)) {

		printk(KERN_ERR PREFIX

		       "Unable to load the System Description Tables\n");

		goto error1;

	}

	}



	status = acpi_enable_subsystem(ACPI_NO_ACPI_ENABLE);

	if (ACPI_FAILURE(status)) {

drivers/acpi/custom_method.c

+1 −2
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ static int __init acpi_custom_method_init(void) 


static void __exit acpi_custom_method_exit(void)

{

	if (cm_dentry)

	debugfs_remove(cm_dentry);

}

drivers/acpi/glue.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int acpi_platform_notify(struct device *dev) 
	if (!adev)

		goto out;



	if (dev->bus == &platform_bus_type)

	if (dev_is_platform(dev))

		acpi_configure_pmsi_domain(dev);



	if (type && type->setup)

drivers/acpi/osl.c

+9 −6
Original line number Diff line number Diff line
@@ -617,15 +617,18 @@ void acpi_os_stall(u32 us) 
}



/*

 * Support ACPI 3.0 AML Timer operand

 * Returns 64-bit free-running, monotonically increasing timer

 * with 100ns granularity

 * Support ACPI 3.0 AML Timer operand. Returns a 64-bit free-running,

 * monotonically increasing timer with 100ns granularity. Do not use

 * ktime_get() to implement this function because this function may get

 * called after timekeeping has been suspended. Note: calling this function

 * after timekeeping has been suspended may lead to unexpected results

 * because when timekeeping is suspended the jiffies counter is not

 * incremented. See also timekeeping_suspend().

 */

u64 acpi_os_get_timer(void)

{

	u64 time_ns = ktime_to_ns(ktime_get());

	do_div(time_ns, 100);

	return time_ns;

	return (get_jiffies_64() - INITIAL_JIFFIES) *

		(ACPI_100NSEC_PER_SEC / HZ);

}



acpi_status acpi_os_read_port(acpi_io_address port, u32 * value, u32 width)