diff options
author | Illyas Mansoor <illyas.mansoor@intel.com> | 2012-05-10 23:41:47 +0530 |
---|---|---|
committer | buildbot <buildbot@intel.com> | 2012-05-15 11:53:41 -0700 |
commit | b0543701d46d4658490ab72d52754c665d92a891 (patch) | |
tree | 8c9a5b3529ea286b3d6a9577285f8bd79df3be7c /include/linux | |
parent | 82d1369b9a70230fdbfa3e94194de58d7c53532c (diff) | |
download | kernel-mfld-blackbay-b0543701d46d4658490ab72d52754c665d92a891.tar.gz kernel-mfld-blackbay-b0543701d46d4658490ab72d52754c665d92a891.tar.bz2 kernel-mfld-blackbay-b0543701d46d4658490ab72d52754c665d92a891.zip |
mid_pmu: otc ics pmu driver patches ported to umg ics
BZ: 34256
commit c1e44f12ce693e1e49d409808a1da2de37182142
Author: Olev Kartau <olev.kartau@intel.com>
Date: Thu Mar 15 15:04:03 2012 +0200
pmu: interrupt status read value should be signed int
u8 status was used to store value from pmu_read_interrupt_status
which returns signed int. Comparing u8 to -1 could never match.
Also, split status and ret.value to differently typed variables.
Signed-off-by: Olev Kartau <olev.kartau@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
commit b123e410c7ae3019b2eecc7c7549002be559d45a
Author: Austin Zhang <austin.zhang@intel.com>
Date: Thu Feb 23 09:23:53 2012 -0800
KER-106: avoid s0i1-idle hang
Prevent re-entrant S0i1, just like we do for S0i3;
and thus avoid a system hang with S0i1 enabled.
https://sa.otcshare.org/jira/browse/KER-106
With this patch in place, and loglevel 15
(which works around GRA-27), S0i1 has never
been observed to hang during over-night testing.
Signed-off-by: Austin Zhang <austin.zhang@intel.com>
Tested-by: Yong Wang <yong.y.wang@intel.com
Tested-by: Kristen C. Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Change-Id: I3932e333ce123d1cf5d7e2dd8b80c258e872633e
Signed-off-by: Illyas Mansoor <illyas.mansoor@intel.com>
Reviewed-on: http://android.intel.com:8080/48298
Reviewed-by: Hogander, Jouni <jouni.hogander@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Reviewed-by: Popescu, CatalinX <catalinx.popescu@intel.com>
Tested-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/intel_mid_pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/intel_mid_pm.h b/include/linux/intel_mid_pm.h index bc8aca06df3..c7065ce3980 100644 --- a/include/linux/intel_mid_pm.h +++ b/include/linux/intel_mid_pm.h @@ -112,7 +112,7 @@ extern pci_power_t pmu_pci_choose_state(struct pci_dev *pdev); extern void pmu_power_off(void); extern void pmu_set_s0ix_complete(void); -extern bool pmu_is_s0i3_in_progress(void); +extern bool pmu_is_s0ix_in_progress(void); extern int pmu_nc_set_power_state (int islands, int state_type, int reg_type); extern int mid_nc_read32(u32 cmd, u32 *data); |