a64a62ce9a
On platforms (ASUS X550ZE and possibly all ASUS X series) with valid ECDT EC but invalid DSDT EC, EC PM ops won't be invoked as ECDT EC is not an ACPI device. Thus the following commit actually removed post-resume acpi_ec_enable_event() invocation for such platforms, and triggered a regression on them that after being resumed, EC (actually should be ECDT) driver stops handling EC events: Commit:c2b46d679bSubject: ACPI / EC: Add PM operations to improve event handling for resume process Notice that the root cause actually is "ECDT is not an ACPI device" rather than "the timing of acpi_ec_enable_event() invocation", this patch fixes this issue by enumerating ECDT EC as an ACPI device. Due to the existence of the noirq stage, the ability of tuning the timing of acpi_ec_enable_event() invocation is still meaningful. This patch is a little bit different from the posted fix by moving acpi_config_boot_ec() from acpi_ec_ecdt_start() to acpi_ec_add() to make sure that EC event handling won't be stopped as long as the ACPI EC driver is bound. Thus the following sequence shouldn't disable EC event handling: unbind,suspend,resume,bind. Fixes:c2b46d679b(ACPI / EC: Add PM operations to improve event handling for resume process) Link: https://bugzilla.kernel.org/show_bug.cgi?id=196847 Reported-by: Luya Tshimbalanga <luya@fedoraproject.org> Tested-by: Luya Tshimbalanga <luya@fedoraproject.org> Cc: 4.9+ <stable@vger.kernel.org> # 4.9+ Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
125 lines
4.1 KiB
C
125 lines
4.1 KiB
C
/*
|
|
* acpi_drivers.h ($Revision: 31 $)
|
|
*
|
|
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
|
|
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*/
|
|
|
|
#ifndef __ACPI_DRIVERS_H__
|
|
#define __ACPI_DRIVERS_H__
|
|
|
|
#define ACPI_MAX_STRING 80
|
|
|
|
/*
|
|
* Please update drivers/acpi/debug.c and Documentation/acpi/debug.txt
|
|
* if you add to this list.
|
|
*/
|
|
#define ACPI_BUS_COMPONENT 0x00010000
|
|
#define ACPI_AC_COMPONENT 0x00020000
|
|
#define ACPI_BATTERY_COMPONENT 0x00040000
|
|
#define ACPI_BUTTON_COMPONENT 0x00080000
|
|
#define ACPI_SBS_COMPONENT 0x00100000
|
|
#define ACPI_FAN_COMPONENT 0x00200000
|
|
#define ACPI_PCI_COMPONENT 0x00400000
|
|
#define ACPI_POWER_COMPONENT 0x00800000
|
|
#define ACPI_CONTAINER_COMPONENT 0x01000000
|
|
#define ACPI_SYSTEM_COMPONENT 0x02000000
|
|
#define ACPI_THERMAL_COMPONENT 0x04000000
|
|
#define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000
|
|
#define ACPI_VIDEO_COMPONENT 0x10000000
|
|
#define ACPI_PROCESSOR_COMPONENT 0x20000000
|
|
|
|
/*
|
|
* _HID definitions
|
|
* HIDs must conform to ACPI spec(6.1.4)
|
|
* Linux specific HIDs do not apply to this and begin with LNX:
|
|
*/
|
|
|
|
#define ACPI_POWER_HID "LNXPOWER"
|
|
#define ACPI_PROCESSOR_OBJECT_HID "LNXCPU"
|
|
#define ACPI_SYSTEM_HID "LNXSYSTM"
|
|
#define ACPI_THERMAL_HID "LNXTHERM"
|
|
#define ACPI_BUTTON_HID_POWERF "LNXPWRBN"
|
|
#define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN"
|
|
#define ACPI_VIDEO_HID "LNXVIDEO"
|
|
#define ACPI_BAY_HID "LNXIOBAY"
|
|
#define ACPI_DOCK_HID "LNXDOCK"
|
|
#define ACPI_ECDT_HID "LNXEC"
|
|
/* Quirk for broken IBM BIOSes */
|
|
#define ACPI_SMBUS_IBM_HID "SMBUSIBM"
|
|
|
|
/*
|
|
* For fixed hardware buttons, we fabricate acpi_devices with HID
|
|
* ACPI_BUTTON_HID_POWERF or ACPI_BUTTON_HID_SLEEPF. Fixed hardware
|
|
* signals only an event; it doesn't supply a notification value.
|
|
* To allow drivers to treat notifications from fixed hardware the
|
|
* same as those from real devices, we turn the events into this
|
|
* notification value.
|
|
*/
|
|
#define ACPI_FIXED_HARDWARE_EVENT 0x100
|
|
|
|
/* --------------------------------------------------------------------------
|
|
PCI
|
|
-------------------------------------------------------------------------- */
|
|
|
|
|
|
/* ACPI PCI Interrupt Link (pci_link.c) */
|
|
|
|
int acpi_irq_penalty_init(void);
|
|
int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
|
|
int *polarity, char **name);
|
|
int acpi_pci_link_free_irq(acpi_handle handle);
|
|
|
|
/* ACPI PCI Device Binding (pci_bind.c) */
|
|
|
|
struct pci_bus;
|
|
|
|
struct pci_dev *acpi_get_pci_dev(acpi_handle);
|
|
|
|
/* Arch-defined function to add a bus to the system */
|
|
|
|
struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root);
|
|
|
|
#ifdef CONFIG_X86
|
|
void pci_acpi_crs_quirks(void);
|
|
#else
|
|
static inline void pci_acpi_crs_quirks(void) { }
|
|
#endif
|
|
|
|
/* --------------------------------------------------------------------------
|
|
Processor
|
|
-------------------------------------------------------------------------- */
|
|
|
|
#define ACPI_PROCESSOR_LIMIT_NONE 0x00
|
|
#define ACPI_PROCESSOR_LIMIT_INCREMENT 0x01
|
|
#define ACPI_PROCESSOR_LIMIT_DECREMENT 0x02
|
|
|
|
/*--------------------------------------------------------------------------
|
|
Dock Station
|
|
-------------------------------------------------------------------------- */
|
|
|
|
#ifdef CONFIG_ACPI_DOCK
|
|
extern int is_dock_device(struct acpi_device *adev);
|
|
#else
|
|
static inline int is_dock_device(struct acpi_device *adev)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_ACPI_DOCK */
|
|
|
|
#endif /*__ACPI_DRIVERS_H__*/
|