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

Merge tag 'acpi-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These add some new quirks, fix PPTT handling, fix an ACPI utility and
  correct a mistake in the ACPI documentation.

  Specifics:

   - Fix ACPI PPTT handling to avoid sleep in the atomic context when it
     is not present (Sudeep Holla)

   - Add 'backlight=native' DMI quirk for Dell Vostro 15 3535 to the
     ACPI video driver (Chia-Lin Kao)

   - Add ACPI quirks for I2C device enumeration on Lenovo Yoga Book X90
     and Acer Iconia One 7 B1-750 (Hans de Goede)

   - Fix handling of invalid command line option values in the ACPI
     pfrut utility (Chen Yu)

   - Fix references to I2C device data type in the ACPI documentation
     for device enumeration (Andy Shevchenko)"

* tag 'acpi-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: tools: pfrut: Check if the input of level and type is in the right numeric range
  ACPI: PPTT: Fix to avoid sleep in the atomic context when PPTT is absent
  ACPI: x86: Add skip i2c clients quirk for Lenovo Yoga Book X90
  ACPI: x86: Add skip i2c clients quirk for Acer Iconia One 7 B1-750
  ACPI: x86: Introduce an acpi_quirk_skip_gpio_event_handlers() helper
  ACPI: video: Add backlight=native DMI quirk for Dell Vostro 15 3535
  ACPI: docs: enumeration: Correct reference to the I²C device data type
parents ba9c7791 f36cc6cd

Documentation/firmware-guide/acpi/enumeration.rst

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ possible we decided to do following: 
    platform devices.



  - Devices behind real busses where there is a connector resource

    are represented as struct spi_device or struct i2c_device. Note

    are represented as struct spi_device or struct i2c_client. Note

    that standard UARTs are not busses so there is no struct uart_device,

    although some of them may be represented by struct serdev_device.

drivers/acpi/pptt.c

+4 −1
Original line number Diff line number Diff line
@@ -536,16 +536,19 @@ static int topology_get_acpi_cpu_tag(struct acpi_table_header *table, 
static struct acpi_table_header *acpi_get_pptt(void)

{

	static struct acpi_table_header *pptt;

	static bool is_pptt_checked;

	acpi_status status;



	/*

	 * PPTT will be used at runtime on every CPU hotplug in path, so we

	 * don't need to call acpi_put_table() to release the table mapping.

	 */

	if (!pptt) {

	if (!pptt && !is_pptt_checked) {

		status = acpi_get_table(ACPI_SIG_PPTT, 0, &pptt);

		if (ACPI_FAILURE(status))

			acpi_pptt_warn_missing();



		is_pptt_checked = true;

	}



	return pptt;

drivers/acpi/video_detect.c

+7 −0
Original line number Diff line number Diff line
@@ -716,6 +716,13 @@ static const struct dmi_system_id video_detect_dmi_table[] = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "Dell G15 5515"),

		},

	},

	{

	 .callback = video_detect_force_native,

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 15 3535"),

		},

	},



	/*

	 * Desktops which falsely report a backlight and which our heuristics

drivers/acpi/x86/utils.c

+42 −3
Original line number Diff line number Diff line
@@ -251,6 +251,7 @@ bool force_storage_d3(void) 
#define ACPI_QUIRK_UART1_TTY_UART2_SKIP				BIT(1)

#define ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY			BIT(2)

#define ACPI_QUIRK_USE_ACPI_AC_AND_BATTERY			BIT(3)

#define ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS			BIT(4)



static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = {

	/*
@@ -279,6 +280,16 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { 
	 *    need the x86-android-tablets module to properly work.

	 */

#if IS_ENABLED(CONFIG_X86_ANDROID_TABLETS)

	{

		/* Acer Iconia One 7 B1-750 */

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Insyde"),

			DMI_MATCH(DMI_PRODUCT_NAME, "VESPA2"),

		},

		.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |

					ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),

	},

	{

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
@@ -286,7 +297,19 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { 
		},

		.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |

					ACPI_QUIRK_UART1_TTY_UART2_SKIP |

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |

					ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),

	},

	{

		/* Lenovo Yoga Book X90F/L */

		.matches = {

			DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"),

			DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"),

		},

		.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |

					ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),

	},

	{

		.matches = {
@@ -294,7 +317,8 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "TF103C"),

		},

		.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |

					ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),

	},

	{

		/* Lenovo Yoga Tablet 2 1050F/L */
@@ -336,7 +360,8 @@ static const struct dmi_system_id acpi_quirk_skip_dmi_ids[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "M890BAP"),

		},

		.driver_data = (void *)(ACPI_QUIRK_SKIP_I2C_CLIENTS |

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY),

					ACPI_QUIRK_SKIP_ACPI_AC_AND_BATTERY |

					ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS),

	},

	{

		/* Whitelabel (sold as various brands) TM800A550L */
@@ -413,6 +438,20 @@ int acpi_quirk_skip_serdev_enumeration(struct device *controller_parent, bool *s 
	return 0;

}

EXPORT_SYMBOL_GPL(acpi_quirk_skip_serdev_enumeration);



bool acpi_quirk_skip_gpio_event_handlers(void)

{

	const struct dmi_system_id *dmi_id;

	long quirks;



	dmi_id = dmi_first_match(acpi_quirk_skip_dmi_ids);

	if (!dmi_id)

		return false;



	quirks = (unsigned long)dmi_id->driver_data;

	return (quirks & ACPI_QUIRK_SKIP_GPIO_EVENT_HANDLERS);

}

EXPORT_SYMBOL_GPL(acpi_quirk_skip_gpio_event_handlers);

#endif



/* Lists of PMIC ACPI HIDs with an (often better) native charger driver */

drivers/gpio/gpiolib-acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -536,6 +536,9 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) 
	if (ACPI_FAILURE(status))

		return;



	if (acpi_quirk_skip_gpio_event_handlers())

		return;



	acpi_walk_resources(handle, METHOD_NAME__AEI,

			    acpi_gpiochip_alloc_event, acpi_gpio);