Skip to content

Commit 0e52eea

Browse files
ARavichandrasysopenci
authored andcommitted
RPMB: Enable mock rpmb package
Celadon BM doest not support rpmb on nvme, storageproxyd will fail and keep restarting.rpmb_dev packge is enabled. Enabling sepolicy for the rpmb_dev package. Mounting teedata on /mnt/vendor/persist for the rpmb_dev requirement. Tests Done: 1. Boot the device in MTL nuc. 2. storageproxyd service is running. 3. Screen lock/ unlock working fine using 'input keyevent 26' command and After reboot 4. Factory reset working properly. Tracked-On: OAM-132238 Signed-off-by: Ravichandra Appegowda <ravichandra.appegowda@intel.com>
1 parent 43d7e17 commit 0e52eea

5 files changed

Lines changed: 5 additions & 10 deletions

File tree

groups/tee/trusty/BoardConfig.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ endif
77
BOARD_USES_TRUSTY := true
88
BOARD_USES_KEYMASTER1 := true
99
BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/tee/trusty
10+
BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/tee/trusty/mock_rpmb
1011
BOARD_SEPOLICY_M4DEFS += module_trusty=true
1112

1213
TRUSTY_BUILDROOT = $(PWD)/$(PRODUCT_OUT)/obj/trusty/

groups/tee/trusty/fstab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/dev/block/by-name/teedata /mnt/vendor/persist ext4 discard,noatime,noauto_da_alloc,nosuid,nodev,data=ordered,user_xattr,barrier=1 wait,formattable

groups/tee/trusty/fstab.recovery

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/dev/block/by-name/teedata /mnt/vendor/persist ext4 discard,noatime,noauto_da_alloc,nosuid,nodev,data=ordered,user_xattr,barrier=1 wait,formattable

groups/tee/trusty/init.rc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
on post-fs-data
22
mkdir /data/vendor/securestorage 0700 system system
3-
chmod 666 /dev/rpmb0
4-
5-
on early-fs
6-
start storageproxyd
7-
8-
service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 -p /data/vendor/securestorage -r /dev/vport0p1 -t virt
9-
user system
10-
group system
113

124
on boot
135
start keyboxd
@@ -19,5 +11,4 @@ service keyboxd /vendor/bin/keybox_provisioning -d /dev/trusty-ipc-dev0 -p /dev/
1911

2012
on post-fs
2113
wait_for_prop vendor.modules.trusty.ready true
22-
chmod 666 /dev/vport0p1
2314
chmod 666 /dev/trusty-ipc-dev0

groups/tee/trusty/product.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ PRODUCT_PACKAGES += \
88
com.android.hardware.gatekeeper.nonsecure \
99
android.hardware.security.keymint-service \
1010
keybox_provisioning \
11-
RemoteProvisioner
11+
RemoteProvisioner \
12+
rpmb_dev
1213

1314
PRODUCT_PACKAGES_DEBUG += \
1415
intel-secure-storage-unit-test \

0 commit comments

Comments
 (0)