forked from Minki/linux
c2b46d679b
This patch makes 2 changes:
1. Restore old behavior
Originally, EC driver stops handling both events and transactions in
acpi_ec_block_transactions(), and restarts to handle transactions in
acpi_ec_unblock_transactions_early(), restarts to handle both events and
transactions in acpi_ec_unblock_transactions().
While currently, EC driver still stops handling both events and
transactions in acpi_ec_block_transactions(), but restarts to handle both
events and transactions in acpi_ec_unblock_transactions_early().
This patch tries to restore the old behavior by dropping
__acpi_ec_enable_event() from acpi_unblock_transactions_early().
2. Improve old behavior
However this still cannot fix the real issue as both of the
acpi_ec_unblock_xxx() functions are invoked in the noirq stage. Since the
EC driver actually doesn't implement the event handling in the polling
mode, re-enabling the event handling too early in the noirq stage could
result in the problem that if there is no triggering source causing
advance_transaction() to be invoked, pending SCI_EVT cannot be detected by
the EC driver and _Qxx cannot be triggered.
It actually makes sense to restart the event handling in any point during
resuming after the noirq stage. Just like the boot stage where the event
handling is enabled in .add(), this patch further moves
acpi_ec_enable_event() to .resume(). After doing that, the following 2
functions can be combined:
acpi_ec_unblock_transactions_early()/acpi_ec_unblock_transactions().
The differences of the event handling availability between the old behavior
(this patch isn't applied) and the new behavior (this patch is applied) are
as follows:
!Applied Applied
before suspend Y Y
suspend before EC Y Y
suspend after EC Y Y
suspend_late Y Y
suspend_noirq Y (actually N) Y (actually N)
resume_noirq Y (actually N) Y (actually N)
resume_late Y (actually N) Y (actually N)
resume before EC Y (actually N) Y (actually N)
resume after EC Y (actually N) Y
after resume Y (actually N) Y
Where "actually N" means if there is no triggering source, the EC driver
is actually not able to notice the pending SCI_EVT occurred in the noirq
stage. So we can clearly see that this patch has improved the situation.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Tested-by: Todd E Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
230 lines
8.2 KiB
C
230 lines
8.2 KiB
C
/*
|
|
* acpi/internal.h
|
|
* For use by Linux/ACPI infrastructure, not drivers
|
|
*
|
|
* Copyright (c) 2009, Intel Corporation.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope 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_INTERNAL_H_
|
|
#define _ACPI_INTERNAL_H_
|
|
|
|
#define PREFIX "ACPI: "
|
|
|
|
int early_acpi_osi_init(void);
|
|
int acpi_osi_init(void);
|
|
acpi_status acpi_os_initialize1(void);
|
|
void init_acpi_device_notify(void);
|
|
int acpi_scan_init(void);
|
|
void acpi_pci_root_init(void);
|
|
void acpi_pci_link_init(void);
|
|
void acpi_processor_init(void);
|
|
void acpi_platform_init(void);
|
|
void acpi_pnp_init(void);
|
|
void acpi_int340x_thermal_init(void);
|
|
#ifdef CONFIG_ARM_AMBA
|
|
void acpi_amba_init(void);
|
|
#else
|
|
static inline void acpi_amba_init(void) {}
|
|
#endif
|
|
int acpi_sysfs_init(void);
|
|
void acpi_container_init(void);
|
|
void acpi_memory_hotplug_init(void);
|
|
#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
|
|
int acpi_ioapic_add(struct acpi_pci_root *root);
|
|
int acpi_ioapic_remove(struct acpi_pci_root *root);
|
|
#else
|
|
static inline int acpi_ioapic_add(struct acpi_pci_root *root) { return 0; }
|
|
static inline int acpi_ioapic_remove(struct acpi_pci_root *root) { return 0; }
|
|
#endif
|
|
#ifdef CONFIG_ACPI_DOCK
|
|
void register_dock_dependent_device(struct acpi_device *adev,
|
|
acpi_handle dshandle);
|
|
int dock_notify(struct acpi_device *adev, u32 event);
|
|
void acpi_dock_add(struct acpi_device *adev);
|
|
#else
|
|
static inline void register_dock_dependent_device(struct acpi_device *adev,
|
|
acpi_handle dshandle) {}
|
|
static inline int dock_notify(struct acpi_device *adev, u32 event) { return -ENODEV; }
|
|
static inline void acpi_dock_add(struct acpi_device *adev) {}
|
|
#endif
|
|
#ifdef CONFIG_X86
|
|
void acpi_cmos_rtc_init(void);
|
|
#else
|
|
static inline void acpi_cmos_rtc_init(void) {}
|
|
#endif
|
|
int acpi_rev_override_setup(char *str);
|
|
|
|
extern bool acpi_force_hot_remove;
|
|
|
|
void acpi_sysfs_add_hotplug_profile(struct acpi_hotplug_profile *hotplug,
|
|
const char *name);
|
|
int acpi_scan_add_handler_with_hotplug(struct acpi_scan_handler *handler,
|
|
const char *hotplug_profile_name);
|
|
void acpi_scan_hotplug_enabled(struct acpi_hotplug_profile *hotplug, bool val);
|
|
|
|
#ifdef CONFIG_DEBUG_FS
|
|
extern struct dentry *acpi_debugfs_dir;
|
|
void acpi_debugfs_init(void);
|
|
#else
|
|
static inline void acpi_debugfs_init(void) { return; }
|
|
#endif
|
|
void acpi_lpss_init(void);
|
|
|
|
void acpi_apd_init(void);
|
|
|
|
acpi_status acpi_hotplug_schedule(struct acpi_device *adev, u32 src);
|
|
bool acpi_queue_hotplug_work(struct work_struct *work);
|
|
void acpi_device_hotplug(struct acpi_device *adev, u32 src);
|
|
bool acpi_scan_is_offline(struct acpi_device *adev, bool uevent);
|
|
|
|
acpi_status acpi_sysfs_table_handler(u32 event, void *table, void *context);
|
|
void acpi_scan_table_handler(u32 event, void *table, void *context);
|
|
|
|
/* --------------------------------------------------------------------------
|
|
Device Node Initialization / Removal
|
|
-------------------------------------------------------------------------- */
|
|
#define ACPI_STA_DEFAULT (ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED | \
|
|
ACPI_STA_DEVICE_UI | ACPI_STA_DEVICE_FUNCTIONING)
|
|
|
|
extern struct list_head acpi_bus_id_list;
|
|
|
|
struct acpi_device_bus_id {
|
|
char bus_id[15];
|
|
unsigned int instance_no;
|
|
struct list_head node;
|
|
};
|
|
|
|
int acpi_device_add(struct acpi_device *device,
|
|
void (*release)(struct device *));
|
|
void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
|
|
int type, unsigned long long sta);
|
|
int acpi_device_setup_files(struct acpi_device *dev);
|
|
void acpi_device_remove_files(struct acpi_device *dev);
|
|
void acpi_device_add_finalize(struct acpi_device *device);
|
|
void acpi_free_pnp_ids(struct acpi_device_pnp *pnp);
|
|
bool acpi_device_is_present(struct acpi_device *adev);
|
|
bool acpi_device_is_battery(struct acpi_device *adev);
|
|
bool acpi_device_is_first_physical_node(struct acpi_device *adev,
|
|
const struct device *dev);
|
|
struct device *acpi_get_first_physical_node(struct acpi_device *adev);
|
|
|
|
/* --------------------------------------------------------------------------
|
|
Device Matching and Notification
|
|
-------------------------------------------------------------------------- */
|
|
struct acpi_device *acpi_companion_match(const struct device *dev);
|
|
int __acpi_device_uevent_modalias(struct acpi_device *adev,
|
|
struct kobj_uevent_env *env);
|
|
|
|
/* --------------------------------------------------------------------------
|
|
Power Resource
|
|
-------------------------------------------------------------------------- */
|
|
int acpi_power_init(void);
|
|
void acpi_power_resources_list_free(struct list_head *list);
|
|
int acpi_extract_power_resources(union acpi_object *package, unsigned int start,
|
|
struct list_head *list);
|
|
int acpi_add_power_resource(acpi_handle handle);
|
|
void acpi_power_add_remove_device(struct acpi_device *adev, bool add);
|
|
int acpi_power_wakeup_list_init(struct list_head *list, int *system_level);
|
|
int acpi_device_sleep_wake(struct acpi_device *dev,
|
|
int enable, int sleep_state, int dev_state);
|
|
int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
|
|
int acpi_power_on_resources(struct acpi_device *device, int state);
|
|
int acpi_power_transition(struct acpi_device *device, int state);
|
|
|
|
int acpi_wakeup_device_init(void);
|
|
|
|
#ifdef CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC
|
|
void acpi_early_processor_set_pdc(void);
|
|
#else
|
|
static inline void acpi_early_processor_set_pdc(void) {}
|
|
#endif
|
|
|
|
#ifdef CONFIG_X86
|
|
void acpi_early_processor_osc(void);
|
|
#else
|
|
static inline void acpi_early_processor_osc(void) {}
|
|
#endif
|
|
|
|
/* --------------------------------------------------------------------------
|
|
Embedded Controller
|
|
-------------------------------------------------------------------------- */
|
|
struct acpi_ec {
|
|
acpi_handle handle;
|
|
unsigned long gpe;
|
|
unsigned long command_addr;
|
|
unsigned long data_addr;
|
|
bool global_lock;
|
|
unsigned long flags;
|
|
unsigned long reference_count;
|
|
struct mutex mutex;
|
|
wait_queue_head_t wait;
|
|
struct list_head list;
|
|
struct transaction *curr;
|
|
spinlock_t lock;
|
|
struct work_struct work;
|
|
unsigned long timestamp;
|
|
unsigned long nr_pending_queries;
|
|
bool saved_busy_polling;
|
|
unsigned int saved_polling_guard;
|
|
};
|
|
|
|
extern struct acpi_ec *first_ec;
|
|
|
|
/* If we find an EC via the ECDT, we need to keep a ptr to its context */
|
|
/* External interfaces use first EC only, so remember */
|
|
typedef int (*acpi_ec_query_func) (void *data);
|
|
|
|
int acpi_ec_init(void);
|
|
int acpi_ec_ecdt_probe(void);
|
|
int acpi_ec_dsdt_probe(void);
|
|
void acpi_ec_block_transactions(void);
|
|
void acpi_ec_unblock_transactions(void);
|
|
int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
|
|
acpi_handle handle, acpi_ec_query_func func,
|
|
void *data);
|
|
void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit);
|
|
|
|
|
|
/*--------------------------------------------------------------------------
|
|
Suspend/Resume
|
|
-------------------------------------------------------------------------- */
|
|
#ifdef CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT
|
|
extern int acpi_sleep_init(void);
|
|
#else
|
|
static inline int acpi_sleep_init(void) { return -ENXIO; }
|
|
#endif
|
|
|
|
#ifdef CONFIG_ACPI_SLEEP
|
|
void acpi_sleep_proc_init(void);
|
|
int suspend_nvs_alloc(void);
|
|
void suspend_nvs_free(void);
|
|
int suspend_nvs_save(void);
|
|
void suspend_nvs_restore(void);
|
|
#else
|
|
static inline void acpi_sleep_proc_init(void) {}
|
|
static inline int suspend_nvs_alloc(void) { return 0; }
|
|
static inline void suspend_nvs_free(void) {}
|
|
static inline int suspend_nvs_save(void) { return 0; }
|
|
static inline void suspend_nvs_restore(void) {}
|
|
#endif
|
|
|
|
/*--------------------------------------------------------------------------
|
|
Device properties
|
|
-------------------------------------------------------------------------- */
|
|
#define ACPI_DT_NAMESPACE_HID "PRP0001"
|
|
|
|
void acpi_init_properties(struct acpi_device *adev);
|
|
void acpi_free_properties(struct acpi_device *adev);
|
|
|
|
#endif /* _ACPI_INTERNAL_H_ */
|