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

Merge branches 'acpi-pm', 'acpi-soc', 'acpi-tables' and 'acpi-resource' 

Merge ACPI power management changes, ACPI LPSS driver changes, ACPI
table parsing code changes and ACPI resource handling changes for
v5.20-rc1:

 - Save NVS memory during transitions into S3 on Lenovo G40-45 (Manyi
   Li).

 - Add support for upcoming AMD uPEP device ID AMDI008 to the ACPI
   suspend-to-idle driver for x86 platforms (Shyam Sundar S K).

 - Clean up checks related to the ACPI_FADT_LOW_POWER_S0 platform flag
   in the LPIT table driver and the suspend-to-idle driver for x86
   platforms (Rafael Wysocki).

 - Print information messages regarding declared LPS0 idle support in
   the platform firmware (Rafael Wysocki).

 - Fix missing check in register_device_clock() in the ACPI driver for
   Intel SoCs (huhai).

 - Fix ACS setup in the VIOT table parser (Eric Auger).

 - Skip IRQ override on AMD Zen platforms where it's harmful (Chuanhong
   Guo).

* acpi-pm:
  ACPI: PM: x86: Print messages regarding LPS0 idle support
  ACPI: PM: s2idle: Use LPS0 idle if ACPI_FADT_LOW_POWER_S0 is unset
  Revert "ACPI / PM: LPIT: Register sysfs attributes based on FADT"
  ACPI: PM: s2idle: Add support for upcoming AMD uPEP HID AMDI008
  ACPI: PM: save NVS memory for Lenovo G40-45

* acpi-soc:
  ACPI: LPSS: Fix missing check in register_device_clock()

* acpi-tables:
  ACPI: VIOT: Fix ACS setup

* acpi-resource:
  ACPI: resource: skip IRQ override on AMD Zen platforms
parents 198c414e ec6c0503 b4f1f61e 3dcb861d 9946e39f

drivers/acpi/acpi_lpit.c

+0 −6
Original line number Diff line number Diff line
@@ -109,17 +109,11 @@ static void lpit_update_residency(struct lpit_residency_info *info, 
		if (!info->iomem_addr)

			return;



		if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))

			return;



		/* Silently fail, if cpuidle attribute group is not present */

		sysfs_add_file_to_group(&cpu_subsys.dev_root->kobj,

					&dev_attr_low_power_idle_system_residency_us.attr,

					"cpuidle");

	} else if (info->gaddr.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) {

		if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0))

			return;



		/* Silently fail, if cpuidle attribute group is not present */

		sysfs_add_file_to_group(&cpu_subsys.dev_root->kobj,

					&dev_attr_low_power_idle_cpu_residency_us.attr,

drivers/acpi/acpi_lpss.c

+3 −0
Original line number Diff line number Diff line
@@ -422,6 +422,9 @@ static int register_device_clock(struct acpi_device *adev, 
	if (!lpss_clk_dev)

		lpt_register_clock_device();



	if (IS_ERR(lpss_clk_dev))

		return PTR_ERR(lpss_clk_dev);



	clk_data = platform_get_drvdata(lpss_clk_dev);

	if (!clk_data)

		return -ENODEV;

drivers/acpi/bus.c

+1 −0
Original line number Diff line number Diff line
@@ -1411,6 +1411,7 @@ static int __init acpi_init(void) 


	pci_mmcfg_late_init();

	acpi_iort_init();

	acpi_viot_early_init();

	acpi_hest_init();

	acpi_ghes_init();

	acpi_scan_init();

drivers/acpi/resource.c

+10 −0
Original line number Diff line number Diff line
@@ -416,6 +416,16 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, 
{

	int i;



#ifdef CONFIG_X86

	/*

	 * IRQ override isn't needed on modern AMD Zen systems and

	 * this override breaks active low IRQs on AMD Ryzen 6000 and

	 * newer systems. Skip it.

	 */

	if (boot_cpu_has(X86_FEATURE_ZEN))

		return false;

#endif



	for (i = 0; i < ARRAY_SIZE(skip_override_table); i++) {

		const struct irq_override_cmp *entry = &skip_override_table[i];

drivers/acpi/sleep.c

+11 −0
Original line number Diff line number Diff line
@@ -360,6 +360,14 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "80E3"),

		},

	},

	{

	.callback = init_nvs_save_s3,

	.ident = "Lenovo G40-45",

	.matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_NAME, "80E1"),

		},

	},

	/*

	 * ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using

	 * the Low Power S0 Idle firmware interface (see
@@ -816,6 +824,9 @@ static const struct platform_s2idle_ops acpi_s2idle_ops = { 


void __weak acpi_s2idle_setup(void)

{

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)

		pr_info("Efficient low-power S0 idle declared\n");



	s2idle_set_ops(&acpi_s2idle_ops);

}