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

Commit be23c9d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more power management and ACPI updates from Rafael Wysocki:
 "The only new feature in this batch is support for the ACPI _CCA device
  configuration object, which it a pre-requisite for future ACPI PCI
  support on ARM64, but should not affect the other architectures.

  The rest is fixes and cleanups, mostly in cpufreq (including
  intel_pstate), the Operating Performace Points (OPP) framework and
  tools (cpupower and turbostat).

  Specifics:

   - Support for the ACPI _CCA configuration object intended to tell the
     OS whether or not a bus master device supports hardware managed
     cache coherency and a new set of functions to allow drivers to
     check the cache coherency support for devices in a platform
     firmware interface agnostic way (Suravee Suthikulpanit, Jeremy
     Linton).

   - ACPI backlight quirks for ESPRIMO Mobile M9410 and Dell XPS L421X
     (Aaron Lu, Hans de Goede).

   - Fixes for the arm_big_little and s5pv210-cpufreq cpufreq drivers
     (Jon Medhurst, Nicolas Pitre).

   - kfree()-related fixup for the recently introduced CPPC cpufreq
     frontend (Markus Elfring).

   - intel_pstate fix reducing kernel log noise on systems where
     P-states are managed by hardware (Prarit Bhargava).

   - intel_pstate maintainers information update (Srinivas Pandruvada).

   - cpufreq core optimization related to the handling of delayed work
     items used by governors (Viresh Kumar).

   - Locking fixes and cleanups of the Operating Performance Points
     (OPP) framework (Viresh Kumar).

   - Generic power domains framework cleanups (Lina Iyer).

   - cpupower tool updates (Jacob Tanenbaum, Sriram Raghunathan, Thomas
     Renninger).

   - turbostat tool updates (Len Brown)"

* tag 'pm+acpi-4.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
  PCI: ACPI: Add support for PCI device DMA coherency
  PCI: OF: Move of_pci_dma_configure() to pci_dma_configure()
  of/pci: Fix pci_get_host_bridge_device leak
  device property: ACPI: Remove unused DMA APIs
  device property: ACPI: Make use of the new DMA Attribute APIs
  device property: Adding DMA Attribute APIs for Generic Devices
  ACPI: Adding DMA Attribute APIs for ACPI Device
  device property: Introducing enum dev_dma_attr
  ACPI: Honor ACPI _CCA attribute setting
  cpufreq: CPPC: Delete an unnecessary check before the function call kfree()
  PM / OPP: Add opp_rcu_lockdep_assert() to _find_device_opp()
  PM / OPP: Hold dev_opp_list_lock for writers
  PM / OPP: Protect updates to list_dev with mutex
  PM / OPP: Propagate error properly from dev_pm_opp_set_sharing_cpus()
  cpufreq: s5pv210-cpufreq: fix wrong do_div() usage
  MAINTAINERS: update for intel P-state driver
  Creating a common structure initialization pattern for struct option
  cpupower: Enable disabled Cstates if they are below max latency
  cpupower: Remove debug message when using cpupower idle-set -D switch
  cpupower: cpupower monitor reports uninitialized values for offline cpus
  ...
parents 5d50ac70 f57ab32a

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -5505,7 +5505,8 @@ S: Supported 
F:	drivers/idle/intel_idle.c



INTEL PSTATE DRIVER

M:	Kristen Carlson Accardi <kristen@linux.intel.com>

M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

M:	Len Brown <lenb@kernel.org>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	drivers/cpufreq/intel_pstate.c

drivers/acpi/acpi_platform.c

+6 −1
Original line number Diff line number Diff line
@@ -103,7 +103,12 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) 
	pdevinfo.res = resources;

	pdevinfo.num_res = count;

	pdevinfo.fwnode = acpi_fwnode_handle(adev);

	pdevinfo.dma_mask = acpi_check_dma(adev, NULL) ? DMA_BIT_MASK(32) : 0;



	if (acpi_dma_supported(adev))

		pdevinfo.dma_mask = DMA_BIT_MASK(32);

	else

		pdevinfo.dma_mask = 0;



	pdev = platform_device_register_full(&pdevinfo);

	if (IS_ERR(pdev))

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

drivers/acpi/acpi_video.c

+66 −12
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ module_param(allow_duplicates, bool, 0644); 
static int disable_backlight_sysfs_if = -1;

module_param(disable_backlight_sysfs_if, int, 0444);



static bool device_id_scheme = false;

module_param(device_id_scheme, bool, 0444);



static bool only_lcd = false;

module_param(only_lcd, bool, 0444);



static int register_count;

static DEFINE_MUTEX(register_count_mutex);

static struct mutex video_list_lock;
@@ -394,6 +400,18 @@ static int video_disable_backlight_sysfs_if( 
	return 0;

}



static int video_set_device_id_scheme(const struct dmi_system_id *d)

{

	device_id_scheme = true;

	return 0;

}



static int video_enable_only_lcd(const struct dmi_system_id *d)

{

	only_lcd = true;

	return 0;

}



static struct dmi_system_id video_dmi_table[] = {

	/*

	 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -455,6 +473,33 @@ static struct dmi_system_id video_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE R830"),

		},

	},

	/*

	 * Some machine's _DOD IDs don't have bit 31(Device ID Scheme) set

	 * but the IDs actually follow the Device ID Scheme.

	 */

