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

Merge branches 'acpi-resource' and 'acpi-pm' 

Merge ACPI resource management and ACPI power management chages for
6.1-rc1:

 - Filter out non-memory resources in is_memory(), add a helper
   function to find all memory type resources of an ACPI device object
   and use that function in 3 places (Heikki Krogerus).

 - Add IRQ override quirks for Asus Vivobook K3402ZA/K3502ZA and ASUS
   model S5402ZA (Tamim Khan, Kellen Renshaw).

 - Fix acpi_dev_state_d0() kerneldoc (Sakari Ailus).

 - Fix up suspend-to-idle support on ASUS Rembrandt laptops (Mario
   Limonciello).

* acpi-resource:
  ACPI: resource: Add ASUS model S5402ZA to quirks
  usb: typec: intel_pmc_mux: Use the helper acpi_dev_get_memory_resources()
  ACPI: resource: Skip IRQ override on Asus Vivobook K3402ZA/K3502ZA
  ACPI: LPSS: Use the helper acpi_dev_get_memory_resources()
  ACPI: APD: Use the helper acpi_dev_get_memory_resources()
  ACPI: resource: Add helper function acpi_dev_get_memory_resources()
  ACPI: resource: Filter out the non memory resources in is_memory()

* acpi-pm:
  ACPI: x86: s2idle: Add another ID to s2idle_dmi_table
  ACPI: x86: s2idle: Fix a NULL pointer dereference
  ACPI: x86: s2idle: Add a quirk for ASUSTeK COMPUTER INC. ROG Flow X13
  ACPI: x86: s2idle: Add a quirk for Lenovo Slim 7 Pro 14ARH7
  ACPI: x86: s2idle: Add a quirk for ASUS ROG Zephyrus G14
  ACPI: x86: s2idle: Add a quirk for ASUS TUF Gaming A17 FA707RE
  ACPI: x86: s2idle: Add module parameter to prefer Microsoft GUID
  ACPI: x86: s2idle: If a new AMD _HID is missing assume Rembrandt
  ACPI: x86: s2idle: Move _HID handling for AMD systems into structures
  ACPI: PM: Fix acpi_dev_state_d0() kerneldoc
parents 80487a37 6e5cbe7c 54bd1e54

drivers/acpi/acpi_apd.c

+1 −8
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ static int acpi_apd_setup(struct apd_private_data *pdata) 
}



#ifdef CONFIG_X86_AMD_PLATFORM_DEVICE

static int misc_check_res(struct acpi_resource *ares, void *data)

{

	struct resource res;



	return !acpi_dev_resource_memory(ares, &res);

}



static int fch_misc_setup(struct apd_private_data *pdata)

{
@@ -82,8 +76,7 @@ static int fch_misc_setup(struct apd_private_data *pdata) 
		return -ENOMEM;



	INIT_LIST_HEAD(&resource_list);

	ret = acpi_dev_get_resources(adev, &resource_list, misc_check_res,

				     NULL);

	ret = acpi_dev_get_memory_resources(adev, &resource_list);

	if (ret < 0)

		return -ENOENT;

drivers/acpi/acpi_lpss.c

+1 −8
Original line number Diff line number Diff line
@@ -392,13 +392,6 @@ static const struct acpi_device_id acpi_lpss_device_ids[] = { 


#ifdef CONFIG_X86_INTEL_LPSS



static int is_memory(struct acpi_resource *res, void *not_used)

{

	struct resource r;



	return !acpi_dev_resource_memory(res, &r);

}



/* LPSS main clock device. */

static struct platform_device *lpss_clk_dev;
@@ -659,7 +652,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
		return -ENOMEM;



	INIT_LIST_HEAD(&resource_list);

	ret = acpi_dev_get_resources(adev, &resource_list, is_memory, NULL);

	ret = acpi_dev_get_memory_resources(adev, &resource_list);

	if (ret < 0)

		goto err_out;

drivers/acpi/device_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1466,7 +1466,7 @@ EXPORT_SYMBOL_GPL(acpi_storage_d3); 
 * not valid to ask for the ACPI power state of the device in that time frame.

 *

 * This function is intended to be used in a driver's probe or remove

 * function. See Documentation/firmware-guide/acpi/low-power-probe.rst for

 * function. See Documentation/firmware-guide/acpi/non-d0-probe.rst for

 * more information.

 */

bool acpi_dev_state_d0(struct device *dev)

drivers/acpi/resource.c

+46 −0
Original line number Diff line number Diff line
@@ -399,6 +399,31 @@ static const struct dmi_system_id medion_laptop[] = { 
	{ }

};



static const struct dmi_system_id asus_laptop[] = {

	{

		.ident = "Asus Vivobook K3402ZA",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "K3402ZA"),

		},

	},

	{

		.ident = "Asus Vivobook K3502ZA",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "K3502ZA"),

		},

	},

	{

		.ident = "Asus Vivobook S5402ZA",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"),

		},

	},

	{ }

};



