From e1e0587c1a164936bdd10ea416d8785019688f82 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Sat, 13 Jun 2020 18:33:44 -0700 Subject: Add SPI proxy support Bug: 118762930 Test: /data/nativetest64/trusty-ut-ctrl/trusty-ut-ctrl \ -D /dev/trusty-ipc-dev0 com.android.trusty.swspi.test Change-Id: I47e406430532abe57307e0cc0d55a0a01ad0ab94 --- qemu_trusty_base.mk | 1 + sepolicy/file_contexts | 2 ++ sepolicy/spiproxyd.te | 3 +++ ueventd.qemu_trusty.rc | 1 + 4 files changed, 7 insertions(+) create mode 100644 sepolicy/spiproxyd.te diff --git a/qemu_trusty_base.mk b/qemu_trusty_base.mk index ba0152e..fd50fe8 100644 --- a/qemu_trusty_base.mk +++ b/qemu_trusty_base.mk @@ -100,6 +100,7 @@ PRODUCT_COPY_FILES += \ # for Trusty $(call inherit-product, system/core/trusty/trusty-base.mk) $(call inherit-product, system/core/trusty/trusty-storage.mk) +$(call inherit-product, system/core/trusty/trusty-test.mk) # Test Utilities PRODUCT_PACKAGES += \ diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 22c1f88..3153bd1 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -1,6 +1,8 @@ /dev/trusty-ipc-dev0 u:object_r:tee_device:s0 /dev/vport3p1 u:object_r:rpmb_virt_device:s0 +/dev/vport3p2 u:object_r:spi_virt_device:s0 /vendor/bin/dhcpclient u:object_r:dhcpclient_exec:s0 +/vendor/bin/spiproxyd u:object_r:tee_exec:s0 /vendor/bin/storageproxyd u:object_r:tee_exec:s0 /data/vendor/var/run(/.*)? u:object_r:varrun_file:s0 /data/vendor/ss(/.*)? u:object_r:tee_data_file:s0 diff --git a/sepolicy/spiproxyd.te b/sepolicy/spiproxyd.te new file mode 100644 index 0000000..af35110 --- /dev/null +++ b/sepolicy/spiproxyd.te @@ -0,0 +1,3 @@ +type spi_virt_device, dev_type; + +allow tee spi_virt_device:chr_file { open read write }; diff --git a/ueventd.qemu_trusty.rc b/ueventd.qemu_trusty.rc index 0fd832e..159408a 100644 --- a/ueventd.qemu_trusty.rc +++ b/ueventd.qemu_trusty.rc @@ -1,2 +1,3 @@ /dev/vport3p1 0660 system system +/dev/vport3p2 0660 system system /dev/trusty-ipc-dev0 0660 system drmrpc -- cgit v1.2.3