commit 21cadd74e75e58a01ee2546844e0d3d7ab4cedcd
author Yvonne Yip <yky@google.com> Tue Jun 05 17:41:50 2018 -0700
committer Yvonne Yip <ykyyip@google.com> Thu Jun 07 21:34:25 2018 +0000
tree eb610399ea1be7cf36e7c35fd7f2b90ac7eabf66
parent a42564898065b100b51625edadb0339f2ec0b095

[dev][intel-hda][dsp] poll the CPA bit for power up/down

The driver sets the SPA bit to power up/down the DSP cores
and polls the CPA bit to match the SPA value. When the
values match the power transition has been achieved.

Previously it was polling the wrong bit so the DSP may
be in the wrong state for subsequent operations.

Change-Id: I6ce9a3fa7bfcf9978b443da732e03da33e0201f2

system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp

diff --git a/system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp b/system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp
index 205e5e7..a79aced 100644
--- a/system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp
+++ b/system/dev/audio/intel-hda/dsp/intel-audio-dsp.cpp
@@ -523,7 +523,7 @@
                          INTEL_ADSP_POLL_NSEC,
                          [this, &core_mask]() -> bool {
                              return (REG_RD(&regs()->adspcs) &
-                                     ADSP_REG_ADSPCS_SPA(core_mask)) == 0;
+                                     ADSP_REG_ADSPCS_CPA(core_mask)) == 0;
                          });
 }
 
@@ -532,7 +532,7 @@
     return WaitCondition(INTEL_ADSP_TIMEOUT_NSEC,
                          INTEL_ADSP_POLL_NSEC,
                          [this, &core_mask]() -> bool {
-                             return (REG_RD(&regs()->adspcs) & ADSP_REG_ADSPCS_SPA(core_mask)) != 0;
+                             return (REG_RD(&regs()->adspcs) & ADSP_REG_ADSPCS_CPA(core_mask)) != 0;
                          });
 }