Commit 1ef27400 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-fixes-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These fix the return value of an IRQ mapping routine in the ACPI core,
  fix an EC driver issue causing abnormal fan behavior after system
  resume on some systems and add quirks for ACPI device objects that
  need to be treated as "always present" to work around bogus
  implementations of the _STA control method.

  Specifics:

   - Fix the return value of acpi_gsi_to_irq() to make the GSI to IRQ
     mapping work on the Mustang (ARM64) platform (Mark Salter).

   - Fix an EC driver issue that causes fans to behave abnormally after
     system resume on some systems which turns out to be related to
     switching over the EC into the polling mode during the noirq stages
     of system suspend and resume (Lv Zheng).

   - Add quirks for ACPI device objects that need to be treated as
     "always present", because their _STA methods are designed to work
     around Windows driver bugs and return garbage from our perspective
     (Hans de Goede)"

* tag 'acpi-fixes-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / x86: Add KIOX000A accelerometer on GPD win to always_present_ids array
  ACPI / x86: Add Dell Venue 11 Pro 7130 touchscreen to always_present_ids
  ACPI / x86: Allow matching always_present_id array entries by DMI
  Revert "ACPI / EC: Enable event freeze mode..." to fix a regression
  ACPI / EC: Drop EC noirq hooks to fix a regression
  ACPI / irq: Fix return code of acpi_gsi_to_irq()
parents e37720e2 9636603d

drivers/acpi/ec.c

+1 −20
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static unsigned int ec_storm_threshold __read_mostly = 8; 
module_param(ec_storm_threshold, uint, 0644);

MODULE_PARM_DESC(ec_storm_threshold, "Maxim false GPE numbers not considered as GPE storm");



static bool ec_freeze_events __read_mostly = true;

static bool ec_freeze_events __read_mostly = false;

module_param(ec_freeze_events, bool, 0644);

MODULE_PARM_DESC(ec_freeze_events, "Disabling event handling during suspend/resume");
@@ -1870,24 +1870,6 @@ error: 
}



#ifdef CONFIG_PM_SLEEP

static int acpi_ec_suspend_noirq(struct device *dev)

{

	struct acpi_ec *ec =

		acpi_driver_data(to_acpi_device(dev));



	acpi_ec_enter_noirq(ec);

	return 0;

}



static int acpi_ec_resume_noirq(struct device *dev)

{

	struct acpi_ec *ec =

		acpi_driver_data(to_acpi_device(dev));



	acpi_ec_leave_noirq(ec);

	return 0;

}



static int acpi_ec_suspend(struct device *dev)

{

	struct acpi_ec *ec =
@@ -1909,7 +1891,6 @@ static int acpi_ec_resume(struct device *dev) 
#endif



static const struct dev_pm_ops acpi_ec_pm = {

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend_noirq, acpi_ec_resume_noirq)

	SET_SYSTEM_SLEEP_PM_OPS(acpi_ec_suspend, acpi_ec_resume)

};

drivers/acpi/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static struct fwnode_handle *acpi_gsi_domain_id; 
 *

 * irq location updated with irq value [>0 on success, 0 on failure]

 *

 * Returns: linux IRQ number on success (>0)

 * Returns: 0 on success

 *          -EINVAL on failure

 */

int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
@@ -37,7 +37,7 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq) 
	 * *irq == 0 means no mapping, that should

	 * be reported as a failure

	 */

	return (*irq > 0) ? *irq : -EINVAL;

	return (*irq > 0) ? 0 : -EINVAL;

}

EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);

drivers/acpi/x86/utils.c

+37 −4
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include <linux/acpi.h>

#include <linux/dmi.h>

#include <asm/cpu_device_id.h>

#include <asm/intel-family.h>

#include "../internal.h"
@@ -20,6 +21,10 @@ 
 * Some ACPI devices are hidden (status == 0x0) in recent BIOS-es because

 * some recent Windows drivers bind to one device but poke at multiple

 * devices at the same time, so the others get hidden.

 *

 * 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.

 *
@@ -31,14 +36,16 @@ 
struct always_present_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;

};



#define ICPU(model)	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }



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

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

	{ { hid, }, {} },						\

	{ cpu_models, {} },						\

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

	uid,								\

}
@@ -47,13 +54,35 @@ static const struct always_present_id always_present_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", ICPU(INTEL_FAM6_ATOM_SILVERMONT1)),

	ENTRY("80862288", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT)),

	ENTRY("80860F09", "1", ICPU(INTEL_FAM6_ATOM_SILVERMONT1), {}),

	ENTRY("80862288", "1", ICPU(INTEL_FAM6_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", ICPU(INTEL_FAM6_ATOM_AIRMONT)),

	ENTRY("INT0002", "1", ICPU(INTEL_FAM6_ATOM_AIRMONT), {}),

	/*

	 * On the Dell Venue 11 Pro 7130 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", ICPU(INTEL_FAM6_HASWELL_ULT), {

		DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

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

	      }),

	/*

	 * The GPD win BIOS dated 20170320 has disabled the accelerometer, the

	 * drivers sometimes cause crashes under Windows and this is how the

	 * manufacturer has solved this :| Note that the the DMI data is less

	 * generic then it seems, a board_vendor of "AMI Corporation" is quite

	 * rare and a board_name of "Default String" also is rare.

	 */

	ENTRY("KIOX000A", "1", ICPU(INTEL_FAM6_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")

	      }),

};



bool acpi_device_always_present(struct acpi_device *adev)
@@ -76,6 +105,10 @@ bool acpi_device_always_present(struct acpi_device *adev) 
		if (!x86_match_cpu(always_present_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))

			continue;



		if (old_status != ACPI_STA_DEFAULT) /* Log only once */

			dev_info(&adev->dev,

				 "Device [%s] is in always present list\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE