Reland "CHROMIUM: firmware/psci: Delay in psci_system_suspend"
This reverts commit 01c0dad2c6306488117e71fa1c046ac8567faf67.
Reason for revert: Firmware has not been updated for Elm devices
Original change's description:
> Revert "CHROMIUM: firmware/psci: Delay in psci_system_suspend"
>
> This reverts commit 095e39dd03f7f279d51edab3b58c11deacde0c07.
>
> Reason for revert: firmware has been patched to fix underlying issue
>
> Original change's description:
> > CHROMIUM: firmware/psci: Delay in psci_system_suspend
> >
> > Add a delay before calling PSCI SYSTEM_SUSPEND. This is a temporary hack
> > until we can get a fix into firmware.
> >
> > On MT8173, we have found that some of the other (non cpu-0) cores may
> > not have been powered down by the time that the SYSTEM_SUSPEND call is
> > made. When this happens, the device will hang when trying to enter S3
> > suspend.
> >
> > The kernel disables non-boot CPUs by calling PSCI CPU_OFF, and then
> > polls the CPU status by calling PSCI AFFINITY_INFO. However,
> > AFFINITY_INFO only indicates the logical state of the CPU, and not the
> > full power off state as required to ensure a successful SYSTEM_SUSPEND
> > on MT8173. The delay has been inserted to give the hardware time to
> > fully reach power off state.
> >
> > The fix in firmware will poll the SPM_PWR_STATUS and SPM_PWR_STATUS_2ND
> > registers waiting for all the CPUs to go offline before going into
> > suspend.
> >
> > BUG=b:159288905
> > TEST=stop_ui; suspend_stress_test -i spi32766 --noerrors_fatal
> >
> > Signed-off-by: Eizan Miyamoto <eizan@chromium.org>
> > Change-Id: I8fb733165fdb1a21562295b55f75ca76efeee442
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/2340938
> > Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
> > Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
>
> BUG=b:159288905
> TEST=stop_ui; suspend_stress_test -i spi32766 --noerrors_fatal
>
> Cq-Depend: chromium:2336380
> Signed-off-by: Eizan Miyamoto <eizan@chromium.org>
> Change-Id: Id3d43d7030fe05d7554b895ff5226dc03725ffb4
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3592812
> Reviewed-by: Mani Milani <mani@chromium.org>
Bug: b:159288905
Change-Id: I9c2d031a453af7de4557b103711285e1733af00a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/3821543
Reviewed-by: Hsin-Yi Wang <hsinyi@chromium.org>
Commit-Queue: Eizan Miyamoto <eizan@chromium.org>
Tested-by: Eizan Miyamoto <eizan@chromium.org>
1 file changed
