diff options
| author | Shawn Willden <swillden@google.com> | 2018-06-28 18:40:17 +0000 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2018-06-28 16:47:53 -0600 |
| commit | 9ff2c612cba94aafe39c187dce6e4e42aeeadd36 (patch) | |
| tree | 7656e95640901eeddabec7315515cfcd5986df60 /init.hardware.rc | |
| parent | 07f15e2d5e91234a032344872b130c39a46815e1 (diff) | |
Wait for keymasters to start up.
Test: Boot
Bug: 110479595
Change-Id: I74924f209bf205773c44e90ff5790f4fe7586d6b
Diffstat (limited to 'init.hardware.rc')
| -rw-r--r-- | init.hardware.rc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/init.hardware.rc b/init.hardware.rc index f291a98..97c3675 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -24,6 +24,9 @@ import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.mpssrfs.rc on property:init.svc.vendor.charger=running stop vendor.qseecomd stop keymaster-4-0 + stop vndservicemanager + stop citadeld + stop vendor.keymaster-4-0-citadel # keep one LITTLE and one big write /sys/devices/system/cpu/cpu1/online 0 write /sys/devices/system/cpu/cpu2/online 0 @@ -70,6 +73,11 @@ on init start vendor.qseecomd start keymaster-4-0 + # start Citadel keymaster (StrongBox) early + start vndservicemanager + start citadeld + start vendor.keymaster-4-0-citadel + # Boot time fs tune write /sys/block/sda/queue/iostats 0 write /sys/block/sda/queue/scheduler cfq @@ -252,8 +260,8 @@ on late-fs # cause services for bootanim not running. wait_for_prop hwservicemanager.ready true - # Wait for keymaster - exec_start wait_for_keymaster + # Wait for keymaster HALs (TEE and StrongBox) + exec_start wait_for_strongbox # Mount RW partitions which need run fsck mount_all /vendor/etc/fstab.${ro.boot.hardware.platform} --late @@ -827,6 +835,12 @@ service ppd /vendor/bin/mm-pp-dpps socket pps stream 0660 system system disabled +service wait_for_strongbox /vendor/bin/hw/wait_for_strongbox + user root + group root system + priority -20 + ioprio rt 0 + on property:init.svc.vendor.hwcomposer-2-2=stopped stop ppd |