	{

	 /* https://bugzilla.kernel.org/show_bug.cgi?id=104121 */

	 .callback = video_set_device_id_scheme,

	 .ident = "ESPRIMO Mobile M9410",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

		DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile M9410"),

		},

	},

	/*

	 * Some machines have multiple video output devices, but only the one

	 * that is the type of LCD can do the backlight control so we should not

	 * register backlight interface for other video output devices.

	 */

	{

	 /* https://bugzilla.kernel.org/show_bug.cgi?id=104121 */

	 .callback = video_enable_only_lcd,

	 .ident = "ESPRIMO Mobile M9410",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),

		DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Mobile M9410"),

		},

	},

	{}

};
@@ -1003,7 +1048,7 @@ acpi_video_bus_get_one_device(struct acpi_device *device, 


	attribute = acpi_video_get_device_attr(video, device_id);



	if (attribute && attribute->device_id_scheme) {

	if (attribute && (attribute->device_id_scheme || device_id_scheme)) {

		switch (attribute->display_type) {

		case ACPI_VIDEO_DISPLAY_CRT:

			data->flags.crt = 1;
@@ -1568,15 +1613,6 @@ static void acpi_video_dev_register_backlight(struct acpi_video_device *device) 
	static int count;

	char *name;



	/*

	 * Do not create backlight device for video output

	 * device that is not in the enumerated list.

	 */

	if (!acpi_video_device_in_dod(device)) {

		dev_dbg(&device->dev->dev, "not in _DOD list, ignore\n");

		return;

	}



	result = acpi_video_init_brightness(device);

	if (result)

		return;
@@ -1657,6 +1693,22 @@ static void acpi_video_run_bcl_for_osi(struct acpi_video_bus *video) 
	mutex_unlock(&video->device_list_lock);

}



static bool acpi_video_should_register_backlight(struct acpi_video_device *dev)

{

	/*

	 * Do not create backlight device for video output

	 * device that is not in the enumerated list.

	 */

	if (!acpi_video_device_in_dod(dev)) {

		dev_dbg(&dev->dev->dev, "not in _DOD list, ignore\n");

		return false;

	}



	if (only_lcd)

		return dev->flags.lcd;

	return true;

}



static int acpi_video_bus_register_backlight(struct acpi_video_bus *video)

{

	struct acpi_video_device *dev;
@@ -1670,8 +1722,10 @@ static int acpi_video_bus_register_backlight(struct acpi_video_bus *video) 
		return 0;



	mutex_lock(&video->device_list_lock);

	list_for_each_entry(dev, &video->video_device_list, entry)

	list_for_each_entry(dev, &video->video_device_list, entry) {

		if (acpi_video_should_register_backlight(dev))

			acpi_video_dev_register_backlight(dev);

	}

	mutex_unlock(&video->device_list_lock);



	video->backlight_registered = true;

drivers/acpi/glue.c

+5 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	struct list_head *physnode_list;

	unsigned int node_id;

	int retval = -EINVAL;

	bool coherent;

	enum dev_dma_attr attr;



	if (has_acpi_companion(dev)) {

		if (acpi_dev) {
@@ -225,8 +225,10 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) 
	if (!has_acpi_companion(dev))

		ACPI_COMPANION_SET(dev, acpi_dev);



	if (acpi_check_dma(acpi_dev, &coherent))

		arch_setup_dma_ops(dev, 0, 0, NULL, coherent);

	attr = acpi_get_dma_attr(acpi_dev);

	if (attr != DEV_DMA_NOT_SUPPORTED)

		arch_setup_dma_ops(dev, 0, 0, NULL,

				   attr == DEV_DMA_COHERENT);



	acpi_physnode_link_name(physical_node_name, node_id);

	retval = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,

drivers/acpi/scan.c

+42 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,48 @@ void acpi_free_pnp_ids(struct acpi_device_pnp *pnp) 
	kfree(pnp->unique_id);

}



/**

 * acpi_dma_supported - Check DMA support for the specified device.

 * @adev: The pointer to acpi device

 *

 * Return false if DMA is not supported. Otherwise, return true

 */

bool acpi_dma_supported(struct acpi_device *adev)

{

	if (!adev)

		return false;



	if (adev->flags.cca_seen)

		return true;



	/*

	* Per ACPI 6.0 sec 6.2.17, assume devices can do cache-coherent

	* DMA on "Intel platforms".  Presumably that includes all x86 and

	* ia64, and other arches will set CONFIG_ACPI_CCA_REQUIRED=y.

	*/

	if (!IS_ENABLED(CONFIG_ACPI_CCA_REQUIRED))

		return true;



	return false;

}



/**

 * acpi_get_dma_attr - Check the supported DMA attr for the specified device.

 * @adev: The pointer to acpi device

 *

 * Return enum dev_dma_attr.

 */

enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)

{

	if (!acpi_dma_supported(adev))

		return DEV_DMA_NOT_SUPPORTED;



	if (adev->flags.coherent_dma)

		return DEV_DMA_COHERENT;

	else

		return DEV_DMA_NON_COHERENT;

}



static void acpi_init_coherency(struct acpi_device *adev)

{

	unsigned long long cca = 0;