summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-17Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15android-15-beta-2_r0.8android-15-beta-2_r0.7android-15-beta-1_r0.8android-15-beta-1_r0.7android-gs-shusky-5.15-android15-dpandroid-gs-shusky-5.15-android15-betaandroid-gs-akita-5.15-android15-betaPixelBot AutoMerger
SBMerger: 571992243 Change-Id: Icf80df25f7ac28fa2bfa5c9c117254591139e9a4 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
2023-12-14Revert "Set up OWNERS"android-u-qpr3-beta-2_r0.8android-u-qpr3-beta-2.1_r0.8android-u-qpr3-beta-1_r0.8android-15-dp-2_r0.7android-15-dp-1_r0.8android-gs-shusky-5.15-android14-qpr3-betaCyan Hsieh
Revert submission 2521855-285981567 Reason for revert: open for 5.15 in-market kernel development Reverted changes: /q/submissionid:2521855-285981567 Bug: 313355593 Bug: 309749142 Change-Id: Iceaa6a92726b7bf29bf74d8f0c03bebbb4e04c7a
2023-06-10Set up OWNERSWilson Sung
Point to kernel/private/google-modules/soc/gs:OWNERS Bug: 285981567 Change-Id: Ib558a9d7604bd5c3620ea2b7d2b4bce8b6fc0529 Signed-off-by: Wilson Sung <wilsonsung@google.com>
2022-12-21kleaf: switch to generic label_flagsandroid-u-qpr2-beta-3_r0.8android-u-qpr2-beta-3.1_r0.8android-u-qpr2-beta-2_r0.8android-u-qpr2-beta-1_r0.7android-u-qpr1-beta-2_r0.8android-u-qpr1-beta-2.2_r0.7android-u-qpr1-beta-2.1_r0.8android-14.0.0_r0.81android-14.0.0_r0.80android-14.0.0_r0.8android-14.0.0_r0.77android-14.0.0_r0.67android-14.0.0_r0.57android-14.0.0_r0.45android-14.0.0_r0.38android-14.0.0_r0.26android-14.0.0_r0.18main-16k-gs-shusky-5.15android-gs-shusky-udc-d1android-gs-shusky-5.15-u-qpr1-beta2android-gs-shusky-5.15-android14-qpr2-betaandroid-gs-shusky-5.15-android14-qpr2android-gs-shusky-5.15-android14-qpr1-betaandroid-gs-shusky-5.15-android14-qpr1android-gs-shusky-5.15-android14-d1android-gs-akita-5.15-android14-d2Will McVicker
To allow for this project to be shared by multiple devices, let's switch to generic labels for the kernel_build, SoC module, and SoC headers. The flags are defined by the specific flags in their top-level bazel build file. Bug: 257343887 Change-Id: I5198c9eb96684da070fc3cc0b1b87366146ee419 Signed-off-by: Will McVicker <willmcvicker@google.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-08-20Merge "Merge partner/android13-gs-pixel-5.10-tm-qpr1 into ↵William McVicker
partner/android13-gs-pixel-5.15" into android13-gs-pixel-5.15
2022-08-09Merge partner/android13-gs-pixel-5.10-tm-qpr1 into ↵Will McVicker
partner/android13-gs-pixel-5.15 * partner/android13-gs-pixel-5.10-tm-qpr1: power: reset: Move power key checking to TF-A power: reset: power key detection only when power off power: reset: force warm_reset for thermal shutdown Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I0bc0bcdbbef9447b80076c41e6a671d11d82e413
2022-08-07power: reset: update build flags related to bms/misc headerKen Tsou
Move gvotable & logbuffer drivers from misc to bms/misc. Bug: 231997546 Change-Id: I30a6bcda9d9373edc83cdc59611a9067d9cffed9 Signed-off-by: Ken Tsou <kentsou@google.com>
2022-07-15power: reset: store reboot_mode to gBMSJone Chou
Use to persist customized reboot_mode. Bug: 236191150 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: I55bfca32edf3aba001c58036b1f5869c032faa57
2022-07-06power: reset: introduce exynos-reboot moduleJone Chou
Initialize zuma reset driver. Bug: 236191150 Signed-off-by: Jone Chou <jonechou@google.com> Change-Id: Ifa3d67d7a692e834b26fcfada67ccb3dd0bb1e95
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-07power: reset: power key detection only when power offJone 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-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-25Merge 'partner/android-gs-pixel-mainline' into 'partner/android13-gs-pixel-5.15'Will McVicker
We are merging from android-gs-pixel-mainline since this branch has already taken the android13-gs-pixel-5.10 merge. This is a one time merge to get the 5.15 branch up-to-date. * partner/android-gs-pixel-mainline: power: reset: Add reboot-ab-update support power: reset: enable Kconfig support Update the project paths power: reset: remove all unused changes power: reset: add shutdown method power: reset: gs101: raise restart_handler priority power: reset: support psci sys reset and poweroff power: reset: raise restart_handler priority kleaf: //build/kleaf -> //build/kernel/kleaf. Update path for the SoC project Kleaf: add power_reset kernel module for cloudripper power: reset: add in_panic and in_warm for swreset power: reset: add in_panic and in_warm for swreset power: reset: support emergency_restart swreset power: reset: support emergency_restart swreset power: reset: gs201: support PS_HOLD cold reboot power: reset: gs201: fix power key detection power: reset: gs201: fix power_off function power: reset: use warm reboot by swreset power: reset: exynos-reboot: Initialize gs201 reset driver. Change-Id: I560f62e42373cd152555b863de88f326103ae2ba Signed-off-by: Will McVicker <willmcvicker@google.com>
2022-05-25Merge 'aosp/android13-gs-raviole-5.15' into 'partner/android13-gs-pixel-5.15'Will McVicker
* partner/mirror-aosp-android13-gs-raviole-5.15: kleaf: //build/kleaf -> //build/kernel/kleaf. Update path for the SoC project Update to support gs/kernel/device-modules as an external module kleaf: Fix module paths for slider. power: reset: add in_panic for swreset power: reset: support emergency_restart swreset Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I708b37b7e49d74f151e8154096e2618da7c557a7
2022-05-16Merge partner/android13-gs-pixel-5.10 into partner/android-gs-pixel-mainlineWill McVicker
* partner/android13-gs-pixel-5.10: power: reset: Add reboot-ab-update support Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I1aca4eea64ad60dea7fe6178c6ab9b50393def99
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-04-15power: reset: enable Kconfig supportWill McVicker
This adds the necessary build configurations to support using the Kconfig. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I345c02bb255f20a3e20e949f39c646471d210bc3
2022-04-14Update the project pathsWill McVicker
This updates the new path for the kernel/private/google-modules/soc/gs project and gs/google-modules -> private/google-modules. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: Idd08376ed2f76a775f9cfea88e87826ca63dbac5
2022-04-14Merge 'aosp/android-gs-raviole-mainline' into 'pa/android-gs-pixel-mainline'Will McVicker
* 'mirror-aosp-android-gs-raviole-mainline' of sso://partner-android/kernel/private/google-modules/power/reset: kleaf: //build/kleaf -> //build/kernel/kleaf. Update path for the SoC project Update path for the SoC project Update to support gs/kernel/device-modules as an external module kleaf: Fix module paths for slider. Kleaf: add power_reset kernel module. Change-Id: If4c7acadd9c568fa7c6be6f3f0e49f9af3ddf7b2 Signed-off-by: Will McVicker <willmcvicker@google.com>
2022-04-14Merge 'android13-gs-pixel-5.10' into android-gs-pixel-mainlineWill McVicker
* 'android13-gs-pixel-5.10' of sso://partner-android/kernel/private/google-modules/power/reset: power: reset: remove all unused changes power: reset: add shutdown method power: reset: gs101: raise restart_handler priority power: reset: support psci sys reset and poweroff power: reset: raise restart_handler priority Kleaf: add power_reset kernel module for cloudripper power: reset: add in_panic and in_warm for swreset power: reset: add in_panic for swreset power: reset: add in_panic and in_warm for swreset power: reset: support emergency_restart swreset power: reset: support emergency_restart swreset power: reset: support emergency_restart swreset power: reset: gs201: support PS_HOLD cold reboot power: reset: gs201: fix power key detection power: reset: gs201: fix power_off function power: reset: use warm reboot by swreset power: reset: remove dead code power: reset: exynos-reboot: Initialize gs201 reset driver. power:reset:exynos-reboot: fix reboot reasons power: reset: exynos-reboot: coding style fixes power: reset: exynos-reboot: Add shutdown-thermal, rescue, fastboot power: reset: exynos-reboot: add dm-verity reboot reason power: reset: handle all of known reboot command messages Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: Ib8c612a71544256228c17a1142ad1fee8ad5df13
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
2022-02-10kleaf: //build/kleaf -> //build/kernel/kleaf.Yifan Hong
This is part of the build/ -> build/kernel migration. The //build/kleaf package is deprecated. Use //build/kernel/kleaf instead. Test: TH Bug: 217630659 Signed-off-by: Yifan Hong <elsk@google.com> Change-Id: Iec407f29b4480286729b8a80a4ce6fe1785b3c97
2022-02-04kleaf: //build/kleaf -> //build/kernel/kleaf.Yifan Hong
This is part of the build/ -> build/kernel migration. The //build/kleaf package is deprecated. Use //build/kernel/kleaf instead. Test: TH Bug: 217630659 Signed-off-by: Yifan Hong <elsk@google.com> Change-Id: Id9ebfc62b70c569b54dbffc365e2e3fa98df5cfa
2022-02-03Merge 'aosp/android13-gs-raviole-5.15' into 'aosp/android-gs-raviole-mainline'Will McVicker
This pulls in the sc-qpr1 driver fixes. * 'android13-gs-raviole-5.15' of sso://android/kernel/google-modules/power/reset: Update path for the SoC project power: reset: add in_panic for swreset power: reset: support emergency_restart swreset Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: Ie3b0a8c1a70ef4ec32e25955bd208819163859ce
2022-01-19Merge 'aosp/android-gs-raviole-5.10-android12-qpr1-d' into ↵Will McVicker
'aosp/android13-gs-raviole-5.15' * 'android-gs-raviole-5.10-android12-qpr1-d' of sso://android/kernel/google-modules/power/reset: power: reset: add in_panic for swreset power: reset: support emergency_restart swreset Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I0c6c5e514a8d2d233c6e5dc17ac592429a819fc1
2022-01-19Update path for the SoC projectWill McVicker
The gs/google-modules/soc-modules project holds common include headers, build configs and SoC-specific kernel modules. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I38494a5d61733b7638169015f5717156f88441d9
2022-01-19Update path for the SoC projectWill McVicker
The gs/google-modules/soc-modules project holds common include headers, build configs and SoC-specific kernel modules. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: I38494a5d61733b7638169015f5717156f88441d9
2022-01-10Update to support gs/kernel/device-modules as an external moduleWill McVicker
* Include the Makefile.include from gs/kernel/device-modules which updates EXTRA_CFLAGS and EXTRA_SYMBOLS to be able to include headers from there as well as link against modules from there. * Update BUILD.bazel to support these changes as well. Signed-off-by: Will McVicker <willmcvicker@google.com> Change-Id: If3ca4c35d0c2106d9d0199bf2ce2472b5f361562
2021-11-09kleaf: Fix module paths for slider.Yifan Hong
Test: bazel build Bug: 205759526 Change-Id: I8469b5ceb90ab5c358919d77333dbb14348f54cf
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-17Kleaf: add power_reset kernel module.Yifan Hong
Bug: 192617687 Test: builds Bug: 197995714 Change-Id: I1cc5fdfd51b628e96e8b8da92bfd3bbb99731cba
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 17:10:58 +0000