Age | Commit message (Collapse) | Author |
|
SBMerger: 478053055
Change-Id: I9eaf8469d56400b93800dc605074c2de2a3ea1d7
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
|
|
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)
|
|
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
|
|
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
|
|
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
|
|
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
|
|
Bug: 235180273
Test: adb reboot -p and hold power key
Signed-off-by: Benjamin Schwartz <bsschwar@google.com>
Change-Id: I66c2d241ee510d8b28c750553ff46ec9d21c6bf1
|
|
SBMerger: 442815275
Change-Id: I2dcdef5be48d1225a2fa5af1eccab121a75ebdd9
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
|
|
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)
|
|
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
|
|
Bug: 233569354
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I6de1d4980f412af1074098d784d413afbf0deae4
|
|
android13-gs-pixel-5.10-gs101-tm-qpr1
Bug: 233569354
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I3e43314ec367a5f8457783e2ccb30b594fefd3d5
|
|
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)
|
|
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>
|
|
Bug: 231271213
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: I7f5eda321635925350496e3d7bae03d3eac1dbb5
|
|
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
|
|
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
|
|
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
|
|
Both will be handled by TF-A.
Bug: 201317385
Signed-off-by: Jone Chou <jonechou@google.com>
Change-Id: I9336ab6cf8e76b6cde1b2506de606f0480035464
|
|
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
|
|
Bug: 199698959
Change-Id: Icdc5124c3c569cda12ca32969da419970e144735
Signed-off-by: Alex Hong <rurumihong@google.com>
|
|
into android13-gs-pixel-5.10
|
|
Bug: 195932551
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I604966f894e80b2994138cc150ee186c39810726
|
|
Bug: 192617687
Test: builds
Change-Id: I95885b04e234149f54659752b0224969b9ee84ff
|
|
Signed-off-by: Petri Gynther <pgynther@google.com>
Change-Id: If612c5e8dcc16fe8364a39874c91342aaf5f45ca
|
|
- 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
|
|
- 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
|
|
- 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
|
|
SBMerger: 379283923
Change-Id: I12a0fc68f182ec9f185b83fed6d7542fe8de04f3
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
|
|
Change-Id: I10ed0eb48d1e665877306a71eb15aee4f9911a33
Signed-off-by: Aaron Ding <aaronding@google.com>
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
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
|
|
- 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
|
|
Bug: 186619336
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: I78488b420fe3307211c2b89b4695976e85051d80
|
|
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
|
|
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: Iae43052229c92e47c6021ddf650c7cea8298477f
|
|
Bug: 181261704
Signed-off-by: Oleg Matcovschi <omatcovschi@google.com>
Change-Id: Iada99f780169f9145c56be88decdc9c57c25f5d3
|
|
"Unknown reboot command:" messages could be misleading during debugg
Bug: 184597183
Signed-off-by: Jone Chou <jonechou@google.com>
Change-Id: I5173b587cad820b18cdd79d6ba383838cdbd027d
|
|
* partner/android-gs-pixel-mainline:
power: reset: fix directly write to pmu_alive
Signed-off-by: J. Avila <elavila@google.com>
Bug: 180202410
Change-Id: I377bbbdae668a9d61a7e82b3a8e7d4dc35307141
|
|
we shouldn't directly write to pmu_alive regs. commit <ec3b7dd30ad9>
("power: reset: exynos-reboot: support PS_HOLD cold reboot") added a
regmap_update_bits() which directly accesses pmu_alive.
this commit fixes that.
Bug: 180202410
Signed-off-by: Okash Khawaja <okash@google.com>
Change-Id: I8ae05753861cb31eb2f5d48a9ee5d820b31bc6f1
|
|
Signed-off-by: Petri Gynther <pgynther@google.com>
Change-Id: I6c9bdf9e7ad3a2120204bf70ec4e81fb02c7f596
|
|
determine rsbm_supported early to avoid bms i2c access
in restart flow.
warning message as below:
- [ 67.646691][ T1] No atomic I2C transfer handler for 'i2c-5'
Bug: 178541305
Bug: 178609337
Bug: 178741285
Signed-off-by: Jone Chou <jonechou@google.com>
Change-Id: I42e116130460e8db2c91a3dbc8a5f06ced369310
|
|
partner/android-gs-pixel-5.10-stabilization
* partner/android-gs-pixel-mainline:
power: reset: exynos-reboot: support PS_HOLD cold reboot
power: reset: exynos-reboot: persist reboot mode
Signed-off-by: J. Avila <elavila@google.com>
Change-Id: Iae9d725766d22ad58b84a0f792d291de14362e7a
|
|
IF in_panic or S2MPG10 EVT0(PMIC) or MAX77729f(IF-PMIC)
use warm reboot by swreset
else
use cold reboot by PS_HOLD
Bug: 166671802
Signed-off-by: Jone Chou <jonechou@google.com>
Change-Id: Ia003399426792221bcda52f98005d90b12ac448c
|