Merge "init: ssr: Modify subsystem restart (SSR) handling"

common.mk

@@ -191,6 +191,7 @@ INIT += init.qcom.efs.sync.sh
 INIT += ueventd.qcom.rc
 INIT += init.ath3k.bt.sh
 INIT += init.qcom.audio.sh
+INIT += init.qcom.ssr.sh
 
 #IPROUTE2
 IPROUTE2 := ip

rootdir/Android.mk

@@ -167,3 +167,11 @@ LOCAL_MODULE_TAGS  := optional eng
 LOCAL_MODULE_CLASS := ETC
 LOCAL_SRC_FILES    := etc/hcidump.sh
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.qcom.ssr.sh
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.qcom.ssr.sh
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)

rootdir/etc/init.qcom.rc

@@ -678,23 +678,9 @@ service ssr_diag /system/bin/ssr_diag
     user system
     group system
 
-# Disable SSR to SoC restart
-on property:persist.sys.ssr.restart_level=1
-    write /sys/module/subsystem_restart/parameters/restart_level 1
-    write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 0
-    write /sys/bus/msm_subsys/devices/subsys0/restart_level system
-    write /sys/bus/msm_subsys/devices/subsys1/restart_level system
-    write /sys/bus/msm_subsys/devices/subsys2/restart_level system
-    write /sys/bus/msm_subsys/devices/subsys3/restart_level system
-
-# Enable SSR
-on property:persist.sys.ssr.restart_level=3
-    write /sys/module/subsystem_restart/parameters/restart_level 3
-    write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1
-    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
+# SSR setting
+on property:persist.sys.ssr=*
+    exec /system/bin/sh /init.qcom.ssr.sh ${persist.sys.ssr}
 
 # Define fastmmi
 service fastmmi /system/bin/mmi

rootdir/etc/init.qcom.ssr.sh

@@ -0,0 +1,92 @@
+#!/system/bin/sh
+# Copyright (c) 2013, The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#     * Neither the name of The Linux Foundation nor
+#       the names of its contributors may be used to endorse or promote
+#       products derived from this software without specific prior written
+#       permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NON-INFRINGEMENT ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+ssr_str="$1"
+IFS=,
+ssr_array=($ssr_str)
+declare -i ssr_status=0
+
+for num in "${!ssr_array[@]}"
+do
+    case "${ssr_array[$num]}" in
+        "subsys0")
+            ssr_status=$ssr_status+1
+        ;;
+        "subsys1")
+            ssr_status=$ssr_status+2
+        ;;
+        "subsys2")
+            ssr_status=$ssr_status+4
+        ;;
+        "subsys3")
+            ssr_status=$ssr_status+8
+        ;;
+        "3")
+            ssr_status=$ssr_status+16
+        ;;
+        "riva")
+            ssr_status=$ssr_status+32
+        ;;
+    esac
+done
+
+if [ $((ssr_status & 1)) == 1 ]; then
+    echo "related" > /sys/bus/msm_subsys/devices/subsys0/restart_level
+else
+    echo "system" > /sys/bus/msm_subsys/devices/subsys0/restart_level
+fi
+
+if [ $((ssr_status & 2)) == 2 ]; then
+    echo "related" > /sys/bus/msm_subsys/devices/subsys1/restart_level
+else
+    echo "system" > /sys/bus/msm_subsys/devices/subsys1/restart_level
+fi
+
+if [ $((ssr_status & 4)) == 4 ]; then
+    echo "related" > /sys/bus/msm_subsys/devices/subsys2/restart_level
+else
+    echo "system" > /sys/bus/msm_subsys/devices/subsys2/restart_level
+fi
+
+if [ $((ssr_status & 8)) == 8 ]; then
+    echo "related" > /sys/bus/msm_subsys/devices/subsys3/restart_level
+else
+    echo "system" > /sys/bus/msm_subsys/devices/subsys3/restart_level
+fi
+
+if [ $((ssr_status & 16)) == 16 ]; then
+    echo 3 > /sys/module/subsystem_restart/parameters/restart_level
+else
+    echo 1 > /sys/module/subsystem_restart/parameters/restart_level
+fi
+
+if [ $((ssr_status & 32)) == 32 ]; then
+    echo 1 > /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr
+else
+    echo 0 > /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr
+fi