struct irq_override_cmp {

	const struct dmi_system_id *system;

	unsigned char irq;
@@ -409,6 +434,7 @@ struct irq_override_cmp { 


static const struct irq_override_cmp skip_override_table[] = {

	{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },

	{ asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },

};



static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
@@ -690,6 +716,9 @@ static int is_memory(struct acpi_resource *ares, void *not_used) 


	memset(&win, 0, sizeof(win));



	if (acpi_dev_filter_resource_type(ares, IORESOURCE_MEM))

		return 1;



	return !(acpi_dev_resource_memory(ares, res)

	       || acpi_dev_resource_address_space(ares, &win)

	       || acpi_dev_resource_ext_address_space(ares, &win));
@@ -718,6 +747,23 @@ int acpi_dev_get_dma_resources(struct acpi_device *adev, struct list_head *list) 
}

EXPORT_SYMBOL_GPL(acpi_dev_get_dma_resources);



/**

 * acpi_dev_get_memory_resources - Get current memory resources of a device.

 * @adev: ACPI device node to get the resources for.

 * @list: Head of the resultant list of resources (must be empty).

 *

 * This is a helper function that locates all memory type resources of @adev

 * with acpi_dev_get_resources().

 *

 * The number of resources in the output list is returned on success, an error

 * code reflecting the error condition is returned otherwise.

 */

int acpi_dev_get_memory_resources(struct acpi_device *adev, struct list_head *list)

{

	return acpi_dev_get_resources(adev, list, is_memory, NULL);

}

EXPORT_SYMBOL_GPL(acpi_dev_get_memory_resources);



/**

 * acpi_dev_filter_resource_type - Filter ACPI resource according to resource

 *				   types

drivers/acpi/x86/s2idle.c

+123 −24
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/dmi.h>

#include <linux/suspend.h>



#include "../sleep.h"
@@ -27,6 +28,10 @@ static bool sleep_no_lps0 __read_mostly; 
module_param(sleep_no_lps0, bool, 0644);

MODULE_PARM_DESC(sleep_no_lps0, "Do not use the special LPS0 device interface");



static bool prefer_microsoft_dsm_guid __read_mostly;

module_param(prefer_microsoft_dsm_guid, bool, 0644);

MODULE_PARM_DESC(prefer_microsoft_dsm_guid, "Prefer using Microsoft GUID in LPS0 device _DSM evaluation");



static const struct acpi_device_id lps0_device_ids[] = {

	{"PNP0D80", },

	{"", },
@@ -363,40 +368,132 @@ static int validate_dsm(acpi_handle handle, const char *uuid, int rev, guid_t *d 
	return ret;

}



struct amd_lps0_hid_device_data {

	const unsigned int rev_id;

	const bool check_off_by_one;

	const bool prefer_amd_guid;

};



static const struct amd_lps0_hid_device_data amd_picasso = {

	.rev_id = 0,

	.check_off_by_one = true,

	.prefer_amd_guid = false,

};



static const struct amd_lps0_hid_device_data amd_cezanne = {

	.rev_id = 0,

	.check_off_by_one = false,

	.prefer_amd_guid = false,

};



static const struct amd_lps0_hid_device_data amd_rembrandt = {

	.rev_id = 2,

	.check_off_by_one = false,

	.prefer_amd_guid = true,

};



static const struct acpi_device_id amd_hid_ids[] = {

	{"AMD0004",	(kernel_ulong_t)&amd_picasso,	},

	{"AMD0005",	(kernel_ulong_t)&amd_picasso,	},

	{"AMDI0005",	(kernel_ulong_t)&amd_picasso,	},

	{"AMDI0006",	(kernel_ulong_t)&amd_cezanne,	},

	{"AMDI0007",	(kernel_ulong_t)&amd_rembrandt,	},

	{}

};



static int lps0_prefer_microsoft(const struct dmi_system_id *id)

{

	pr_debug("Preferring Microsoft GUID.\n");

	prefer_microsoft_dsm_guid = true;

	return 0;

}



static const struct dmi_system_id s2idle_dmi_table[] __initconst = {

	{

		/*

		 * ASUS TUF Gaming A17 FA707RE

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

		 */

