summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-05-23Snap for 10128799 from 9b4bb088cf8f02bcebece637f0a1a6c33f3db29d to ↵android-u-beta-5_r0.7android-u-beta-5_r0.5android-u-beta-5_r0.4android-u-beta-5_r0.3android-u-beta-5_r0.2android-u-beta-5_r0.1android-u-beta-5.2_r0.7android-u-beta-5.2_r0.6android-u-beta-5.2_r0.5android-u-beta-5.2_r0.3android-u-beta-5.2_r0.1android-u-beta-3_r0.5android-u-beta-3_r0.4android-14.0.0_r0.24android-gs-tangorpro-5.10-u-beta5.2android-gs-tangorpro-5.10-u-beta5android-gs-raviole-5.10-u-beta5.2android-gs-raviole-5.10-u-beta5android-gs-pantah-5.10-u-beta5android-gs-pantah-5.10-u-beta3android-gs-lynx-5.10-u-beta5.2android-gs-lynx-5.10-u-beta5android-gs-lynx-5.10-u-beta3android-gs-felix-5.10-u-beta5.2android-gs-felix-5.10-u-beta5android-gs-bluejay-5.10-u-beta5.2android-gs-bluejay-5.10-u-beta5Android Build Coastguard Worker
android13-gs-pixel-5.10-release Change-Id: I8f0544ba012322079b56b6f9e7da80ba85413136
2023-05-10Snap for 9990464 from ffc0c616e77c2f1d7ddaaf6d34ea226bca98a932 to ↵android-13.0.0_r0.94Android Build Coastguard Worker
android13-gs-pixel-5.10-release Change-Id: Ibfeb5af49fabf29dc52ae279378f19dfd143487d
2023-04-14power: reset: gs101: use PMU_INFORM2 for dump_gpr_modeandroid-u-qpr3-beta-2_r0.7android-u-qpr3-beta-2_r0.6android-u-qpr3-beta-2_r0.5android-u-qpr3-beta-2_r0.4android-u-qpr3-beta-2_r0.3android-u-qpr3-beta-2_r0.2android-u-qpr3-beta-2.1_r0.7android-u-qpr3-beta-2.1_r0.5android-u-qpr3-beta-2.1_r0.4android-u-qpr3-beta-2.1_r0.3android-u-qpr3-beta-2.1_r0.2android-u-qpr3-beta-2.1_r0.1android-u-qpr3-beta-1_r0.7android-u-qpr3-beta-1_r0.5android-u-qpr3-beta-1_r0.4android-u-qpr3-beta-1_r0.3android-u-qpr3-beta-1_r0.2android-u-qpr3-beta-1_r0.1android-u-qpr2-beta-3_r0.7android-u-qpr2-beta-3_r0.6android-u-qpr2-beta-3_r0.5android-u-qpr2-beta-3_r0.4android-u-qpr2-beta-3_r0.3android-u-qpr2-beta-3_r0.2android-u-qpr2-beta-3.1_r0.7android-u-qpr2-beta-3.1_r0.5android-u-qpr2-beta-3.1_r0.4android-u-qpr2-beta-3.1_r0.3android-u-qpr2-beta-3.1_r0.2android-u-qpr2-beta-3.1_r0.1android-u-qpr2-beta-2_r0.7android-u-qpr2-beta-2_r0.5android-u-qpr2-beta-2_r0.4android-u-qpr2-beta-2_r0.3android-u-qpr2-beta-2_r0.2android-u-qpr2-beta-2_r0.1android-u-qpr2-beta-1_r0.6android-u-qpr2-beta-1_r0.5android-u-qpr2-beta-1_r0.4android-u-qpr2-beta-1_r0.3android-u-qpr2-beta-1_r0.2android-u-qpr2-beta-1_r0.1android-u-qpr1-beta-2_r0.7android-u-qpr1-beta-2_r0.5android-u-qpr1-beta-2_r0.4android-u-qpr1-beta-2_r0.3android-u-qpr1-beta-2_r0.2android-u-qpr1-beta-2_r0.1android-u-qpr1-beta-2.2_r0.6android-u-qpr1-beta-2.2_r0.5android-u-qpr1-beta-2.2_r0.4android-u-qpr1-beta-2.2_r0.3android-u-qpr1-beta-2.2_r0.2android-u-qpr1-beta-2.2_r0.1android-u-qpr1-beta-2.1_r0.7android-u-qpr1-beta-2.1_r0.5android-u-qpr1-beta-2.1_r0.4android-u-qpr1-beta-2.1_r0.3android-u-qpr1-beta-2.1_r0.2android-u-qpr1-beta-2.1_r0.1android-u-qpr1-beta-1_r0.7android-u-qpr1-beta-1_r0.5android-u-qpr1-beta-1_r0.4android-u-qpr1-beta-1_r0.3android-u-qpr1-beta-1_r0.2android-u-qpr1-beta-1_r0.1android-u-beta-5.3_r0.7android-u-beta-5.3_r0.5android-u-beta-5.3_r0.4android-u-beta-5.3_r0.2android-u-beta-5.3_r0.1android-u-beta-4_r0.7android-u-beta-4_r0.5android-u-beta-4_r0.4android-u-beta-4_r0.3android-u-beta-4_r0.2android-u-beta-4_r0.1android-u-beta-3_r0.3android-u-beta-3_r0.2android-u-beta-2_r0.4android-u-beta-2_r0.3android-u-beta-2_r0.2android-u-beta-2.1_r0.4android-u-beta-2.1_r0.3android-u-beta-2.1_r0.2android-15-dp-2_r0.6android-15-dp-2_r0.5android-15-dp-2_r0.4android-15-dp-2_r0.3android-15-dp-2_r0.2android-15-dp-2_r0.1android-15-dp-1_r0.7android-15-dp-1_r0.5android-15-dp-1_r0.4android-15-dp-1_r0.3android-15-dp-1_r0.2android-15-dp-1_r0.1android-15-beta-2_r0.6android-15-beta-2_r0.5android-15-beta-2_r0.4android-15-beta-2_r0.3android-15-beta-2_r0.2android-15-beta-2_r0.1android-15-beta-1_r0.6android-15-beta-1_r0.5android-15-beta-1_r0.4android-15-beta-1_r0.3android-15-beta-1_r0.2android-15-beta-1_r0.1android-14.0.0_r0.76android-14.0.0_r0.75android-14.0.0_r0.74android-14.0.0_r0.73android-14.0.0_r0.72android-14.0.0_r0.71android-14.0.0_r0.7android-14.0.0_r0.66android-14.0.0_r0.65android-14.0.0_r0.64android-14.0.0_r0.63android-14.0.0_r0.62android-14.0.0_r0.61android-14.0.0_r0.6android-14.0.0_r0.56android-14.0.0_r0.55android-14.0.0_r0.54android-14.0.0_r0.53android-14.0.0_r0.52android-14.0.0_r0.51android-14.0.0_r0.5android-14.0.0_r0.44android-14.0.0_r0.43android-14.0.0_r0.42android-14.0.0_r0.41android-14.0.0_r0.40android-14.0.0_r0.4android-14.0.0_r0.39android-14.0.0_r0.37android-14.0.0_r0.36android-14.0.0_r0.35android-14.0.0_r0.34android-14.0.0_r0.33android-14.0.0_r0.31android-14.0.0_r0.3android-14.0.0_r0.25android-14.0.0_r0.23android-14.0.0_r0.22android-14.0.0_r0.21android-14.0.0_r0.2android-14.0.0_r0.19android-14.0.0_r0.17android-14.0.0_r0.16android-14.0.0_r0.15android-14.0.0_r0.14android-14.0.0_r0.13android-14.0.0_r0.11android-gs-tangorpro-android14-releaseandroid-gs-tangorpro-5.10-u-qpr1-beta2android-gs-tangorpro-5.10-u-beta5.3android-gs-tangorpro-5.10-u-beta4android-gs-tangorpro-5.10-android15-dpandroid-gs-tangorpro-5.10-android15-betaandroid-gs-tangorpro-5.10-android14-qpr3-betaandroid-gs-tangorpro-5.10-android14-qpr2-betaandroid-gs-tangorpro-5.10-android14-qpr2android-gs-tangorpro-5.10-android14-qpr1-betaandroid-gs-tangorpro-5.10-android14-qpr1android-gs-tangorpro-5.10-android14android-gs-raviole-android14-releaseandroid-gs-raviole-5.10-u-qpr1-beta2android-gs-raviole-5.10-u-beta5.3android-gs-raviole-5.10-u-beta4android-gs-raviole-5.10-u-beta3android-gs-raviole-5.10-u-beta2android-gs-raviole-5.10-android15-dpandroid-gs-raviole-5.10-android15-betaandroid-gs-raviole-5.10-android14-qpr3-betaandroid-gs-raviole-5.10-android14-qpr2-betaandroid-gs-raviole-5.10-android14-qpr2android-gs-raviole-5.10-android14-qpr1-betaandroid-gs-raviole-5.10-android14-qpr1android-gs-raviole-5.10-android14android-gs-pantah-android14-releaseandroid-gs-pantah-5.10-u-qpr1-beta2android-gs-pantah-5.10-u-beta5.3android-gs-pantah-5.10-u-beta4android-gs-pantah-5.10-u-beta2android-gs-pantah-5.10-android15-dpandroid-gs-pantah-5.10-android15-betaandroid-gs-pantah-5.10-android14-qpr3-betaandroid-gs-pantah-5.10-android14-qpr2-betaandroid-gs-pantah-5.10-android14-qpr2android-gs-pantah-5.10-android14-qpr1-betaandroid-gs-pantah-5.10-android14-qpr1android-gs-pantah-5.10-android14android-gs-lynx-android14-releaseandroid-gs-lynx-5.10-u-qpr1-beta2android-gs-lynx-5.10-u-beta4android-gs-lynx-5.10-android15-dpandroid-gs-lynx-5.10-android15-betaandroid-gs-lynx-5.10-android14-qpr3-betaandroid-gs-lynx-5.10-android14-qpr2-betaandroid-gs-lynx-5.10-android14-qpr2android-gs-lynx-5.10-android14-qpr1-betaandroid-gs-lynx-5.10-android14-qpr1android-gs-lynx-5.10-android14android-gs-felix-android14-releaseandroid-gs-felix-5.10-u-qpr1-beta2android-gs-felix-5.10-u-beta5.3android-gs-felix-5.10-u-beta4android-gs-felix-5.10-android15-dpandroid-gs-felix-5.10-android15-betaandroid-gs-felix-5.10-android14-qpr3-betaandroid-gs-felix-5.10-android14-qpr2-betaandroid-gs-felix-5.10-android14-qpr2android-gs-felix-5.10-android14-qpr1-betaandroid-gs-felix-5.10-android14-qpr1android-gs-felix-5.10-android14android-gs-bluejay-android14-releaseandroid-gs-bluejay-5.10-u-qpr1-beta2android-gs-bluejay-5.10-u-beta5.3android-gs-bluejay-5.10-u-beta4android-gs-bluejay-5.10-u-beta3android-gs-bluejay-5.10-u-beta2android-gs-bluejay-5.10-android15-dpandroid-gs-bluejay-5.10-android15-betaandroid-gs-bluejay-5.10-android14-qpr3-betaandroid-gs-bluejay-5.10-android14-qpr2-betaandroid-gs-bluejay-5.10-android14-qpr2android-gs-bluejay-5.10-android14-qpr1-betaandroid-gs-bluejay-5.10-android14-qpr1android-gs-bluejay-5.10-android14Jone Chou
Set DUMP_GPR_MODE to PMU_INFORM2 for all warm reset cases. Bug: 276356519 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Ibfc017a71206f2472ef98d5b6d65a4887827eef2
2023-02-10Snap for 9489562 from 1f0b2f8aa0687abe6dd4a509fc46022a6a74e661 to ↵android-t-qpr2-beta-3.2_r0.4android-13.0.0_r0.65android-13.0.0_r0.63android-gs-raviole-5.10-t-qpr2-beta-3.2Android Build Coastguard Worker
android13-gs-pixel-5.10-release Change-Id: Ie5cd8f6f99cf395b45f2b92b20185ddbc1d3a1bf
2023-01-01Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udcandroid-u-preview-2_r0.4android-u-preview-2_r0.3android-u-preview-2_r0.2android-u-preview-1_r0.3android-u-beta-1_r0.5android-u-beta-1_r0.4android-u-beta-1_r0.3android-gs-raviole-5.10-u-preview-2android-gs-raviole-5.10-u-beta1android-gs-pantah-5.10-u-preview-2android-gs-pantah-5.10-u-beta1android-gs-bluejay-5.10-u-preview-2android-gs-bluejay-5.10-u-preview-1android-gs-bluejay-5.10-u-beta1PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I290b5fe1601e1c05b1967c7eaf7627c5ee3d2e89 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-25Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr3android-t-qpr3-beta-3_r0.5android-t-qpr3-beta-3_r0.4android-t-qpr3-beta-3_r0.3android-t-qpr3-beta-3.1_r0.5android-t-qpr3-beta-3.1_r0.4android-t-qpr3-beta-3.1_r0.3android-t-qpr3-beta-2_r0.5android-t-qpr3-beta-2_r0.4android-t-qpr3-beta-2_r0.3android-t-qpr3-beta-1_r0.5android-t-qpr3-beta-1_r0.4android-t-qpr3-beta-1_r0.3android-t-qpr3-beta-1_r0.1android-13.0.0_r0.93android-13.0.0_r0.92android-13.0.0_r0.85android-13.0.0_r0.84android-13.0.0_r0.83android-13.0.0_r0.82android-13.0.0_r0.127android-13.0.0_r0.126android-13.0.0_r0.125android-13.0.0_r0.124android-13.0.0_r0.123android-13.0.0_r0.121android-13.0.0_r0.117android-13.0.0_r0.116android-13.0.0_r0.115android-13.0.0_r0.114android-13.0.0_r0.113android-13.0.0_r0.112android-13.0.0_r0.107android-13.0.0_r0.106android-13.0.0_r0.105android-13.0.0_r0.104android-13.0.0_r0.103android-13.0.0_r0.100android-gs-tangorpro-5.10-android13-qpr3android-gs-raviole-5.10-t-qpr3-beta-3android-gs-raviole-5.10-t-qpr3-beta-2android-gs-raviole-5.10-android13-qpr3-beta1android-gs-raviole-5.10-android13-qpr3android-gs-pantah-5.10-t-qpr3-beta-3android-gs-pantah-5.10-t-qpr3-beta-2android-gs-pantah-5.10-android13-qpr3-beta1android-gs-pantah-5.10-android13-qpr3android-gs-lynx-5.10-android13-qpr3android-gs-felix-5.10-android13-qpr3-candroid-gs-felix-5.10-android13-qpr3android-gs-felix-5.10-android13-d3android-gs-bluejay-5.10-t-qpr3-beta-3android-gs-bluejay-5.10-t-qpr3-beta-2android-gs-bluejay-5.10-android13-qpr3-beta1android-gs-bluejay-5.10-android13-qpr3PixelBot AutoMerger
SBMerger: 478053055 Change-Id: I9eaf8469d56400b93800dc605074c2de2a3ea1d7 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-12-21power: reset: align all thermal shutdown scenarioJone Chou
Senario: - warm reset -> debug boot -> memory wipe -> power off Commands: - adb reboot "shutdown,thermal[sub-reason]" - adb reboot "shutdown-thermal[sub-reason]" Bug: 263071957 signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Idf2efd3bad865ee9f689509ffd0cdb6c5d7820f3 (cherry picked from commit 1f0b2f8aa0687abe6dd4a509fc46022a6a74e661)
2022-12-21power: reset: align all thermal shutdown scenarioandroid-u-preview-1_r0.4android-u-preview-1_r0.2android-gs-raviole-5.10-u-preview-1android-gs-pantah-5.10-u-preview-1Jone Chou
Senario: - warm reset -> debug boot -> memory wipe -> power off Commands: - adb reboot "shutdown,thermal[sub-reason]" - adb reboot "shutdown-thermal[sub-reason]" Bug: 263071957 signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Idf2efd3bad865ee9f689509ffd0cdb6c5d7820f3 (cherry picked from commit 1f0b2f8aa0687abe6dd4a509fc46022a6a74e661)
2022-12-21power: reset: align all thermal shutdown scenarioandroid-t-qpr2-beta-3_r0.5android-t-qpr2-beta-3_r0.4android-t-qpr2-beta-3_r0.3android-t-qpr2-beta-3.2_r0.6android-t-qpr2-beta-3.2_r0.5android-13.0.0_r0.91android-13.0.0_r0.77android-13.0.0_r0.75android-13.0.0_r0.74android-13.0.0_r0.73android-13.0.0_r0.70android-13.0.0_r0.69android-13.0.0_r0.68android-13.0.0_r0.64android-gs-tangorpro-5.10-android13-d2android-gs-raviole-5.10-android13-qpr2-betaandroid-gs-raviole-5.10-android13-qpr2android-gs-pantah-5.10-t-qpr2-beta-3.2android-gs-pantah-5.10-android13-qpr2-betaandroid-gs-pantah-5.10-android13-qpr2android-gs-lynx-5.10-android13-qpr2-bandroid-gs-bluejay-5.10-t-qpr2-beta-3android-gs-bluejay-5.10-android13-qpr2-betaandroid-gs-bluejay-5.10-android13-qpr2Jone Chou
Senario: - warm reset -> debug boot -> memory wipe -> power off Commands: - adb reboot "shutdown,thermal[sub-reason]" - adb reboot "shutdown-thermal[sub-reason]" Bug: 263071957 signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Idf2efd3bad865ee9f689509ffd0cdb6c5d7820f3
2022-10-23Merge android13-gs-pixel-5.10-tm-qpr2 into android13-gs-pixel-5.10-udcPixelBot AutoMerger
SBMerger: 478053055 Change-Id: I01dcad44edf9ff15b598bf1fa08ac0dccca4a2ec Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-09-30Merge android13-gs-pixel-5.10-gs101-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr2android-t-qpr2-beta-2_r0.5android-t-qpr2-beta-2_r0.4android-t-qpr2-beta-2_r0.3android-t-qpr2-beta-1_r0.6android-t-qpr2-beta-1_r0.5android-t-qpr2-beta-1_r0.4android-gs-raviole-5.10-t-qpr2-beta-1android-gs-pantah-5.10-t-qpr2-beta-1android-gs-bluejay-5.10-t-qpr2-beta-1Lucas Wei
Restore `exynos-gs201-reboot.c` to snapshot of android13-gs-pixel-5.10-tm-qpr2. Commit 68312cf ("power: reset: Move power key checking to TF-A") conflict to commit 9ab2375 ("power: reset: power key detection only when power off"). We need to restore to avoid build breakage. Bug: 238399460 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I0839d713c4713d61e7addff7f3a4adb864faed6c
2022-09-28power: reset: determine reset type by reboot_modeJone Chou
For GS201, it has used reboot_mode to determine reset type, but GS101 not. So merge reset type function for both gSOCs. For GS101, it doesn't support AOSP sending SMC to EL3MON to reset system by reboot_mode. So align aosp to add both reboot_mode conditions in pixel restart_handler to support overall warm reset usecases. ex. - adb shell "echo c > /proc/sysrq-trigger" - adb shell "echo 1 > sys/kernel/dbg_snapshot/in_warm" adb reboot - adb shell "echo b > /proc/sysrq-trigger" - adb shell "echo 120000 > /dev/thermal/tz-by-name/BIG/emul_temp" - adb reboot "shutdown-thermal" or "shutdown,thermal" Bug: 249495614 signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I6d79fb03220d9af8903d99b1fe1cdf664171d6e2
2022-09-28power: reset: determine reset type by reboot_modeJone Chou
For GS201, it has used reboot_mode to determine reset type, but GS101 not. So merge reset type function for both gSOCs. For GS101, it doesn't support AOSP sending SMC to EL3MON to reset system by reboot_mode. So align aosp to add both reboot_mode conditions in pixel restart_handler to support overall warm reset usecases. ex. - adb shell "echo c > /proc/sysrq-trigger" - adb shell "echo 1 > sys/kernel/dbg_snapshot/in_warm" adb reboot - adb shell "echo b > /proc/sysrq-trigger" - adb shell "echo 120000 > /dev/thermal/tz-by-name/BIG/emul_temp" - adb reboot "shutdown-thermal" or "shutdown,thermal" Bug: 249495614 signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I6d79fb03220d9af8903d99b1fe1cdf664171d6e2
2022-06-17Snap for 8735923 from 4cc727a5900bc7473b8c0f3b075c6ae63d91e0f9 to ↵Android Build Coastguard Worker
android13-gs-pixel-5.10-release Change-Id: I6f9801efc43e5c7295e7c5a78766ffb00c47386c
2022-06-16power: reset: Move power key checking to TF-Aandroid-t-qpr1-beta-3_r0.5android-t-qpr1-beta-3.1_r0.1android-13.0.0_r0.60android-13.0.0_r0.55android-13.0.0_r0.50android-gs-pantah-5.10-t-qpr1-beta-3android-gs-pantah-5.10-android13-qpr1-beta-3android-gs-pantah-5.10-android13-qpr1Benjamin Schwartz
Bug: 235180273 Test: adb reboot -p and hold power key Signed-off-by: Benjamin Schwartz <bsschwar@google.com> Change-Id: I66c2d241ee510d8b28c750553ff46ec9d21c6bf1
2022-06-12Merge android13-gs-pixel-5.10-tm-d1 into android13-gs-pixel-5.10-tm-qpr1PixelBot AutoMerger
SBMerger: 442815275 Change-Id: I2dcdef5be48d1225a2fa5af1eccab121a75ebdd9 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2022-06-13power: reset: power key detection only when power offandroid-t-qpr1-beta-3_r0.4android-t-qpr1-beta-3_r0.3android-t-qpr1-beta-2_r0.5android-t-qpr1-beta-2_r0.4android-t-qpr1-beta-1_r0.4android-t-qpr1-beta-1_r0.3android-13.0.0_r0.59android-13.0.0_r0.58android-13.0.0_r0.54android-13.0.0_r0.53android-13.0.0_r0.49android-13.0.0_r0.48main-16k-gs-raviole-5.10android-gs-raviole-5.10-t-qpr1-beta-2android-gs-raviole-5.10-android13-qpr1-beta-3android-gs-raviole-5.10-android13-qpr1-betaandroid-gs-raviole-5.10-android13-qpr1android-gs-bluejay-5.10-t-qpr1-beta-2android-gs-bluejay-5.10-android13-qpr1-beta-3android-gs-bluejay-5.10-android13-qpr1-betaandroid-gs-bluejay-5.10-android13-qpr1Jone Chou
1. In power off flow: - detect power key is really released - execute acpm_prepare_reboot - AOSP send SMC to TF-A to do real power off action. 2. In cold reboot flow: - skip power key detection - execute acpm_prepare_reboot - AOSP send SMC to TF-A to do real cold reboot action Bug: 234066226 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Id9ace2c2b8a9841f5f5ac978b8650cad793c0d7a (cherry picked from commit 4cc727a5900bc7473b8c0f3b075c6ae63d91e0f9)
2022-06-07power: reset: power key detection only when power offandroid-13.0.0_r0.45android-13.0.0_r0.32android-13.0.0_r0.31android-gs-pantah-5.10-android13-d1Jone Chou
1. In power off flow: - detect power key is really released - execute acpm_prepare_reboot - AOSP send SMC to TF-A to do real power off action. 2. In cold reboot flow: - skip power key detection - execute acpm_prepare_reboot - AOSP send SMC to TF-A to do real cold reboot action Bug: 234066226 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Id9ace2c2b8a9841f5f5ac978b8650cad793c0d7a
2022-05-30Merge android13-gs-pixel-5.10-tm-d1 into android13-gs-pixel-5.10-tm-qpr1Robin Peng
Bug: 233569354 Signed-off-by: Robin Peng <robinpeng@google.com> Change-Id: I6de1d4980f412af1074098d784d413afbf0deae4
2022-05-30Merge android13-gs-pixel-5.10-gs101-tm into ↵Robin Peng
android13-gs-pixel-5.10-gs101-tm-qpr1 Bug: 233569354 Signed-off-by: Robin Peng <robinpeng@google.com> Change-Id: I3e43314ec367a5f8457783e2ccb30b594fefd3d5
2022-05-26power: reset: force warm_reset for thermal shutdownandroid-t-beta-4_r0.6android-t-beta-4_r0.5android-t-beta-4_r0.4android-t-beta-3.3_r0.4android-t-beta-3.2_r0.4android-13.0.0_r0.5android-13.0.0_r0.44android-13.0.0_r0.43android-13.0.0_r0.4android-13.0.0_r0.20android-13.0.0_r0.19android-13.0.0_r0.15android-13.0.0_r0.14android-gs-raviole-5.10-t-beta-4android-gs-raviole-5.10-t-beta-3android-gs-raviole-5.10-android13android-gs-bluejay-5.10-t-beta-4android-gs-bluejay-5.10-android13Oleg Matcovschi
Also, remove shadow variable reboot_mode from exynos_reboot_mode_set. Bug: 232092738 Bug: 231628393 Change-Id: I2265e683c3a4b1003d1fea48c463eca3bedd9af9 Signed-off-by: Oleg Matcovschi <omatcovschi@google.com> (cherry picked from commit 6f235f990267f424191b52bc7fd750732f9080d3)
2022-05-25power: reset: force warm_reset for thermal shutdownOleg Matcovschi
Also, remove shadow variable reboot_mode from exynos_reboot_mode_set. Bug: 232092738 Bug: 231628393 Change-Id: I2265e683c3a4b1003d1fea48c463eca3bedd9af9 Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
2022-05-06Snap for 8548338 from dfa52acf7844d835def21054cd1f783d67581c1c to ↵Android Build Coastguard Worker
android13-gs-pixel-5.10-release Change-Id: I2dcbf610dd307e93d70ea6551d890af7da0e292e
2022-05-04power: reset: Add reboot-ab-update supportandroid-t-beta-3_r0.4Oleg Matcovschi
Bug: 231271213 Signed-off-by: Oleg Matcovschi <omatcovschi@google.com> Change-Id: I7f5eda321635925350496e3d7bae03d3eac1dbb5
2022-03-31power: reset: remove all unused changesandroid-t-beta-2_r0.4android-gs-raviole-5.10-t-beta-2Jone Chou
TF-A has handled all of actions whether warm reboot, cold reboot or power off. Bug: 201317385 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Ib3469381969795a4cb7b0526a00990838141b7e1
2022-03-14power: reset: add shutdown methodandroid-t-beta-1_r0.4android-gs-raviole-5.10-t-beta-1Jone Chou
Use shutdown method, exynos_power_off, to detect power key is really released, execute acpm_prepare_reboot and then SMC to TF-A to do real power off actions. Bug: 201317385 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Ic328c705a7b130f8bca2a731e329cd2389ed7003
2022-03-07power: reset: gs101: raise restart_handler priorityJone Chou
Whether cold or warm reboot, the actions will be moved from restart_handler to aosp psci_sys_reset -> el3mon. So raise restart_handler priority(130) to be higher than aosp psci_sys_reset(129). And then we can do restart preparation in restart_handler earlier than psci_sys_reset -> el3mon. Also let upper migrations be seamless. Bug: 201317385 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I0c0d0b88da7b1cab0782ac3404c879d1ebc100fe
2022-02-22power: reset: support psci sys reset and poweroffJone Chou
Both will be handled by TF-A. Bug: 201317385 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I9336ab6cf8e76b6cde1b2506de606f0480035464
2022-02-22power: reset: raise restart_handler priorityJone Chou
Whether cold or warm reboot, the actions will be moved from restart_handler to aosp psci_sys_reset -> el3mon. So raise restart_handler priority(130) to be higher than aosp psci_sys_reset(129). And then we can do restart preparation in restart_handler earlier than psci_sys_reset -> el3mon. Also let upper migrations be seamless. Bug: 201317385 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Iefbf2ed13696a112e2504bd31cba3e4c376bf8d7
2021-10-15Merge android12-gs-pixel-5.10-sc-v2 into android13-gs-pixel-5.10android-t-preview-2_r0.4android-t-preview-1_r0.4android-gs-raviole-5.10-t-preview-2android-gs-raviole-5.10-t-preview-1Alex Hong
Bug: 199698959 Change-Id: Icdc5124c3c569cda12ca32969da419970e144735 Signed-off-by: Alex Hong <rurumihong@google.com>
2021-09-16Merge "Merge android12-gs-pixel-5.10-sc-v2 into android13-gs-pixel-5.10" ↵Robin Peng
into android13-gs-pixel-5.10
2021-09-14Merge android12-gs-pixel-5.10-sc-v2 into android13-gs-pixel-5.10Lucas Wei
Bug: 195932551 Signed-off-by: Lucas Wei <lucaswei@google.com> Change-Id: I604966f894e80b2994138cc150ee186c39810726
2021-09-14Kleaf: add power_reset kernel module for cloudripperYifan Hong
Bug: 192617687 Test: builds Change-Id: I95885b04e234149f54659752b0224969b9ee84ff
2021-09-13Merge android12-gs-pixel-5.10-sc-qpr2 into -sc-v2android-s-qpr3-beta-3_r0.5android-s-qpr3-beta-2_r0.5android-s-qpr3-beta-1_r0.6android-s-qpr3-beta-1_r0.5android-12.1.0_r0.40android-12.1.0_r0.35android-12.1.0_r0.28android-gs-raviole-5.10-s-qpr3-beta-3android-gs-raviole-5.10-s-qpr3-beta-2android-gs-raviole-5.10-android12-qpr3android-gs-bluejay-5.10-android12L-d2Petri Gynther
Signed-off-by: Petri Gynther <pgynther@google.com> Change-Id: If612c5e8dcc16fe8364a39874c91342aaf5f45ca
2021-09-09power: reset: add in_panic and in_warm for swresetJone Chou
- in_panic: in_reboot can't handle all of panic cases. Like to trigger a NULL pointer dereference, it will go 'efi_reboot(reboot_mode, NULL)' instead of 'do_kernel_restart(cmd)'. - in_warm: a hook for user to request warm reset for any other cold reboot cases, like adb reboot xxx. Bug: 196236629 Bug: 196237493 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I453e57dd68f96aeb0594689de008412660762c38
2021-09-08power: reset: add in_panic for swresetandroid-s-v2-beta-3_r0.6android-12.1.0_r0.6android-12.1.0_r0.22android-12.1.0_r0.16android-12.0.0_r0.42android-12.0.0_r0.36android-12.0.0_r0.26android-gs-raviole-5.10-s-v2-beta-3android-gs-raviole-5.10-android12Landroid-gs-raviole-5.10-android12-qpr1-dJone Chou
- in_panic: in_reboot can't handle all of panic cases. Like to trigger a NULL pointer dereference, it will go 'efi_reboot(reboot_mode, NULL)' instead of 'do_kernel_restart(cmd)'. Bug: 196236629 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I453e57dd68f96aeb0594689de008412660762c38
2021-09-07power: reset: add in_panic and in_warm for swresetJone Chou
- in_panic: in_reboot can't handle all of panic cases. Like to trigger a NULL pointer dereference, it will go 'efi_reboot(reboot_mode, NULL)' instead of 'do_kernel_restart(cmd)'. - in_warm: a hook for user to request warm reset for any other cold reboot cases, like adb reboot xxx. Bug: 196236629 Bug: 196237493 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I453e57dd68f96aeb0594689de008412660762c38
2021-08-29Merge android12-gs-pixel-5.10-sc-qpr1 into android12-gs-pixel-5.10-sc-v2PixelBot AutoMerger
SBMerger: 379283923 Change-Id: I12a0fc68f182ec9f185b83fed6d7542fe8de04f3 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2021-08-20Merge android-gs-cloudripper-5.10 into android13-gs-pixel-5.10Aaron Ding
Change-Id: I10ed0eb48d1e665877306a71eb15aee4f9911a33 Signed-off-by: Aaron Ding <aaronding@google.com>
2021-08-19power: reset: support emergency_restart swresetJone Chou
If panic or emergency_restart use warm reboot by swreset else use cold reboot by PS_HOLD note: panic is also one of emergency_restart cases Bug: 196236629 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I0b7cb5dac31e081d7f784d4da2af59c876612cfe
2021-08-18power: reset: support emergency_restart swresetJone Chou
If panic or emergency_restart use warm reboot by swreset else use cold reboot by PS_HOLD note: panic is also one of emergency_restart cases Bug: 196236629 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I0b7cb5dac31e081d7f784d4da2af59c876612cfe
2021-08-13power: reset: support emergency_restart swresetJone Chou
If panic or emergency_restart use warm reboot by swreset else use cold reboot by PS_HOLD note: panic is also one of emergency_restart cases Bug: 196236629 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I0b7cb5dac31e081d7f784d4da2af59c876612cfe
2021-07-02power: reset: gs201: support PS_HOLD cold rebootJone Chou
Also persist reboot mode as below IF in_panic use warm reboot by swreset else store reboot mode to GBMS_TAG_RSBM(bms_storage) use cold reboot by PS_HOLD Bug: 191666662 Bug: 191485838 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Icef866be83f1a3adc9adfc28e3410569dc60365d
2021-06-14power: reset: gs201: fix power key detectionHyunki Koo
This patch detect power key with s2mpg12-power-keys Bug: 190518323 Signed-off-by: Hyunki Koo <hyunki00.koo@samsung.com> Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I25afa2e0f1a5799ec5f7af3137da35b29eb254fd
2021-06-08power: reset: gs201: fix power_off functionJone Chou
For gs201, POWER_KEY is handled using the PMIC and need to detect s2mpg12-power-keys instead. But irq_pwronf and irq_pwronr are still not enabled in s2mpg12-key driver. So unblock gpio_key detect to fix power off function path first. Bug: 190004916 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Ia6b622c5b8cedf29c417e5aa3a59773e1f448fa4
2021-06-01power: reset: use warm reboot by swresetJone Chou
For short term, boot mode can't be persist for cold reboot due to CONFIG_GOOGLE_BMS is still not supported on gs201. So always use warm reboot by swreset first. Bug: 189501699 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: If1652c40665dd5001e37448ce9d7900967616c8f
2021-05-24power: reset: remove dead codeandroid-12.0.0_r0.9android-12.0.0_r0.8android-12.0.0_r0.17android-12.0.0_r0.16android-gs-raviole-5.10-android12-d1Okash Khawaja
as part of pmu_alive protection, we added some backward compatibility code for situations where an older version of el3 firmware was in use, which didn't support the priv_reg smc. we are well past that stage now and devices should have updated el3 firmware. so let's remove the backward compat which is dead code now. Bug: 169128860 Signed-off-by: Okash Khawaja <okash@google.com> Change-Id: I520746f86a98d74a5b3dab3281704b4811fb8768
2021-05-18power: reset: exynos-reboot: Initialize gs201 reset driver.Taewan Kim
- Divide 'exynos_reboot.c' into 'exynos_${target}_reboot.c' - Delete gs101 W/A code Signed-off-by: Taewan Kim <trunixs.kim@samsung.com> Change-Id: I7ba9548814b2d4a7bb522fb0d15735f4300dc9d7
2021-04-28power:reset:exynos-reboot: fix reboot reasonsOleg Matcovschi
Bug: 186619336 Signed-off-by: Oleg Matcovschi <omatcovschi@google.com> Change-Id: I78488b420fe3307211c2b89b4695976e85051d80
2021-04-23power: reset: exynos-reboot: coding style fixesOleg Matcovschi
Changes: * coding style fixes * use dev_ functions in probe instead of current mix of dev_/pr_ * correctly handle errors on registering notifiers Signed-off-by: Oleg Matcovschi <omatcovschi@google.com> Change-Id: I811654fae43ca8a911a53133753a66e534f9a75d