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

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

Merge branch 'acpi-pm' 

* acpi-pm:
  ACPI / bus: Move duplicate code to a separate new function
  mfd: Add support for Intel Sunrisepoint LPSS devices
  dmaengine: add a driver for Intel integrated DMA 64-bit
  mfd: make mfd_remove_devices() iterate in reverse order
  driver core: implement device_for_each_child_reverse()
  klist: implement klist_prev()
  Driver core: wakeup the parent device before trying probe
  ACPI / PM: Attach ACPI power domain only once
  PM / QoS: Make it possible to expose device latency tolerance to userspace
  ACPI / PM: Update the copyright notice and description of power.c
parents 73990fc8 e91a398c

drivers/acpi/bus.c

+38 −16
Original line number Diff line number Diff line
@@ -482,6 +482,43 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device) 
                             Device Matching

   -------------------------------------------------------------------------- */



static struct acpi_device *acpi_primary_dev_companion(struct acpi_device *adev,

						      const struct device *dev)

{

	struct mutex *physical_node_lock = &adev->physical_node_lock;



	mutex_lock(physical_node_lock);

	if (list_empty(&adev->physical_node_list)) {

		adev = NULL;

	} else {

		const struct acpi_device_physical_node *node;



		node = list_first_entry(&adev->physical_node_list,

					struct acpi_device_physical_node, node);

		if (node->dev != dev)

			adev = NULL;

	}

	mutex_unlock(physical_node_lock);

	return adev;

}



/**

 * acpi_device_is_first_physical_node - Is given dev first physical node

 * @adev: ACPI companion device

 * @dev: Physical device to check

 *

 * Function checks if given @dev is the first physical devices attached to

 * the ACPI companion device. This distinction is needed in some cases

 * where the same companion device is shared between many physical devices.

 *

 * Note that the caller have to provide valid @adev pointer.

 */

bool acpi_device_is_first_physical_node(struct acpi_device *adev,

					const struct device *dev)

{

	return !!acpi_primary_dev_companion(adev, dev);

}



/*

 * acpi_companion_match() - Can we match via ACPI companion device

 * @dev: Device in question
@@ -506,7 +543,6 @@ static void acpi_device_remove_notify_handler(struct acpi_device *device) 
struct acpi_device *acpi_companion_match(const struct device *dev)

{

	struct acpi_device *adev;

	struct mutex *physical_node_lock;



	adev = ACPI_COMPANION(dev);

	if (!adev)
@@ -515,21 +551,7 @@ struct acpi_device *acpi_companion_match(const struct device *dev) 
	if (list_empty(&adev->pnp.ids))

		return NULL;



	physical_node_lock = &adev->physical_node_lock;

	mutex_lock(physical_node_lock);

	if (list_empty(&adev->physical_node_list)) {

		adev = NULL;

	} else {

		const struct acpi_device_physical_node *node;



		node = list_first_entry(&adev->physical_node_list,

					struct acpi_device_physical_node, node);

		if (node->dev != dev)

			adev = NULL;

	}

	mutex_unlock(physical_node_lock);



	return adev;

	return acpi_primary_dev_companion(adev, dev);

}



/**

drivers/acpi/device_pm.c

+8 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,14 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on) 
	if (dev->pm_domain)

		return -EEXIST;



	/*

	 * Only attach the power domain to the first device if the

	 * companion is shared by multiple. This is to prevent doing power

	 * management twice.

	 */

	if (!acpi_device_is_first_physical_node(adev, dev))

		return -EBUSY;



	acpi_add_pm_notifier(adev, dev, acpi_pm_notify_work_func);

	dev->pm_domain = &acpi_general_pm_domain;

	if (power_on) {

drivers/acpi/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ void acpi_device_add_finalize(struct acpi_device *device); 
void acpi_free_pnp_ids(struct acpi_device_pnp *pnp);

bool acpi_device_is_present(struct acpi_device *adev);

bool acpi_device_is_battery(struct acpi_device *adev);

bool acpi_device_is_first_physical_node(struct acpi_device *adev,

					const struct device *dev);



/* --------------------------------------------------------------------------

                     Device Matching and Notification

drivers/acpi/power.c

+9 −6
Original line number Diff line number Diff line 
/*

 *  acpi_power.c - ACPI Bus Power Management ($Revision: 39 $)

 * drivers/acpi/power.c - ACPI Power Resources management.

 *

 *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>

 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 * Copyright (C) 2001 - 2015 Intel Corp.

 * Author: Andy Grover <andrew.grover@intel.com>

 * Author: Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 * Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *
@@ -23,10 +25,11 @@ 
 * ACPI power-managed devices may be controlled in two ways:

 * 1. via "Device Specific (D-State) Control"

 * 2. via "Power Resource Control".

 * This module is used to manage devices relying on Power Resource Control.

 * The code below deals with ACPI Power Resources control.

 * 

 * An ACPI "power resource object" represents a software controllable power

 * plane, clock plane, or other resource depended on by a device.

 *

 * An ACPI "power resource object" describes a software controllable power

 * plane, clock plane, or other resource used by a power managed device.

 * A device may rely on multiple power resources, and a power resource

 * may be shared by multiple devices.

 */

drivers/acpi/scan.c

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler, 
	return 0;

}





bool acpi_scan_is_offline(struct acpi_device *adev, bool uevent)

{

	struct acpi_device_physical_node *pn;