hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HID: intel-ish-hid: ipc: check the NO_D3 flag to distinguish resume paths 

The NO_D3 flag would be set if the ISH enter D0i3 in ish_suspend(),
The resume paths can be distinguished by checking the NO_D3 flag.
It's more reasonable than checking the FW status.

Signed-off-by: Zhang Lixu <lixu.zhang@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Zhang Lixu 2019-08-08 18:21:13 +08:00 committed by Jiri Kosina
parent 2db8edaa88
commit fc19a57dd4
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/hid/intel-ish-hid/ipc/pci-ish.c
View File

@ -210,19 +210,11 @@ static void __maybe_unused ish_resume_handler(struct work_struct *work)
{ {
struct pci_dev *pdev = to_pci_dev(ish_resume_device); struct pci_dev *pdev = to_pci_dev(ish_resume_device);
struct ishtp_device *dev = pci_get_drvdata(pdev); struct ishtp_device *dev = pci_get_drvdata(pdev);
uint32_t fwsts;
int ret; int ret;
pdev->dev_flags &= ~PCI_DEV_FLAGS_NO_D3; /* Check the NO_D3 flag to distinguish the resume paths */
if (pdev->dev_flags & PCI_DEV_FLAGS_NO_D3) {
/* Get ISH FW status */ pdev->dev_flags &= ~PCI_DEV_FLAGS_NO_D3;
fwsts = IPC_GET_ISH_FWSTS(dev->ops->get_fw_status(dev));
/*
* If currently, in ISH FW, sensor app is loaded or beyond that,
* it means ISH isn't powered off, in this case, send a resume message.
*/
if (fwsts >= FWSTS_SENSOR_APP_LOADED) {
disable_irq_wake(pdev->irq); disable_irq_wake(pdev->irq);
ishtp_send_resume(dev); ishtp_send_resume(dev);
@ -232,16 +224,20 @@ static void __maybe_unused ish_resume_handler(struct work_struct *work)
ret = wait_event_interruptible_timeout(dev->resume_wait, ret = wait_event_interruptible_timeout(dev->resume_wait,
!dev->resume_flag, !dev->resume_flag,
msecs_to_jiffies(WAIT_FOR_RESUME_ACK_MS)); msecs_to_jiffies(WAIT_FOR_RESUME_ACK_MS));
}
/* /*
* If in ISH FW, sensor app isn't loaded yet, or no resume response. * If the flag is not cleared, something is wrong with ISH FW.
* That means this platform is not S0ix compatible, or something is * So on resume, need to go through init sequence again.
* wrong with ISH FW. So on resume, full reboot of ISH processor will */
* happen, so need to go through init sequence again. if (dev->resume_flag)
*/ ish_init(dev);
if (dev->resume_flag) } else {
/*
* Resume from the D3, full reboot of ISH processor will happen,
* so need to go through init sequence again.
*/
ish_init(dev); ish_init(dev);
}
} }
/** /**