diff --git a/properties.mk b/properties.mk index bba04b0..e0164db 100644 --- a/properties.mk +++ b/properties.mk @@ -353,10 +353,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.sensors.allow_non_default_discovery=true \ persist.vendor.sensors.sync_request=true -# SSR -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ -persist.vendor.ssr.restart_level=ALL_ENABLE - # Shutdown PRODUCT_PROPERTY_OVERRIDES += \ sys.vendor.shutdown.waittime=500 diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index a578edc..6f732b1 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -114,6 +114,15 @@ on early-boot chown system system /mnt/vendor/persist/data/pfm/licenses/store_4 chmod 0664 /mnt/vendor/persist/data/pfm/licenses/store_4 + # SSR Setup + write /sys/bus/msm_subsys/devices/subsys0/restart_level RELATED + write /sys/bus/msm_subsys/devices/subsys1/restart_level RELATED + write /sys/bus/msm_subsys/devices/subsys2/restart_level RELATED + write /sys/bus/msm_subsys/devices/subsys3/restart_level RELATED + write /sys/bus/msm_subsys/devices/subsys4/restart_level RELATED + write /sys/bus/msm_subsys/devices/subsys5/restart_level RELATED + write /sys/bus/msm_subsys/devices/subsys6/restart_level RELATED + on boot chown bluetooth bluetooth /sys/module/bluetooth_power/parameters/power chown bluetooth net_bt /sys/class/rfkill/rfkill0/type @@ -430,17 +439,6 @@ on property:graphics.display.kernel_idle_timer.enabled=false # Disable aggressive idle mode switching write /sys/devices/platform/soc/soc:qcom,dsi-display-primary/idle_mode "none" -service vendor.ssr_setup /system/vendor/bin/ssr_setup - oneshot - disabled - -service vendor.ss_ramdump /system/vendor/bin/subsystem_ramdump - class main - user system - group system - ioprio rt 4 - disabled - on property:ro.vendor.iocgrp.config=1 mkdir /dev/blkio mount cgroup none /dev/blkio blkio @@ -453,9 +451,6 @@ on property:ro.vendor.iocgrp.config=1 write /dev/blkio/blkio.weight 1000 write /dev/blkio/bg/blkio.weight 100 -on property:persist.sys.ssr.enable_debug=* - write /sys/module/subsystem_restart/parameters/enable_debug ${persist.sys.ssr.enable_debug} - on property:persist.sys.mba_boot_timeout=* write /sys/module/pil_msa/parameters/pbl_mba_boot_timeout_ms ${persist.sys.mba_boot_timeout} @@ -465,17 +460,6 @@ on property:persist.sys.modem_auth_timeout=* on property:persist.sys.pil_proxy_timeout=* write /sys/module/peripheral_loader/parameters/proxy_timeout_ms ${persist.sys.pil_proxy_timeout} -on property:persist.vendor.ssr.restart_level=* - start vendor.ssr_setup - -on property:persist.vendor.ssr.enable_ramdumps=1 - write /sys/module/subsystem_restart/parameters/enable_ramdumps 1 - mkdir /data/vendor/ramdump_ssr 770 system system - start vendor.ss_ramdump - -on property:persist.vendor.ssr.enable_ramdumps=0 - write /sys/module/subsystem_restart/parameters/enable_ramdumps 0 - on property:persist.vendor.sys.rawdump_copy=1 write /sys/kernel/dload/emmc_dload 1 @@ -758,12 +742,6 @@ service charger /system/bin/charger capabilities SYS_BOOT seclabel u:r:charger:s0 -service vendor.ssr_diag /system/vendor/bin/ssr_diag - class late_start - user system - group system - disabled - service diag_mdlog_start /system/vendor/bin/diag_mdlog class late_start user shell diff --git a/sepolicy/vendor/file.te b/sepolicy/vendor/file.te index 1006604..3aed94f 100644 --- a/sepolicy/vendor/file.te +++ b/sepolicy/vendor/file.te @@ -14,6 +14,8 @@ type sysfs_msm_boot, fs_type, sysfs_type; type sysfs_msm_subsys, fs_type, sysfs_type; +type sysfs_ssr_toggle, sysfs_type, fs_type; + type sysfs_touchpanel, fs_type, sysfs_type; type sysfs_wireless_supply, fs_type, sysfs_type; diff --git a/sepolicy/vendor/genfs_contexts b/sepolicy/vendor/genfs_contexts index 207e817..b5021b4 100644 --- a/sepolicy/vendor/genfs_contexts +++ b/sepolicy/vendor/genfs_contexts @@ -37,6 +37,15 @@ genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.q genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d300/leds/led:switch_0/brightness u:object_r:sysfs_leds:s0 genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-05/c440000.qcom,spmi:qcom,pm6150l@5:qcom,leds@d300/leds/led:switch_1/brightness u:object_r:sysfs_leds:s0 +# SSR +genfscon sysfs /devices/platform/soc/4080000.qcom,mss/subsys0/restart_level u:object_r:sysfs_ssr_toggle:s0 +genfscon sysfs /devices/platform/soc/3000000.qcom,lpass/subsys1/restart_level u:object_r:sysfs_ssr_toggle:s0 +genfscon sysfs /devices/platform/soc/8300000.qcom,turing/subsys2/restart_level u:object_r:sysfs_ssr_toggle:s0 +genfscon sysfs /devices/platform/soc/soc:qcom,ipa_fws/subsys3/restart_level u:object_r:sysfs_ssr_toggle:s0 +genfscon sysfs /devices/platform/soc/soc:qcom,kgsl-hyp/subsys4/restart_level u:object_r:sysfs_ssr_toggle:s0 +genfscon sysfs /devices/platform/soc/aae0000.qcom,venus/subsys5/restart_level u:object_r:sysfs_ssr_toggle:s0 +genfscon sysfs /devices/platform/soc/9800000.qcom,npu/subsys6/restart_level u:object_r:sysfs_ssr_toggle:s0 + # Touchpanel genfscon sysfs /touchpanel u:object_r:sysfs_touchpanel:s0 diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te index 3b8066d..6f761e3 100644 --- a/sepolicy/vendor/vendor_init.te +++ b/sepolicy/vendor/vendor_init.te @@ -7,6 +7,7 @@ allow vendor_init { vendor_debugfs_clk proc_dirty proc + sysfs_ssr_toggle }:file w_file_perms; allow vendor_init block_device:lnk_file setattr;