Commit ba46e42e authored by Hans de Goede's avatar Hans de Goede Committed by Rafael J. Wysocki
Browse files

ACPI / x86: Allow specifying acpi_device_override_status() quirks by path 



Not all ACPI-devices have a HID + UID, allow specifying quirks for
acpi_device_override_status() by path too.

Note this moves the path/HID+UID check to after the CPU + DMI checks
since the path lookup is somewhat costly.

This way this lookup is only done on devices where the other checks
match.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1a68b346

drivers/acpi/x86/utils.c

+32 −10
Original line number Diff line number Diff line
@@ -38,22 +38,30 @@ struct override_status_id { 
	struct x86_cpu_id cpu_ids[2];

	struct dmi_system_id dmi_ids[2]; /* Optional */

	const char *uid;

	const char *path;

	unsigned long long status;

};



#define ENTRY(status, hid, uid, cpu_model, dmi...) {			\

#define ENTRY(status, hid, uid, path, cpu_model, dmi...) {		\

	{ { hid, }, {} },						\

	{ X86_MATCH_INTEL_FAM6_MODEL(cpu_model, NULL), {} },		\

	{ { .matches = dmi }, {} },					\

	uid,								\

	path,								\

	status,								\

}



#define PRESENT_ENTRY_HID(hid, uid, cpu_model, dmi...) \

	ENTRY(ACPI_STA_DEFAULT, hid, uid, cpu_model, dmi)

	ENTRY(ACPI_STA_DEFAULT, hid, uid, NULL, cpu_model, dmi)



#define NOT_PRESENT_ENTRY_HID(hid, uid, cpu_model, dmi...) \

	ENTRY(0, hid, uid, cpu_model, dmi)

	ENTRY(0, hid, uid, NULL, cpu_model, dmi)



#define PRESENT_ENTRY_PATH(path, cpu_model, dmi...) \

	ENTRY(ACPI_STA_DEFAULT, "", NULL, path, cpu_model, dmi)



#define NOT_PRESENT_ENTRY_PATH(path, cpu_model, dmi...) \

	ENTRY(0, "", NULL, path, cpu_model, dmi)



static const struct override_status_id override_status_ids[] = {

	/*
@@ -120,20 +128,34 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s 
	unsigned int i;



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

		if (acpi_match_device_ids(adev, override_status_ids[i].hid))

		if (!x86_match_cpu(override_status_ids[i].cpu_ids))

			continue;



		if (!adev->pnp.unique_id ||

		    strcmp(adev->pnp.unique_id, override_status_ids[i].uid))

		if (override_status_ids[i].dmi_ids[0].matches[0].slot &&

		    !dmi_check_system(override_status_ids[i].dmi_ids))

			continue;



		if (!x86_match_cpu(override_status_ids[i].cpu_ids))

		if (override_status_ids[i].path) {

			struct acpi_buffer path = { ACPI_ALLOCATE_BUFFER, NULL };

			bool match;



			if (acpi_get_name(adev->handle, ACPI_FULL_PATHNAME, &path))

				continue;



		if (override_status_ids[i].dmi_ids[0].matches[0].slot &&

		    !dmi_check_system(override_status_ids[i].dmi_ids))

			match = strcmp((char *)path.pointer, override_status_ids[i].path) == 0;

			kfree(path.pointer);



			if (!match)

				continue;

		} else {

			if (acpi_match_device_ids(adev, override_status_ids[i].hid))

				continue;



			if (!adev->pnp.unique_id ||

			    strcmp(adev->pnp.unique_id, override_status_ids[i].uid))

				continue;

		}



		*status = override_status_ids[i].status;

		ret = true;

		break;