From 46a93560c068e558319dc789e372c3952cdd62ae Mon Sep 17 00:00:00 2001 From: Erik Castricum Date: Mon, 22 May 2017 11:03:04 +0200 Subject: [PATCH] sony: kitakami: disable CPUSET and remove all references to it from init Change-Id: I0b72f6f629f70939340fabc53847228272f9984b Signed-off-by: Erik Castricum --- PlatformConfig.mk | 2 -- rootdir/init.kitakami.rc | 54 ---------------------------------------- 2 files changed, 56 deletions(-) diff --git a/PlatformConfig.mk b/PlatformConfig.mk index 76ac209..7f00e08 100644 --- a/PlatformConfig.mk +++ b/PlatformConfig.mk @@ -32,8 +32,6 @@ TARGET_2ND_CPU_VARIANT := cortex-a53.a57 TARGET_USES_64_BIT_BINDER := true TARGET_USES_64_BIT_BCMDHD := true -ENABLE_CPUSETS := true - BOARD_KERNEL_BASE := 0x00000000 BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_TAGS_OFFSET := 0x01E00000 diff --git a/rootdir/init.kitakami.rc b/rootdir/init.kitakami.rc index 7917647..ca32cd1 100644 --- a/rootdir/init.kitakami.rc +++ b/rootdir/init.kitakami.rc @@ -382,24 +382,6 @@ on boot chown system input /sys/bus/spi/devices/spi0.1/irq chmod 0660 /sys/bus/spi/devices/spi0.1/irq - # add a cpuset for the camera daemon - # we want all the little cores for camera - mkdir /dev/cpuset/camera-daemon - write /dev/cpuset/camera-daemon/cpus 0 - write /dev/cpuset/camera-daemon/mems 0 - chown system system /dev/cpuset/camera-daemon - chown system system /dev/cpuset/camera-daemon/tasks - chmod 0664 /dev/cpuset/camera-daemon/tasks - - # Update foreground cpuset now that processors are up - # reserve CPU 3 for the top app and camera daemon - write /dev/cpuset/foreground/cpus 0-2,4-7 - write /dev/cpuset/foreground/boost/cpus 4-7 - write /dev/cpuset/background/cpus 0 - write /dev/cpuset/system-background/cpus 0-2 - write /dev/cpuset/top-app/cpus 0-7 - write /dev/cpuset/camera-daemon/cpus 0-3 - start rmt_storage write /proc/sys/kernel/sched_boost 1 @@ -559,7 +541,6 @@ service macaddrsetup /system/bin/macaddrsetup /sys/devices/soc.0/bcmdhd_wlan.83/ group system bluetooth disabled oneshot - writepid /dev/cpuset/system-background/tasks service wpa_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ @@ -594,7 +575,6 @@ service per_mgr /system/vendor/bin/pm-service class core user system group system net_raw - writepid /dev/cpuset/system-background/tasks # QCOM prop service per_proxy /system/vendor/bin/pm-proxy @@ -602,7 +582,6 @@ service per_proxy /system/vendor/bin/pm-proxy user system group system net_raw disabled - writepid /dev/cpuset/system-background/tasks # Sensor service pad_controller /system/vendor/bin/pad_controller @@ -610,7 +589,6 @@ service pad_controller /system/vendor/bin/pad_controller user system group system radio disabled - writepid /dev/cpuset/system-background/tasks on property:ro.hardware=karin enable pad_controller @@ -620,7 +598,6 @@ service fingerprintd /system/bin/fingerprintd class late_start user system group input - writepid /dev/cpuset/system-background/tasks service ipacm-diag /system/vendor/bin/ipacm-diag class main @@ -653,7 +630,6 @@ service imsqmidaemon /system/vendor/bin/imsqmidaemon socket ims_qmid stream 0660 system radio group radio log diag seclabel u:r:ims:s0 - writepid /dev/cpuset/system-background/tasks service imsdatadaemon /system/vendor/bin/imsdatadaemon class main @@ -662,7 +638,6 @@ service imsdatadaemon /system/vendor/bin/imsdatadaemon group system wifi radio inet log diag disabled seclabel u:r:ims:s0 - writepid /dev/cpuset/system-background/tasks on property:sys.ims.QMI_DAEMON_STATUS=1 start imsdatadaemon @@ -680,7 +655,6 @@ service imscmservice /system/vendor/bin/imscmservice user system group radio net_raw diag diag log seclabel u:r:imscm:s0 - writepid /dev/cpuset/system-background/tasks disabled on property:sys.ims.DATA_DAEMON_STATUS=1 @@ -691,7 +665,6 @@ service tftp_server /system/vendor/bin/tftp_server class core user root seclabel u:r:rfs_access:s0 - writepid /dev/cpuset/system-background/tasks # service for USERDEBUG service LKCore-dbg /system/vendor/bin/LKCore @@ -714,7 +687,6 @@ service msm_irqbalance /system/vendor/bin/msm_irqbalance -f /system/etc/msm_irqb class core user root group root - writepid /dev/cpuset/system-background/tasks # brcm-uim-sysfs (BT/FM/ANT+) service uim /system/bin/brcm-uim-sysfs @@ -722,7 +694,6 @@ service uim /system/bin/brcm-uim-sysfs user root group bluetooth net_bt_admin net_bt seclabel u:r:uim:s0 - writepid /dev/cpuset/system-background/tasks # Start Security Daemon service secd /system/vendor/bin/secd @@ -734,7 +705,6 @@ service secd /system/vendor/bin/secd socket secd_devsec_sock stream 0660 system credmgr_client socket secd_credmgr_sock stream 0660 system credmgr_client seclabel u:r:secd:s0 - writepid /dev/cpuset/system-background/tasks # SONY iddd daemon service iddd /system/vendor/bin/iddd @@ -742,7 +712,6 @@ service iddd /system/vendor/bin/iddd user idd group idd log inet trimarea seclabel u:r:idd:s0 - writepid /dev/cpuset/system-background/tasks # SONY: Startup prober service startup-prober /system/vendor/bin/startup-prober @@ -750,7 +719,6 @@ service startup-prober /system/vendor/bin/startup-prober oneshot disabled group trimarea drmrpc system credmgr_client - writepid /dev/cpuset/system-background/tasks # SONY: Startup Logger service startup-logger /system/vendor/bin/startup-logger @@ -759,7 +727,6 @@ service startup-logger /system/vendor/bin/startup-logger group root system trimarea oneshot seclabel u:r:startup-logger:s0 - writepid /dev/cpuset/system-background/tasks # SONY misc service tad_static /system/vendor/bin/tad_static /dev/block/bootdevice/by-name/TA 0,16 @@ -768,32 +735,27 @@ service tad_static /system/vendor/bin/tad_static /dev/block/bootdevice/by-name/T group root tad socket tad stream 0660 system trimarea seclabel u:r:tad:s0 - writepid /dev/cpuset/system-background/tasks # SONY misc service ta_qmi_service /system/vendor/bin/ta_qmi_service class core user root - writepid /dev/cpuset/system-background/tasks # SONY prop service sct_service /system/vendor/bin/sct_service class core user root drmrpc - writepid /dev/cpuset/system-background/tasks # SONY prop service mlog_qmi_service /system/vendor/bin/mlog_qmi_service class core user root wakelock drmrpc - writepid /dev/cpuset/system-background/tasks # QCOM prop service rmt_storage /system/vendor/bin/rmt_storage class core user root group system wakelock drmrpc - writepid /dev/cpuset/system-background/tasks # DSDS second ril service ril-daemon2 /system/bin/rild -c 2 @@ -811,7 +773,6 @@ service updatemiscta /system/vendor/bin/updatemiscta group trimarea oneshot seclabel u:r:updatemiscta:s0 - writepid /dev/cpuset/system-background/tasks # QCOM prop service qmuxd /system/vendor/bin/qmuxd @@ -819,14 +780,12 @@ service qmuxd /system/vendor/bin/qmuxd user radio group radio audio bluetooth wakelock gps nfc diag drmrpc disabled - writepid /dev/cpuset/system-background/tasks # QCOM prop service netmgrd /system/vendor/bin/netmgrd class main group system wakelock disabled - writepid /dev/cpuset/system-background/tasks # QCOM prop service irsc_util /system/vendor/bin/irsc_util "/etc/sec_config" @@ -839,27 +798,23 @@ service qcamerasvr /system/vendor/bin/mm-qcamera-daemon class late_start user camera group camera system inet input graphics - writepid /dev/cpuset/camera-daemon/tasks # QCOM sensors service sensors /system/vendor/bin/sensors.qcom class main user root group root - writepid /dev/cpuset/system-background/tasks # QCOM Secure service qseecomd /system/vendor/bin/qseecomd class core user root group root - writepid /dev/cpuset/system-background/tasks service qseeproxydaemon /system/vendor/bin/qseeproxydaemon class late_start user system group system - writepid /dev/cpuset/system-background/tasks # Color calibration service display_cc /system/vendor/bin/display_color_calib @@ -874,14 +829,12 @@ service thermanager /system/bin/thermanager /system/etc/thermanager.xml class main user root group root - writepid /dev/cpuset/system-background/tasks # Offline charger service charger /sbin/healthd -c class charger critical seclabel u:r:healthd:s0 - writepid /dev/cpuset/system-background/tasks # OSS time service timekeep /system/bin/timekeep restore @@ -889,7 +842,6 @@ service timekeep /system/bin/timekeep restore user root group root oneshot - writepid /dev/cpuset/system-background/tasks on property:ro.boot.baseband=apq setprop ro.radio.noril yes @@ -907,34 +859,29 @@ service audioserver /system/bin/audioserver # media gid needed for /dev/fm (radio) and for /data/misc/media (tee) group audio trimarea camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct qcom_diag ioprio rt 4 - writepid /dev/cpuset/foreground/tasks service cameraserver /system/bin/cameraserver class main user cameraserver group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct credmgr_client trimarea ioprio rt 4 - writepid /dev/cpuset/foreground/tasks service drm /system/bin/drmserver class main user drm group drm system inet drmrpc readproc trimarea - writepid /dev/cpuset/foreground/tasks service media /system/bin/mediaserver class main user media group audio camera inet net_bt net_bt_admin net_bw_acct drmrpc mediadrm credmgr_client ioprio rt 4 - writepid /dev/cpuset/foreground/tasks service mediadrm /system/bin/mediadrmserver class main user media group mediadrm drmrpc trimarea ioprio rt 4 - writepid /dev/cpuset/foreground/tasks service ril-daemon /system/bin/rild class main @@ -1019,7 +966,6 @@ service keyprovd /system/vendor/bin/keyprovd group system oneshot seclabel u:r:keyprovd:s0 - writepid /dev/cpuset/foreground/tasks on property:vold.decrypt=trigger_restart_min_framework restart timekeep