diff options
| author | Leifu Zhao <leifu.zhao@intel.com> | 2020-02-14 10:20:52 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-27 00:29:03 +0000 |
| commit | e225427d2a04449d65fbae72932caa8270f182c7 (patch) | |
| tree | 3eda9062fb68d8d243aee5969a430cd84d8a57ae /chip/ish/dma.c | |
| parent | af07a29b0ab75abc03d6d6387257981bd10447b2 (diff) | |
| download | chrome-ec-e225427d2a04449d65fbae72932caa8270f182c7.tar.gz | |
ish: infrastructure changes to support ish5.4 PM
Infrastructure related changes to support enabling power management
for ish5.4 on tgl rvp platform.
BUG=b:149238813
BRANCH=none
TEST=ISH can successfully enter into D0i1/D0i2/D0i3 on tgl rvp.
Signed-off-by: Leifu Zhao <leifu.zhao@intel.com>
Change-Id: I50b6f1a4fe9c14f9479af2a2a438ec7395ec27a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2056149
Reviewed-by: Leifu Zhao <leifu.zhao@intel.corp-partner.google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Leifu Zhao <leifu.zhao@intel.corp-partner.google.com>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Auto-Submit: Leifu Zhao <leifu.zhao@intel.corp-partner.google.com>
Diffstat (limited to 'chip/ish/dma.c')
| -rw-r--r-- | chip/ish/dma.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chip/ish/dma.c b/chip/ish/dma.c index a409dc6ad3..b9744fd234 100644 --- a/chip/ish/dma.c +++ b/chip/ish/dma.c @@ -37,9 +37,11 @@ static int dma_poll(uint32_t addr, uint32_t expected, uint32_t mask) void ish_dma_ocp_timeout_disable(void) { - uint32_t ctrl = OCP_AGENT_CONTROL; + if (!IS_ENABLED(CONFIG_ISH_NEW_PM)) { + uint32_t ctrl = OCP_AGENT_CONTROL; - OCP_AGENT_CONTROL = ctrl & OCP_RESPONSE_TO_DISABLE; + OCP_AGENT_CONTROL = ctrl & OCP_RESPONSE_TO_DISABLE; + } } static inline uint32_t interrupt_lock(void) |