		.callback = lps0_prefer_microsoft,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "ASUS TUF Gaming A17"),

		},

	},

	{

		/* ASUS ROG Zephyrus G14 (2022) */

		.callback = lps0_prefer_microsoft,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "ROG Zephyrus G14 GA402"),

		},

	},

	{

		/*

		 * Lenovo Yoga Slim 7 Pro X 14ARH7

		 * https://bugzilla.kernel.org/show_bug.cgi?id=216473 : 82V2

		 * https://bugzilla.kernel.org/show_bug.cgi?id=216438 : 82TL

		 */

		.callback = lps0_prefer_microsoft,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "82"),

		},

	},

	{

		/*

		 * ASUSTeK COMPUTER INC. ROG Flow X13 GV301RE_GV301RE

		 * https://gitlab.freedesktop.org/drm/amd/-/issues/2148

		 */

		.callback = lps0_prefer_microsoft,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "ROG Flow X13 GV301"),

		},

	},

	{

		/*

		 * ASUSTeK COMPUTER INC. ROG Flow X16 GV601RW_GV601RW

		 * https://gitlab.freedesktop.org/drm/amd/-/issues/2148

		 */

		.callback = lps0_prefer_microsoft,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "ROG Flow X16 GV601"),

		},

	},

	{}

};



static int lps0_device_attach(struct acpi_device *adev,

			      const struct acpi_device_id *not_used)

{

	if (lps0_device_handle)

		return 0;



	if (acpi_s2idle_vendor_amd()) {

		/* AMD0004, AMD0005, AMDI0005:

		 * - Should use rev_id 0x0

		 * - function mask > 0x3: Should use AMD method, but has off by one bug

		 * - function mask = 0x3: Should use Microsoft method

		 * AMDI0006:

		 * - should use rev_id 0x0

		 * - function mask = 0x3: Should use Microsoft method

		 * AMDI0007:

		 * - Should use rev_id 0x2

		 * - Should only use AMD method

		 */

		const char *hid = acpi_device_hid(adev);

		rev_id = strcmp(hid, "AMDI0007") ? 0 : 2;

		lps0_dsm_func_mask = validate_dsm(adev->handle,

					ACPI_LPS0_DSM_UUID_AMD, rev_id, &lps0_dsm_guid);

	lps0_dsm_func_mask_microsoft = validate_dsm(adev->handle,

						    ACPI_LPS0_DSM_UUID_MICROSOFT, 0,

						    &lps0_dsm_guid_microsoft);

		if (lps0_dsm_func_mask > 0x3 && (!strcmp(hid, "AMD0004") ||

						 !strcmp(hid, "AMD0005") ||

						 !strcmp(hid, "AMDI0005"))) {

	if (acpi_s2idle_vendor_amd()) {

		static const struct acpi_device_id *dev_id;

		const struct amd_lps0_hid_device_data *data;



		for (dev_id = &amd_hid_ids[0]; dev_id->id[0]; dev_id++)

			if (acpi_dev_hid_uid_match(adev, dev_id->id, NULL))

				break;

		if (dev_id->id[0])

			data = (const struct amd_lps0_hid_device_data *) dev_id->driver_data;

		else

			data = &amd_rembrandt;

		rev_id = data->rev_id;

		lps0_dsm_func_mask = validate_dsm(adev->handle,

					ACPI_LPS0_DSM_UUID_AMD, rev_id, &lps0_dsm_guid);

		if (lps0_dsm_func_mask > 0x3 && data->check_off_by_one) {

			lps0_dsm_func_mask = (lps0_dsm_func_mask << 1) | 0x1;

			acpi_handle_debug(adev->handle, "_DSM UUID %s: Adjusted function mask: 0x%x\n",

					  ACPI_LPS0_DSM_UUID_AMD, lps0_dsm_func_mask);

		} else if (lps0_dsm_func_mask_microsoft > 0 &&

				(!strcmp(hid, "AMDI0007") ||

				 !strcmp(hid, "AMDI0008"))) {

		} else if (lps0_dsm_func_mask_microsoft > 0 && data->prefer_amd_guid &&

				!prefer_microsoft_dsm_guid) {

			lps0_dsm_func_mask_microsoft = -EINVAL;

			acpi_handle_debug(adev->handle, "_DSM Using AMD method\n");

		}
@@ -404,6 +501,7 @@ static int lps0_device_attach(struct acpi_device *adev, 
		rev_id = 1;

		lps0_dsm_func_mask = validate_dsm(adev->handle,

					ACPI_LPS0_DSM_UUID, rev_id, &lps0_dsm_guid);

		if (!prefer_microsoft_dsm_guid)

			lps0_dsm_func_mask_microsoft = -EINVAL;

	}
@@ -533,8 +631,9 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = { 
	.end = acpi_s2idle_end,

};



void acpi_s2idle_setup(void)

void __init acpi_s2idle_setup(void)

{

	dmi_check_system(s2idle_dmi_table);

	acpi_scan_add_handler(&lps0_handler);

	s2idle_set_ops(&acpi_s2idle_ops_lps0);

}