Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c45d9a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI and power management updates from Rafael Wysocki:
 "This is material that didn't make it to my 3.18-rc1 pull request for
  various reasons, mostly related to timing and travel (LinuxCon EU /
  LPC) plus a couple of fixes for recent bugs.

  The only really new thing here is the PM QoS class for memory
  bandwidth, but it is simple enough and users of it will be added in
  the next cycle.  One major change in behavior is that platform devices
  enumerated by ACPI will use 32-bit DMA mask by default.  Also included
  is an ACPICA update to a new upstream release, but that's mostly
  cleanups, changes in tools and similar.  The rest is fixes and
  cleanups mostly.

  Specifics:

   - Fix for a recent PCI power management change that overlooked the
     fact that some IRQ chips might not be able to configure PCIe PME
     for system wakeup from Lucas Stach.

   - Fix for a bug introduced in 3.17 where acpi_device_wakeup() is
     called with a wrong ordering of arguments from Zhang Rui.

   - A bunch of intel_pstate driver fixes (all -stable candidates) from
     Dirk Brandewie, Gabriele Mazzotta and Pali Rohár.

   - Fixes for a rather long-standing problem with the OOM killer and
     the freezer that frozen processes killed by the OOM do not actually
     release any memory until they are thawed, so OOM-killing them is
     rather pointless, with a couple of cleanups on top (Michal Hocko,
     Cong Wang, Rafael J Wysocki).

   - ACPICA update to upstream release 20140926, inlcuding mostly
     cleanups reducing differences between the upstream ACPICA and the
     kernel code, tools changes (acpidump, acpiexec) and support for the
     _DDN object (Bob Moore, Lv Zheng).

   - New PM QoS class for memory bandwidth from Tomeu Vizoso.

   - Default 32-bit DMA mask for platform devices enumerated by ACPI
     (this change is mostly needed for some drivers development in
     progress targeted at 3.19) from Heikki Krogerus.

   - ACPI EC driver cleanups, mostly related to debugging, from Lv
     Zheng.

   - cpufreq-dt driver updates from Thomas Petazzoni.

   - powernv cpuidle driver update from Preeti U Murthy"

* tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (34 commits)
  intel_pstate: Correct BYT VID values.
  intel_pstate: Fix BYT frequency reporting
  intel_pstate: Don't lose sysfs settings during cpu offline
  cpufreq: intel_pstate: Reflect current no_turbo state correctly
  cpufreq: expose scaling_cur_freq sysfs file for set_policy() drivers
  cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy
  PCI / PM: handle failure to enable wakeup on PCIe PME
  ACPI: invoke acpi_device_wakeup() with correct parameters
  PM / freezer: Clean up code after recent fixes
  PM: convert do_each_thread to for_each_process_thread
  OOM, PM: OOM killed task shouldn't escape PM suspend
  freezer: remove obsolete comments in __thaw_task()
  freezer: Do not freeze tasks killed by OOM killer
  ACPI / platform: provide default DMA mask
  cpuidle: powernv: Populate cpuidle state details by querying the device-tree
  cpufreq: cpufreq-dt: adjust message related to regulators
  cpufreq: cpufreq-dt: extend with platform_data
  cpufreq: allow driver-specific data
  ACPI / EC: Cleanup coding style.
  ACPI / EC: Refine event/query debugging messages.
  ...
parents 8264fce6 a91e99e2

Documentation/power/pm_qos_interface.txt

+3 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ performance expectations by drivers, subsystems and user space applications on 
one of the parameters.



Two different PM QoS frameworks are available:

1. PM QoS classes for cpu_dma_latency, network_latency, network_throughput.

1. PM QoS classes for cpu_dma_latency, network_latency, network_throughput,

memory_bandwidth.

2. the per-device PM QoS framework provides the API to manage the per-device latency

constraints and PM QoS flags.
@@ -13,6 +14,7 @@ Each parameters have defined units: 
 * latency: usec

 * timeout: usec

 * throughput: kbs (kilo bit / sec)

 * memory bandwidth: mbs (mega bit / sec)





1. PM QoS framework

drivers/acpi/acpi_platform.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/err.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>



#include "internal.h"
@@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	pdevinfo.res = resources;

	pdevinfo.num_res = count;

	pdevinfo.acpi_node.companion = adev;

	pdevinfo.dma_mask = DMA_BIT_MASK(32);

	pdev = platform_device_register_full(&pdevinfo);

	if (IS_ERR(pdev))

		dev_err(&adev->dev, "platform device creation failed: %ld\n",

drivers/acpi/acpica/actables.h

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ acpi_status acpi_allocate_root_table(u32 initial_table_count); 
/*

 * tbxfroot - Root pointer utilities

 */

u32 acpi_tb_get_rsdp_length(struct acpi_table_rsdp *rsdp);



acpi_status acpi_tb_validate_rsdp(struct acpi_table_rsdp *rsdp);



u8 *acpi_tb_scan_memory_for_rsdp(u8 *start_address, u32 length);

drivers/acpi/acpica/amlresrc.h

+34 −0
Original line number Diff line number Diff line
@@ -117,6 +117,12 @@ struct asl_resource_node { 
	struct asl_resource_node *next;

};



struct asl_resource_info {

	union acpi_parse_object *descriptor_type_op;	/* Resource descriptor parse node */

	union acpi_parse_object *mapping_op;	/* Used for mapfile support */

	u32 current_byte_offset;	/* Offset in resource template */

};



/* Macros used to generate AML resource length fields */



#define ACPI_AML_SIZE_LARGE(r)      (sizeof (r) - sizeof (struct aml_resource_large_header))
@@ -449,4 +455,32 @@ union aml_resource { 
	u8 byte_item;

};



/* Interfaces used by both the disassembler and compiler */



void

mp_save_gpio_info(union acpi_parse_object *op,

		  union aml_resource *resource,

		  u32 pin_count, u16 *pin_list, char *device_name);



void

mp_save_serial_info(union acpi_parse_object *op,

		    union aml_resource *resource, char *device_name);



char *mp_get_hid_from_parse_tree(struct acpi_namespace_node *hid_node);



char *mp_get_hid_via_namestring(char *device_name);



char *mp_get_connection_info(union acpi_parse_object *op,

			     u32 pin_index,

			     struct acpi_namespace_node **target_node,

			     char **target_name);



char *mp_get_parent_device_hid(union acpi_parse_object *op,

			       struct acpi_namespace_node **target_node,

			       char **parent_device_name);



char *mp_get_ddn_value(char *device_name);



char *mp_get_hid_value(struct acpi_namespace_node *device_node);



#endif

drivers/acpi/acpica/evgpe.c

+12 −11
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ acpi_ev_update_gpe_enable_mask(struct acpi_gpe_event_info *gpe_event_info) 
 * DESCRIPTION: Clear a GPE of stale events and enable it.

 *

 ******************************************************************************/



acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info)

{

	acpi_status status;
@@ -125,6 +126,7 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) 
	}



	/* Clear the GPE (of stale events) */



	status = acpi_hw_clear_gpe(gpe_event_info);

	if (ACPI_FAILURE(status)) {

		return_ACPI_STATUS(status);
@@ -136,7 +138,6 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) 
	return_ACPI_STATUS(status);

}





/*******************************************************************************

 *

 * FUNCTION:    acpi_ev_add_gpe_reference