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

ACPI: Change acpi_device_always_present() into acpi_device_override_status() 



Currently, acpi_bus_get_status() calls acpi_device_always_present() to
allow platform quirks to override the _STA return to report that a
device is present (status = ACPI_STA_DEFAULT) independent of the _STA
return.

In some cases it might also be useful to have the opposite functionality
and have a platform quirk which marks a device as not present (status = 0)
to work around ACPI table bugs.

Change acpi_device_always_present() into a more generic
acpi_device_override_status() function to allow this.

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

drivers/acpi/bus.c

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ int acpi_bus_get_status(struct acpi_device *device) 
	acpi_status status;

	unsigned long long sta;



	if (acpi_device_always_present(device)) {

		acpi_set_device_status(device, ACPI_STA_DEFAULT);

	if (acpi_device_override_status(device, &sta)) {

		acpi_set_device_status(device, sta);

		return 0;

	}

drivers/acpi/x86/utils.c

+37 −27
Original line number Diff line number Diff line
@@ -22,54 +22,63 @@ 
 * Some BIOS-es (temporarily) hide specific APCI devices to work around Windows

 * driver bugs. We use DMI matching to match known cases of this.

 *

 * We work around this by always reporting ACPI_STA_DEFAULT for these

 * devices. Note this MUST only be done for devices where this is safe.

 * Likewise sometimes some not-actually present devices are sometimes

 * reported as present, which may cause issues.

 *

 * This forcing of devices to be present is limited to specific CPU (SoC)

 * models both to avoid potentially causing trouble on other models and

 * because some HIDs are re-used on different SoCs for completely

 * different devices.

 * We work around this by using the below quirk list to override the status

 * reported by the _STA method with a fixed value (ACPI_STA_DEFAULT or 0).

 * Note this MUST only be done for devices where this is safe.

 *

 * This status overriding is limited to specific CPU (SoC) models both to

 * avoid potentially causing trouble on other models and because some HIDs

 * are re-used on different SoCs for completely different devices.

 */

struct always_present_id {

struct override_status_id {

	struct acpi_device_id hid[2];

	struct x86_cpu_id cpu_ids[2];

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

	const char *uid;

	unsigned long long status;

};



#define X86_MATCH(model)	X86_MATCH_INTEL_FAM6_MODEL(model, NULL)



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

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

	{ { hid, }, {} },						\

	{ cpu_models, {} },						\

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

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

	uid,								\

	status,								\

}



static const struct always_present_id always_present_ids[] = {

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

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



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

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



static const struct override_status_id override_status_ids[] = {

	/*

	 * Bay / Cherry Trail PWM directly poked by GPU driver in win10,

	 * but Linux uses a separate PWM driver, harmless if not used.

	 */

	ENTRY("80860F09", "1", X86_MATCH(ATOM_SILVERMONT), {}),

	ENTRY("80862288", "1", X86_MATCH(ATOM_AIRMONT), {}),

	PRESENT_ENTRY_HID("80860F09", "1", ATOM_SILVERMONT, {}),

	PRESENT_ENTRY_HID("80862288", "1", ATOM_AIRMONT, {}),



	/*

	 * The INT0002 device is necessary to clear wakeup interrupt sources

	 * on Cherry Trail devices, without it we get nobody cared IRQ msgs.

	 */

	ENTRY("INT0002", "1", X86_MATCH(ATOM_AIRMONT), {}),

	PRESENT_ENTRY_HID("INT0002", "1", ATOM_AIRMONT, {}),

	/*

	 * On the Dell Venue 11 Pro 7130 and 7139, the DSDT hides

	 * the touchscreen ACPI device until a certain time

	 * after _SB.PCI0.GFX0.LCD.LCD1._ON gets called has passed

	 * *and* _STA has been called at least 3 times since.

	 */

	ENTRY("SYNA7500", "1", X86_MATCH(HASWELL_L), {

	PRESENT_ENTRY_HID("SYNA7500", "1", HASWELL_L, {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7130"),

	      }),

	ENTRY("SYNA7500", "1", X86_MATCH(HASWELL_L), {

	PRESENT_ENTRY_HID("SYNA7500", "1", HASWELL_L, {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		DMI_MATCH(DMI_PRODUCT_NAME, "Venue 11 Pro 7139"),

	      }),
@@ -85,19 +94,19 @@ static const struct always_present_id always_present_ids[] = { 
	 * was copy-pasted from the GPD win, so it has a disabled KIOX000A

	 * node which we should not enable, thus we also check the BIOS date.

	 */

	ENTRY("KIOX000A", "1", X86_MATCH(ATOM_AIRMONT), {

	PRESENT_ENTRY_HID("KIOX000A", "1", ATOM_AIRMONT, {

		DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),

		DMI_MATCH(DMI_BOARD_NAME, "Default string"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),

		DMI_MATCH(DMI_BIOS_DATE, "02/21/2017")

	      }),

	ENTRY("KIOX000A", "1", X86_MATCH(ATOM_AIRMONT), {

	PRESENT_ENTRY_HID("KIOX000A", "1", ATOM_AIRMONT, {

		DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),

		DMI_MATCH(DMI_BOARD_NAME, "Default string"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),

		DMI_MATCH(DMI_BIOS_DATE, "03/20/2017")

	      }),

	ENTRY("KIOX000A", "1", X86_MATCH(ATOM_AIRMONT), {

	PRESENT_ENTRY_HID("KIOX000A", "1", ATOM_AIRMONT, {

		DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),

		DMI_MATCH(DMI_BOARD_NAME, "Default string"),

		DMI_MATCH(DMI_PRODUCT_NAME, "Default string"),
@@ -105,26 +114,27 @@ static const struct always_present_id always_present_ids[] = { 
	      }),

};



bool acpi_device_always_present(struct acpi_device *adev)

bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *status)

{

	bool ret = false;

	unsigned int i;



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

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

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

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

			continue;



		if (!adev->pnp.unique_id ||

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

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

			continue;



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

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

			continue;



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

		    !dmi_check_system(always_present_ids[i].dmi_ids))

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

		    !dmi_check_system(override_status_ids[i].dmi_ids))

			continue;



		*status = override_status_ids[i].status;

		ret = true;

		break;

	}

include/acpi/acpi_bus.h

+3 −2
Original line number Diff line number Diff line
@@ -613,9 +613,10 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev, int state); 
int acpi_disable_wakeup_device_power(struct acpi_device *dev);



#ifdef CONFIG_X86

bool acpi_device_always_present(struct acpi_device *adev);

bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *status);

#else

static inline bool acpi_device_always_present(struct acpi_device *adev)

static inline bool acpi_device_override_status(struct acpi_device *adev,

					       unsigned long long *status)

{

	return false;

}