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

Merge branches 'acpi-pm' and 'acpi-properties' 

Merge an ACPI power management quirk and a change related to the
handling of ACPI device properties for 6.4-rc1:

 - Do not turn off unused power resources during initialization on the
   Toshiba Click Mini (Hans de Goede).

 - Support strings in device properties supplied by ACPI _DSM on Apple
   platforms (Hector Martin).

* acpi-pm:
  ACPI: PM: Do not turn of unused power resources on the Toshiba Click Mini

* acpi-properties:
  ACPI: property: Support strings in Apple _DSM props
parents 61711941 9b04d997 9bde7fb8

drivers/acpi/power.c

+19 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#define pr_fmt(fmt) "ACPI: PM: " fmt



#include <linux/dmi.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>
@@ -1022,6 +1023,21 @@ void acpi_resume_power_resources(void) 
}

#endif



static const struct dmi_system_id dmi_leave_unused_power_resources_on[] = {

	{

		/*

		 * The Toshiba Click Mini has a CPR3 power-resource which must

		 * be on for the touchscreen to work, but which is not in any

		 * _PR? lists. The other 2 affected power-resources are no-ops.

		 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

			DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Click Mini L9W-B"),

		},

	},

	{}

};



/**

 * acpi_turn_off_unused_power_resources - Turn off power resources not in use.

 */
@@ -1029,6 +1045,9 @@ void acpi_turn_off_unused_power_resources(void) 
{

	struct acpi_power_resource *resource;



	if (dmi_check_system(dmi_leave_unused_power_resources_on))

		return;



	mutex_lock(&power_resource_list_lock);



	list_for_each_entry_reverse(resource, &acpi_power_resource_list, list_node) {

drivers/acpi/x86/apple.c

+10 −1
Original line number Diff line number Diff line
@@ -71,13 +71,16 @@ void acpi_extract_apple_properties(struct acpi_device *adev) 


		if ( key->type != ACPI_TYPE_STRING ||

		    (val->type != ACPI_TYPE_INTEGER &&

		     val->type != ACPI_TYPE_BUFFER))

		     val->type != ACPI_TYPE_BUFFER &&

		     val->type != ACPI_TYPE_STRING))

			continue; /* skip invalid properties */



		__set_bit(i, valid);

		newsize += key->string.length + 1;

		if ( val->type == ACPI_TYPE_BUFFER)

			newsize += val->buffer.length;

		else if (val->type == ACPI_TYPE_STRING)

			newsize += val->string.length + 1;

	}



	numvalid = bitmap_weight(valid, numprops);
@@ -119,6 +122,12 @@ void acpi_extract_apple_properties(struct acpi_device *adev) 
		newprops[v].type = val->type;

		if (val->type == ACPI_TYPE_INTEGER) {

			newprops[v].integer.value = val->integer.value;

		} else if (val->type == ACPI_TYPE_STRING) {

			newprops[v].string.length = val->string.length;

			newprops[v].string.pointer = free_space;

			memcpy(free_space, val->string.pointer,

			       val->string.length);

			free_space += val->string.length + 1;

		} else {

			newprops[v].buffer.length = val->buffer.length;

			newprops[v].buffer.pointer = free_space;