diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2020-07-09 10:43:01 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2020-07-09 16:24:26 +0530 |
| commit | ac5ab76ae185210f5eb94a50d9b7ae96fa81b95f (patch) | |
| tree | a9ab555190d06efe4d3daf1e065ecc05c11cb850 | |
| parent | 33f08860f42d19ea2def096cc0cd5dbd67d42d3d (diff) | |
Revert "qcom: qrtr: Disable qrtr-ns and qrtr-cfg"android-r-beta-3android-r-beta-2
This reverts commit 2cf92a4173d774ad491709f80fe8fe3aa1698e6a.
Needed to get WiFi working on android-5.4 kernel. Otherwise
we need to backport a chunk of in-kernel qrtr ns patches
from upstream (v5.7-rc1) kernel. Userspace qrtr-ns tool is
compatible with upstream kernel as well, check:
https://android-review.googlesource.com/c/1286419
Change-Id: Icf9654ed415fe77c8f22592feccd7c68f46bd765
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
| -rw-r--r-- | db845c/device.mk | 3 | ||||
| -rw-r--r-- | qcom/init.qcom.rc | 11 | ||||
| -rw-r--r-- | sepolicy/file_contexts | 3 | ||||
| -rw-r--r-- | sepolicy/qrtr.te | 8 |
4 files changed, 24 insertions, 1 deletions
diff --git a/db845c/device.mk b/db845c/device.mk index 23299ad..b37e06f 100644 --- a/db845c/device.mk +++ b/db845c/device.mk @@ -32,9 +32,10 @@ PRODUCT_COPY_FILES := \ # Build generic Audio HAL PRODUCT_PACKAGES := audio.primary.db845c -# Build and install Qcom userspace tools to talk to dsp and modem PRODUCT_PACKAGES += \ pd-mapper \ + qrtr-ns \ + qrtr-cfg \ qrtr-lookup \ rmtfs \ tqftpserv diff --git a/qcom/init.qcom.rc b/qcom/init.qcom.rc index ba4f24c..94e9038 100644 --- a/qcom/init.qcom.rc +++ b/qcom/init.qcom.rc @@ -1,3 +1,10 @@ +service qrtr-ns /vendor/bin/qrtr-ns -f 1 + class core + user root + group system + disabled + oneshot + service pd_mapper /vendor/bin/pd-mapper class core user root @@ -19,6 +26,10 @@ service rmtfs /vendor/bin/rmtfs -o /dev/block/platform/soc@0/1d84000.ufshc/by-na disabled oneshot +on early-init + exec - root -- /vendor/bin/qrtr-cfg 1 + start qrtr-ns + on post-fs start pd_mapper exec - root -- /system/bin/sleep 1 diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index f223cc4..d16f3fc 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -31,6 +31,8 @@ /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.software u:object_r:hal_gatekeeper_default_exec:s0 /vendor/bin/pd-mapper u:object_r:pd_mapper_exec:s0 +/vendor/bin/qrtr-cfg u:object_r:qrtr_exec:s0 +/vendor/bin/qrtr-ns u:object_r:qrtr_exec:s0 /vendor/bin/rmtfs u:object_r:rmtfs_exec:s0 /vendor/bin/tqftpserv u:object_r:tqftpserv_exec:s0 @@ -40,3 +42,4 @@ /vendor/lib(64)?/libdrm_freedreno\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libgbm\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/libglapi\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/libqrtr\.so u:object_r:same_process_hal_file:s0 diff --git a/sepolicy/qrtr.te b/sepolicy/qrtr.te new file mode 100644 index 0000000..8344398 --- /dev/null +++ b/sepolicy/qrtr.te @@ -0,0 +1,8 @@ +type qrtr, domain; +type qrtr_exec, exec_type, vendor_file_type, file_type; +init_daemon_domain(qrtr) + +allow qrtr self:capability net_admin; +allow qrtr self:capability sys_admin; +allow qrtr self:qipcrtr_socket create_socket_perms_no_ioctl; +allow qrtr self:netlink_route_socket { create nlmsg_write read write }; |