diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2022-10-23 18:32:52 -0700 |
|---|---|---|
| committer | Robin Peng <robinpeng@google.com> | 2022-10-27 04:00:32 +0000 |
| commit | d01afed0e51f6db3422086dc67c6fa48a7e34d87 (patch) | |
| tree | 83ed8e48f3ef0d117c1217b54474378f7c10ecc6 | |
| parent | 2014182f4a8c0ba375f92e808a67222dbd7c2db0 (diff) | |
| parent | b734962d272c08c48e376d1d0dbadc8cb279be36 (diff) | |
| download | gs201-d01afed0e51f6db3422086dc67c6fa48a7e34d87.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr1 into android13-gs-pixel-5.10-tm-qpr2android-t-qpr2-beta-1_r0.5android-t-qpr2-beta-1_r0.4android-gs-raviole-5.10-t-qpr2-beta-1android-gs-bluejay-5.10-t-qpr2-beta-1
Bug: 255246572
SBMerger: 478053055
Change-Id: Ie1c2b39645a8704a83ad217df879aae67a1e372d
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | gxp-pm.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -77,6 +77,12 @@ static int gxp_pm_blkpwr_down(struct gxp_dev *gxp) */ lpm_write_32_psm(gxp, LPM_TOP_PSM, LPM_REG_ENABLE_STATE_1, 0x0); lpm_write_32_psm(gxp, LPM_TOP_PSM, LPM_REG_ENABLE_STATE_2, 0x0); + if (!gxp_lpm_wait_state_eq(gxp, LPM_TOP_PSM, LPM_ACTIVE_STATE)) { + dev_err(gxp->dev, + "failed to force TOP LPM to PS0 during blk down\n"); + return -EAGAIN; + } + ret = pm_runtime_put_sync(gxp->dev); if (ret) /* |