From 30a5d228daba93aba7d18e1cb1a167c961ce1701 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Mon, 13 Jan 2014 18:08:57 -0800 Subject: [PATCH 01/24] m7-common: use new common kernel * CodeAurora kk_2.7_rb1.21 based kernel Change-Id: Ia7367daf459ca67de1dcf9b2ba64842ba9ee6758 --- BoardConfigCommon.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index a1c24991..45fd0785 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -34,8 +34,8 @@ BOARD_KERNEL_BASE := 0x80600000 BOARD_KERNEL_PAGESIZE := 2048 BOARD_KERNEL_CMDLINE := console=ttyHSL0,115200,n8 androidboot.hardware=qcom user_debug=31 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01800000 -TARGET_KERNEL_CONFIG := cyanogenmod_m7_defconfig -TARGET_KERNEL_SOURCE := kernel/htc/m7 +TARGET_KERNEL_CONFIG := m7_defconfig +TARGET_KERNEL_SOURCE := kernel/htc/msm8960 # Audio BOARD_USES_FLUENCE_INCALL := true # use DMIC in call only From d187005be2d19d64869e09d064ac7bc12de28f1a Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Tue, 14 Jan 2014 15:52:26 -0800 Subject: [PATCH 02/24] m7-common: snd_soc_msm: Update PCM IDs for new kernel * Set low latency and compressed PCM to correct values Change-Id: I05deb58562e8da0286b81bf3994d8268deb7b56b --- dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 | 174 ++++++++++++------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 index 4b96f07f..11465992 100644 --- a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 +++ b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 @@ -469,7 +469,7 @@ SectionVerb DisableSequence 'SLIMBUS_0_RX Audio Mixer MultiMedia5':1:0 EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection SectionVerb @@ -482,7 +482,7 @@ SectionVerb DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia5':1:0 EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection SectionVerb @@ -495,7 +495,7 @@ SectionVerb DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia5':1:0 EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection SectionVerb @@ -508,7 +508,7 @@ SectionVerb DisableSequence 'HDMI Mixer MultiMedia5':1:0 EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection SectionVerb @@ -521,7 +521,7 @@ SectionVerb DisableSequence 'AFE_PCM_RX Audio Mixer MultiMedia5':1:0 EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection SectionVerb @@ -532,7 +532,7 @@ SectionVerb DisableSequence EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection SectionVerb @@ -545,7 +545,7 @@ SectionVerb DisableSequence 'MI2S_RX Audio Mixer MultiMedia5':1:0 EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection SectionVerb @@ -558,7 +558,7 @@ SectionVerb DisableSequence 'MI2S_RX Audio Mixer MultiMedia5':1:0 EndSequence - PlaybackPCM 40 + PlaybackPCM 14 EndSection } SectionUseCase."HiFi Lowlatency Rec" { @@ -572,8 +572,8 @@ SectionVerb DisableSequence 'MultiMedia5 Mixer SLIM_0_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionVerb @@ -586,8 +586,8 @@ SectionVerb DisableSequence 'MultiMedia5 Mixer AUX_PCM_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionVerb @@ -600,8 +600,8 @@ SectionVerb DisableSequence 'MultiMedia5 Mixer AUX_PCM_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionVerb @@ -612,8 +612,8 @@ SectionVerb DisableSequence EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionVerb @@ -626,8 +626,8 @@ SectionVerb DisableSequence 'MultiMedia5 Mixer AFE_PCM_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection } SectionUseCase."HiFi Rec" { @@ -698,8 +698,8 @@ SectionVerb DisableSequence 'MultiMedia4 Mixer SLIM_0_TX':1:1 EndSequence - CapturePCM 36 - PlaybackPCM 36 + CapturePCM 9 + PlaybackPCM 9 EndSection } SectionUseCase."HiFi Tunnel" { @@ -713,7 +713,7 @@ SectionVerb DisableSequence 'SLIMBUS_0_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionVerb @@ -726,7 +726,7 @@ SectionVerb DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionVerb @@ -739,7 +739,7 @@ SectionVerb DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionVerb @@ -752,7 +752,7 @@ SectionVerb DisableSequence 'HDMI Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionVerb @@ -765,7 +765,7 @@ SectionVerb DisableSequence 'AFE_PCM_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionVerb @@ -778,7 +778,7 @@ SectionVerb DisableSequence 'MI2S_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionVerb @@ -791,7 +791,7 @@ SectionVerb DisableSequence 'MI2S_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection } SectionUseCase."HiFi2" { @@ -839,8 +839,8 @@ SectionVerb 'Voice Stub Tx Mixer STUB_TX_HL':1:0 'Voice Stub Tx Mixer STUB_1_TX_HL':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionVerb @@ -859,8 +859,8 @@ SectionVerb 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer AUX_PCM_DL_RX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionVerb @@ -881,8 +881,8 @@ SectionVerb DisableSequence EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionVerb @@ -901,8 +901,8 @@ SectionVerb 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer AUX_PCM_DL_RX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionVerb @@ -923,8 +923,8 @@ SectionVerb DisableSequence EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionVerb @@ -947,8 +947,8 @@ SectionVerb 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer MI2S_TX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionVerb @@ -971,8 +971,8 @@ SectionVerb 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer MI2S_TX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionVerb @@ -995,8 +995,8 @@ SectionVerb 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer MI2S_TX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection } SectionUseCase."Voice Call IP" { @@ -2464,8 +2464,8 @@ SectionModifier DisableSequence 'MultiMedia5 Mixer SLIM_0_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2478,8 +2478,8 @@ SectionModifier DisableSequence 'MultiMedia5 Mixer AUX_PCM_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2492,8 +2492,8 @@ SectionModifier DisableSequence 'MultiMedia5 Mixer AUX_PCM_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2504,8 +2504,8 @@ SectionModifier DisableSequence EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2518,8 +2518,8 @@ SectionModifier DisableSequence 'MultiMedia5 Mixer AFE_PCM_TX':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2678,8 +2678,8 @@ SectionModifier DisableSequence 'SLIMBUS_0_RX Audio Mixer MultiMedia5':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2692,8 +2692,8 @@ SectionModifier DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia5':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2706,8 +2706,8 @@ SectionModifier DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia5':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2720,8 +2720,8 @@ SectionModifier DisableSequence 'AFE_PCM_RX Audio Mixer MultiMedia5':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2734,8 +2734,8 @@ SectionModifier DisableSequence 'MI2S_RX Audio Mixer MultiMedia5':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -2748,8 +2748,8 @@ SectionModifier DisableSequence 'MI2S_RX Audio Mixer MultiMedia5':1:0 EndSequence - CapturePCM 40 - PlaybackPCM 40 + CapturePCM 14 + PlaybackPCM 14 EndSection SectionModifier @@ -3159,7 +3159,7 @@ SectionModifier DisableSequence 'SLIMBUS_0_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionModifier @@ -3172,7 +3172,7 @@ SectionModifier DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionModifier @@ -3185,7 +3185,7 @@ SectionModifier DisableSequence 'AUX_PCM_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionModifier @@ -3198,7 +3198,7 @@ SectionModifier DisableSequence 'HDMI Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionModifier @@ -3211,7 +3211,7 @@ SectionModifier DisableSequence 'AFE_PCM_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionModifier @@ -3224,7 +3224,7 @@ SectionModifier DisableSequence 'MI2S_RX Audio Mixer MultiMedia4':1:0 EndSequence - PlaybackPCM 36 + PlaybackPCM 9 EndSection SectionModifier @@ -3241,8 +3241,8 @@ SectionModifier 'Voice Stub Tx Mixer STUB_TX_HL':1:0 'Voice Stub Tx Mixer STUB_1_TX_HL':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier @@ -3261,8 +3261,8 @@ SectionModifier 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer AUX_PCM_DL_RX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier @@ -3283,8 +3283,8 @@ SectionModifier DisableSequence EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier @@ -3303,8 +3303,8 @@ SectionModifier 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer AUX_PCM_DL_RX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier @@ -3325,8 +3325,8 @@ SectionModifier DisableSequence EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier @@ -3349,8 +3349,8 @@ SectionModifier 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer MI2S_TX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier @@ -3373,8 +3373,8 @@ SectionModifier 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer MI2S_TX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier @@ -3397,8 +3397,8 @@ SectionModifier 'SLIMBUS_3_RX_Voice Mixer Voice Stub':1:0 'SLIMBUS_3_RX Port Mixer MI2S_TX':1:0 EndSequence - CapturePCM 9 - PlaybackPCM 9 + CapturePCM 12 + PlaybackPCM 12 EndSection SectionModifier From fac03c66852bf87a6f0195b807df5d36b15b75d8 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Fri, 17 Jan 2014 17:08:12 -0800 Subject: [PATCH 03/24] m7-common: Update SCO channel and rate * New kernel changes INTERNAL_BT_SCO to SLIM_1 Change-Id: I1bb5fe15ee02d00cfddd968abb28a3c1c377cabe --- dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 | 32 ++++++++++++++++---------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 index 11465992..4ee3f138 100644 --- a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 +++ b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 @@ -850,6 +850,7 @@ SectionVerb EndSequence DisableSequence + 'SLIM_1 SampleRate':1:8000 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:0 'SLIMBUS_1_RX Mixer Voice Stub':1:0 'Voice Stub Tx Mixer SLIM_1_TX':1:0 @@ -867,7 +868,8 @@ SectionVerb Name "Voice CallBT SCO Tx" EnableSequence - 'Internal BTSCO SampleRate':0:8000 + 'SLIM_1 SampleRate':1:8000 + 'SLIM_1_RX Channels':0:One 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:1 'SLIMBUS_1_RX Mixer Voice Stub':1:1 'Voice Stub Tx Mixer SLIM_1_TX':1:1 @@ -892,6 +894,7 @@ SectionVerb EndSequence DisableSequence + 'SLIM_1 SampleRate':1:8000 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:0 'SLIMBUS_1_RX Mixer Voice Stub':1:0 'Voice Stub Tx Mixer SLIM_1_TX':1:0 @@ -909,7 +912,8 @@ SectionVerb Name "Voice CallBT SCO WB Tx" EnableSequence - 'Internal BTSCO SampleRate':0:16000 + 'SLIM_1 SampleRate':0:16000 + 'SLIM_1_RX Channels':0:One 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:1 'SLIMBUS_1_RX Mixer Voice Stub':1:1 'Voice Stub Tx Mixer SLIM_1_TX':1:1 @@ -1023,7 +1027,7 @@ SectionVerb EndSequence DisableSequence - 'Internal BTSCO SampleRate':0:8000 + 'SLIM_1 SampleRate':1:8000 'AUX_PCM_RX_Voice Mixer Voip':1:0 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:0 EndSequence @@ -1035,7 +1039,7 @@ SectionVerb Name "Voice Call IPBT SCO Tx" EnableSequence - 'Internal BTSCO SampleRate':0:8000 + 'SLIM_1 SampleRate':1:8000 'AUX_PCM_RX_Voice Mixer Voip':1:1 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:1 EndSequence @@ -1053,7 +1057,7 @@ SectionVerb EndSequence DisableSequence - 'Internal BTSCO SampleRate':0:16000 + 'SLIM_1 SampleRate':1:8000 'AUX_PCM_RX_Voice Mixer Voip':1:0 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:0 EndSequence @@ -1065,7 +1069,7 @@ SectionVerb Name "Voice Call IPBT SCO WB Tx" EnableSequence - 'Internal BTSCO SampleRate':0:16000 + 'SLIM_1 SampleRate':1:16000 'AUX_PCM_RX_Voice Mixer Voip':1:1 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:1 EndSequence @@ -3252,6 +3256,7 @@ SectionModifier EndSequence DisableSequence + 'SLIM_1 SampleRate':1:8000 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:0 'SLIMBUS_1_RX Mixer Voice Stub':1:0 'Voice Stub Tx Mixer SLIM_1_TX':1:0 @@ -3269,7 +3274,8 @@ SectionModifier Name "Play VoiceBT SCO Tx" EnableSequence - 'Internal BTSCO SampleRate':0:8000 + 'SLIM_1 SampleRate':1:8000 + 'SLIM_1_RX Channels':0:One 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:1 'SLIMBUS_1_RX Mixer Voice Stub':1:1 'Voice Stub Tx Mixer SLIM_1_TX':1:1 @@ -3294,6 +3300,7 @@ SectionModifier EndSequence DisableSequence + 'SLIM_1 SampleRate':1:8000 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:0 'SLIMBUS_1_RX Mixer Voice Stub':1:0 'Voice Stub Tx Mixer SLIM_1_TX':1:0 @@ -3311,7 +3318,8 @@ SectionModifier Name "Play VoiceBT SCO WB Tx" EnableSequence - 'Internal BTSCO SampleRate':0:16000 + 'SLIM_1 SampleRate':1:16000 + 'SLIM_1_RX Channels':0:One 'Voice Stub Tx Mixer AUX_PCM_UL_TX':1:1 'SLIMBUS_1_RX Mixer Voice Stub':1:1 'Voice Stub Tx Mixer SLIM_1_TX':1:1 @@ -3424,7 +3432,7 @@ SectionModifier EndSequence DisableSequence - 'Internal BTSCO SampleRate':0:8000 + 'SLIM_1 SampleRate':1:8000 'AUX_PCM_RX_Voice Mixer Voip':1:0 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:0 EndSequence @@ -3436,7 +3444,7 @@ SectionModifier Name "Play VOIPBT SCO Tx" EnableSequence - 'Internal BTSCO SampleRate':0:8000 + 'SLIM_1 SampleRate':1:8000 'AUX_PCM_RX_Voice Mixer Voip':1:1 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:1 EndSequence @@ -3454,7 +3462,7 @@ SectionModifier EndSequence DisableSequence - 'Internal BTSCO SampleRate':0:16000 + 'SLIM_1 SampleRate':1:16000 'AUX_PCM_RX_Voice Mixer Voip':1:0 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:0 EndSequence @@ -3466,7 +3474,7 @@ SectionModifier Name "Play VOIPBT SCO WB Tx" EnableSequence - 'Internal BTSCO SampleRate':0:16000 + 'SLIM_1 SampleRate':1:16000 'AUX_PCM_RX_Voice Mixer Voip':1:1 'Voip_Tx Mixer AUX_PCM_TX_Voip':1:1 EndSequence From 516eb4b792c223c1ee38a803295c2716f5b7e2c8 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Tue, 14 Jan 2014 17:06:17 -0800 Subject: [PATCH 04/24] m7-common: Update post-boot script for new power modes Change-Id: Ibb8ddf900caabd1d8ab79df877ebe0fb0966c5a5 --- configs/init.post_boot.sh | 245 ++++++++++++++++++++++---------------- 1 file changed, 145 insertions(+), 100 deletions(-) diff --git a/configs/init.post_boot.sh b/configs/init.post_boot.sh index c4ce8db6..959b37e8 100644 --- a/configs/init.post_boot.sh +++ b/configs/init.post_boot.sh @@ -1,5 +1,5 @@ #!/system/bin/sh -# Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved. +# Copyright (c) 2009-2012, 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: @@ -8,7 +8,7 @@ # * 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 Code Aurora nor +# * 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. @@ -27,105 +27,150 @@ # target=`getprop ro.board.platform` - -case "$target" in - "msm8960") - # echo 1 > /sys/module/rpm_resources/enable_low_power/L2_cache - # echo 1 > /sys/module/rpm_resources/enable_low_power/pxo - # echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_dig - # echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_mem - # echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu1/power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu2/power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu3/power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/suspend_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/idle_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/idle_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/idle_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/idle_enabled - # echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/idle_enabled - echo 1 > /sys/devices/system/cpu/cpu1/online - echo 1 > /sys/devices/system/cpu/cpu2/online - echo 1 > /sys/devices/system/cpu/cpu3/online - echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - echo "ondemand" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor - echo "ondemand" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor - echo "ondemand" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor - echo 50000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - echo 90 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold - echo 1 > /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - echo 4 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential - echo 60 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core - echo 3 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core - echo 918000 > /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq - echo 1026000 > /sys/devices/system/cpu/cpufreq/ondemand/sync_freq - echo 1134000 > /sys/devices/system/cpu/cpufreq/ondemand/input_boost - echo 80 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load - chown system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - chown system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - chown system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - echo 20 > /sys/module/cpu_boost/parameters/boost_ms - echo 1566000 > /sys/module/cpu_boost/parameters/sync_threshold - echo 1134000 > /sys/module/cpu_boost/parameters/input_boost_freq - echo 40 > /sys/module/cpu_boost/parameters/input_boost_ms - echo 1 > /dev/cpuctl/apps/cpu.notify_on_migrate - echo 384000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq - # echo 1 > /sys/devices/system/cpu/cpufreq/interactive/io_is_busy - # chown system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay - # chown system /sys/devices/system/cpu/cpufreq/interactive/boost - # chown system /sys/devices/system/cpu/cpufreq/interactive/boostpulse - # chown system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration - # chown system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load - # chown system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq - # chown system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy - # chown system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time - # chown system /sys/devices/system/cpu/cpufreq/interactive/target_loads - # chown system /sys/devices/system/cpu/cpufreq/interactive/timer_rate - # chown system /sys/devices/system/cpu/cpufreq/interactive/timer_slack - chown system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq - chown system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq - chown system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq - chown system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq - chown system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq - chown system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq - chown system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq - chown system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq - echo 1 > /sys/module/msm_thermal/core_control/enabled - chown root.system /sys/devices/system/cpu/mfreq - chmod 220 /sys/devices/system/cpu/mfreq - chown root.system /sys/devices/system/cpu/cpu1/online - chown root.system /sys/devices/system/cpu/cpu2/online - chown root.system /sys/devices/system/cpu/cpu3/online - chmod 664 /sys/devices/system/cpu/cpu1/online - chmod 664 /sys/devices/system/cpu/cpu2/online - chmod 664 /sys/devices/system/cpu/cpu3/online - chmod 664 /sys/power/pnpmgr/apps/media_mode - chown media.system /sys/power/pnpmgr/apps/media_mode - chown system /sys/power/pnpmgr/apps/activity_trigger - chown system /sys/power/perflock - chown system /sys/power/launch_event - chown system /sys/power/powersave - chown system /sys/power/cpufreq_ceiling - chown system /sys/power/cpunum_floor - chown system /sys/power/cpunum_ceiling - echo 1 > /sys/module/rmnet_usb/parameters/rmnet_data_init - # Allow QMUX daemon to assign port open wait time - chown radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait - # Wake on volume - echo 1 > /sys/keyboard/vol_wakeup - ;; -esac - -# Post-setup services case "$target" in "msm8960") - start adaptive + echo 1 > /sys/module/rpm_resources/enable_low_power/L2_cache + echo 1 > /sys/module/rpm_resources/enable_low_power/pxo + echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_dig + echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_mem + echo 1 > /sys/module/pm_8x60/modes/cpu0/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/idle_enabled + echo 0 > /sys/module/msm_thermal/core_control/enabled + echo 1 > /sys/devices/system/cpu/cpu1/online + echo 1 > /sys/devices/system/cpu/cpu2/online + echo 1 > /sys/devices/system/cpu/cpu3/online + #echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + #echo "ondemand" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor + #echo "ondemand" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor + #echo "ondemand" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor + #echo 50000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate + #echo 90 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold + #echo 1 > /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy + #echo 4 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + #echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential + #echo 70 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core + #echo 3 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core + #echo 918000 > /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq + #echo 1026000 > /sys/devices/system/cpu/cpufreq/ondemand/sync_freq + #echo 80 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load + #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate + #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy + echo "interactive" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + echo "interactive" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor + echo "interactive" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor + echo "interactive" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor + echo 40000 > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time + echo 1134000 > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq + echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay + echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/timer_rate + echo 100000 > /sys/devices/system/cpu/cpufreq/interactive/sampling_down_factor + echo 1 > /sys/devices/system/cpu/cpufreq/interactive/io_is_busy + echo 20 > /sys/module/cpu_boost/parameters/boost_ms + echo 1566000 > /sys/module/cpu_boost/parameters/sync_threshold + echo 1134000 > /sys/module/cpu_boost/parameters/input_boost_freq + echo 40 > /sys/module/cpu_boost/parameters/input_boost_ms + echo 384000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq + echo 384000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq + echo 384000 > /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq + echo 384000 > /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay + chown -h system /sys/devices/system/cpu/cpufreq/interactive/boost + chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse + chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration + chown -h system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load + chown -h system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq + chown -h system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy + chown -h system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time + chown -h system /sys/devices/system/cpu/cpufreq/interactive/target_loads + chown -h system /sys/devices/system/cpu/cpufreq/interactive/timer_slack + chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq + echo 1 > /sys/module/msm_thermal/core_control/enabled + echo 1 > /dev/cpuctl/apps/cpu.notify_on_migrate + chown -h root.system /sys/devices/system/cpu/mfreq + chmod -h 220 /sys/devices/system/cpu/mfreq + chown -h root.system /sys/devices/system/cpu/cpu1/online + chown -h root.system /sys/devices/system/cpu/cpu2/online + chown -h root.system /sys/devices/system/cpu/cpu3/online + chmod -h 664 /sys/devices/system/cpu/cpu1/online + chmod -h 664 /sys/devices/system/cpu/cpu2/online + chmod -h 664 /sys/devices/system/cpu/cpu3/online + # set DCVS parameters for CPU + echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu0/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu0/disable_pc_threshold + echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_max_us + echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu1/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu1/disable_pc_threshold + echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_max_us + echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu2/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu2/disable_pc_threshold + echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_max_us + echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu3/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu3/disable_pc_threshold + # set DCVS parameters for GPU + echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_max_us + echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_min_us + echo 0 > /sys/module/msm_dcvs/cores/gpu0/slack_mode_dynamic + # set msm_mpdecision parameters + echo 45000 > /sys/module/msm_mpdecision/slack_time_max_us + echo 15000 > /sys/module/msm_mpdecision/slack_time_min_us + echo 100000 > /sys/module/msm_mpdecision/em_win_size_min_us + echo 1000000 > /sys/module/msm_mpdecision/em_win_size_max_us + echo 3 > /sys/module/msm_mpdecision/online_util_pct_min + echo 25 > /sys/module/msm_mpdecision/online_util_pct_max + echo 97 > /sys/module/msm_mpdecision/em_max_util_pct + echo 2 > /sys/module/msm_mpdecision/rq_avg_poll_ms + echo 10 > /sys/module/msm_mpdecision/mp_em_rounding_point_min + echo 85 > /sys/module/msm_mpdecision/mp_em_rounding_point_max + echo 50 > /sys/module/msm_mpdecision/iowait_threshold_pct + #set permissions for the nodes needed by display on/off hook + chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + chown -h system /sys/module/msm_mpdecision/slack_time_max_us + chown -h system /sys/module/msm_mpdecision/slack_time_min_us + chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + chmod -h 664 /sys/module/msm_mpdecision/slack_time_max_us + chmod -h 664 /sys/module/msm_mpdecision/slack_time_min_us + echo 1 > /sys/module/rmnet_usb/parameters/rmnet_data_init + # Allow QMUX daemon to assign port open wait time + chown radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait + # Wake on volume + echo 1 > /sys/keyboard/vol_wakeup ;; esac From 4fd1db38860283d66d244f059a312af7bd4f14fc Mon Sep 17 00:00:00 2001 From: David Gasaway Date: Sun, 26 Jan 2014 14:24:33 -1000 Subject: [PATCH 05/24] m7-common: code cleanup Removed some tabs, and changed 5 spaces to 4 Change-Id: I18802534269c80c2e4a9fde28b4dd5509c9f05fb --- configs/init.post_boot.sh | 286 +++++++++++++++++++------------------- 1 file changed, 143 insertions(+), 143 deletions(-) diff --git a/configs/init.post_boot.sh b/configs/init.post_boot.sh index 959b37e8..fadc6081 100644 --- a/configs/init.post_boot.sh +++ b/configs/init.post_boot.sh @@ -29,148 +29,148 @@ target=`getprop ro.board.platform` case "$target" in "msm8960") - echo 1 > /sys/module/rpm_resources/enable_low_power/L2_cache - echo 1 > /sys/module/rpm_resources/enable_low_power/pxo - echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_dig - echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_mem - echo 1 > /sys/module/pm_8x60/modes/cpu0/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/idle_enabled - echo 0 > /sys/module/msm_thermal/core_control/enabled - echo 1 > /sys/devices/system/cpu/cpu1/online - echo 1 > /sys/devices/system/cpu/cpu2/online - echo 1 > /sys/devices/system/cpu/cpu3/online - #echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - #echo "ondemand" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor - #echo "ondemand" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor - #echo "ondemand" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor - #echo 50000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - #echo 90 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold - #echo 1 > /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - #echo 4 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - #echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential - #echo 70 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core - #echo 3 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core - #echo 918000 > /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq - #echo 1026000 > /sys/devices/system/cpu/cpufreq/ondemand/sync_freq - #echo 80 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load - #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - echo "interactive" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - echo "interactive" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor - echo "interactive" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor - echo "interactive" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor - echo 40000 > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time - echo 1134000 > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq - echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay - echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/timer_rate - echo 100000 > /sys/devices/system/cpu/cpufreq/interactive/sampling_down_factor - echo 1 > /sys/devices/system/cpu/cpufreq/interactive/io_is_busy - echo 20 > /sys/module/cpu_boost/parameters/boost_ms - echo 1566000 > /sys/module/cpu_boost/parameters/sync_threshold - echo 1134000 > /sys/module/cpu_boost/parameters/input_boost_freq - echo 40 > /sys/module/cpu_boost/parameters/input_boost_ms - echo 384000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay - chown -h system /sys/devices/system/cpu/cpufreq/interactive/boost - chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse - chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration - chown -h system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load - chown -h system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq - chown -h system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy - chown -h system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time - chown -h system /sys/devices/system/cpu/cpufreq/interactive/target_loads - chown -h system /sys/devices/system/cpu/cpufreq/interactive/timer_slack - chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq - echo 1 > /sys/module/msm_thermal/core_control/enabled - echo 1 > /dev/cpuctl/apps/cpu.notify_on_migrate - chown -h root.system /sys/devices/system/cpu/mfreq - chmod -h 220 /sys/devices/system/cpu/mfreq - chown -h root.system /sys/devices/system/cpu/cpu1/online - chown -h root.system /sys/devices/system/cpu/cpu2/online - chown -h root.system /sys/devices/system/cpu/cpu3/online - chmod -h 664 /sys/devices/system/cpu/cpu1/online - chmod -h 664 /sys/devices/system/cpu/cpu2/online - chmod -h 664 /sys/devices/system/cpu/cpu3/online - # set DCVS parameters for CPU - echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us - echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu0/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu0/disable_pc_threshold - echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_max_us - echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu1/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu1/disable_pc_threshold - echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_max_us - echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu2/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu2/disable_pc_threshold - echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_max_us - echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu3/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu3/disable_pc_threshold - # set DCVS parameters for GPU - echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_max_us - echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_min_us - echo 0 > /sys/module/msm_dcvs/cores/gpu0/slack_mode_dynamic - # set msm_mpdecision parameters - echo 45000 > /sys/module/msm_mpdecision/slack_time_max_us - echo 15000 > /sys/module/msm_mpdecision/slack_time_min_us - echo 100000 > /sys/module/msm_mpdecision/em_win_size_min_us - echo 1000000 > /sys/module/msm_mpdecision/em_win_size_max_us - echo 3 > /sys/module/msm_mpdecision/online_util_pct_min - echo 25 > /sys/module/msm_mpdecision/online_util_pct_max - echo 97 > /sys/module/msm_mpdecision/em_max_util_pct - echo 2 > /sys/module/msm_mpdecision/rq_avg_poll_ms - echo 10 > /sys/module/msm_mpdecision/mp_em_rounding_point_min - echo 85 > /sys/module/msm_mpdecision/mp_em_rounding_point_max - echo 50 > /sys/module/msm_mpdecision/iowait_threshold_pct - #set permissions for the nodes needed by display on/off hook - chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us - chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us - chown -h system /sys/module/msm_mpdecision/slack_time_max_us - chown -h system /sys/module/msm_mpdecision/slack_time_min_us - chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us - chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us - chmod -h 664 /sys/module/msm_mpdecision/slack_time_max_us - chmod -h 664 /sys/module/msm_mpdecision/slack_time_min_us - echo 1 > /sys/module/rmnet_usb/parameters/rmnet_data_init - # Allow QMUX daemon to assign port open wait time - chown radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait - # Wake on volume - echo 1 > /sys/keyboard/vol_wakeup + echo 1 > /sys/module/rpm_resources/enable_low_power/L2_cache + echo 1 > /sys/module/rpm_resources/enable_low_power/pxo + echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_dig + echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_mem + echo 1 > /sys/module/pm_8x60/modes/cpu0/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/retention/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/suspend_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/idle_enabled + echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/idle_enabled + echo 0 > /sys/module/msm_thermal/core_control/enabled + echo 1 > /sys/devices/system/cpu/cpu1/online + echo 1 > /sys/devices/system/cpu/cpu2/online + echo 1 > /sys/devices/system/cpu/cpu3/online + #echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + #echo "ondemand" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor + #echo "ondemand" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor + #echo "ondemand" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor + #echo 50000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate + #echo 90 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold + #echo 1 > /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy + #echo 4 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + #echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential + #echo 70 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core + #echo 3 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core + #echo 918000 > /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq + #echo 1026000 > /sys/devices/system/cpu/cpufreq/ondemand/sync_freq + #echo 80 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load + #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate + #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy + echo "interactive" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + echo "interactive" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor + echo "interactive" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor + echo "interactive" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor + echo 40000 > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time + echo 1134000 > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq + echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay + echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/timer_rate + echo 100000 > /sys/devices/system/cpu/cpufreq/interactive/sampling_down_factor + echo 1 > /sys/devices/system/cpu/cpufreq/interactive/io_is_busy + echo 20 > /sys/module/cpu_boost/parameters/boost_ms + echo 1566000 > /sys/module/cpu_boost/parameters/sync_threshold + echo 1134000 > /sys/module/cpu_boost/parameters/input_boost_freq + echo 40 > /sys/module/cpu_boost/parameters/input_boost_ms + echo 384000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq + echo 384000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq + echo 384000 > /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq + echo 384000 > /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay + chown -h system /sys/devices/system/cpu/cpufreq/interactive/boost + chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse + chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration + chown -h system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load + chown -h system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq + chown -h system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy + chown -h system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time + chown -h system /sys/devices/system/cpu/cpufreq/interactive/target_loads + chown -h system /sys/devices/system/cpu/cpufreq/interactive/timer_slack + chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq + echo 1 > /sys/module/msm_thermal/core_control/enabled + echo 1 > /dev/cpuctl/apps/cpu.notify_on_migrate + chown -h root.system /sys/devices/system/cpu/mfreq + chmod -h 220 /sys/devices/system/cpu/mfreq + chown -h root.system /sys/devices/system/cpu/cpu1/online + chown -h root.system /sys/devices/system/cpu/cpu2/online + chown -h root.system /sys/devices/system/cpu/cpu3/online + chmod -h 664 /sys/devices/system/cpu/cpu1/online + chmod -h 664 /sys/devices/system/cpu/cpu2/online + chmod -h 664 /sys/devices/system/cpu/cpu3/online + # Set DCVS parameters for CPU + echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu0/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu0/disable_pc_threshold + echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_max_us + echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu1/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu1/disable_pc_threshold + echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_max_us + echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu2/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu2/disable_pc_threshold + echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_max_us + echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_min_us + echo 100000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_min_us + echo 500000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_max_us + echo 0 > /sys/module/msm_dcvs/cores/cpu3/slack_mode_dynamic + echo 1000000 > /sys/module/msm_dcvs/cores/cpu3/disable_pc_threshold + # Set DCVS parameters for GPU + echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_max_us + echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_min_us + echo 0 > /sys/module/msm_dcvs/cores/gpu0/slack_mode_dynamic + # Set msm_mpdecision parameters + echo 45000 > /sys/module/msm_mpdecision/slack_time_max_us + echo 15000 > /sys/module/msm_mpdecision/slack_time_min_us + echo 100000 > /sys/module/msm_mpdecision/em_win_size_min_us + echo 1000000 > /sys/module/msm_mpdecision/em_win_size_max_us + echo 3 > /sys/module/msm_mpdecision/online_util_pct_min + echo 25 > /sys/module/msm_mpdecision/online_util_pct_max + echo 97 > /sys/module/msm_mpdecision/em_max_util_pct + echo 2 > /sys/module/msm_mpdecision/rq_avg_poll_ms + echo 10 > /sys/module/msm_mpdecision/mp_em_rounding_point_min + echo 85 > /sys/module/msm_mpdecision/mp_em_rounding_point_max + echo 50 > /sys/module/msm_mpdecision/iowait_threshold_pct + # Set permissions for the nodes needed by display on/off hook + chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + chown -h system /sys/module/msm_mpdecision/slack_time_max_us + chown -h system /sys/module/msm_mpdecision/slack_time_min_us + chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + chmod -h 664 /sys/module/msm_mpdecision/slack_time_max_us + chmod -h 664 /sys/module/msm_mpdecision/slack_time_min_us + echo 1 > /sys/module/rmnet_usb/parameters/rmnet_data_init + # Allow QMUX daemon to assign port open wait time + chown radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait + # Wake on volume + echo 1 > /sys/keyboard/vol_wakeup ;; esac From 3922625377198cc2374990a4551c00efc6c8f66c Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Tue, 28 Jan 2014 08:29:46 -0600 Subject: [PATCH 06/24] m7-common: ignore firmware partitions in recovery This removes /firmware/mdm and /firmware/q6 from the listed partitions in the Mounts and Storage menu. Change-Id: I7154018b6238d6e17bdabb02ce9b4e4225595b15 --- m7-common.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m7-common.mk b/m7-common.mk index aa2497ef..1a0393fc 100644 --- a/m7-common.mk +++ b/m7-common.mk @@ -170,6 +170,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.gps.qmienabled=true \ ro.baseband.arch=mdm \ ro.cam.hw.version=m7 \ + ro.cwm.forbid_format="/firmware/mdm,/firmware/q6" \ + ro.cwm.forbid_mount="/firmware/mdm,/firmware/q6" \ ro.opengles.version=196608 \ ro.telephony.call_ring.multiple=false \ ro.telephony.call_ring.delay=3000 \ From 86edb0644f0b433ad1c1378681f3a6ec1b9f09d0 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Tue, 28 Jan 2014 01:43:50 -0800 Subject: [PATCH 07/24] m7: Fix remote submix sample rate * Avoid mismatch between source and sink. Change-Id: I1ec9b7a723e21ccad7bbd8d23d794d099d8afc38 --- configs/audio_policy.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/audio_policy.conf b/configs/audio_policy.conf index 2616a7b1..eed3d13d 100644 --- a/configs/audio_policy.conf +++ b/configs/audio_policy.conf @@ -83,7 +83,7 @@ audio_hw_modules { r_submix { outputs { submix { - sampling_rates 44100|48000 + sampling_rates 48000 channel_masks AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_16_BIT devices AUDIO_DEVICE_OUT_REMOTE_SUBMIX @@ -91,7 +91,7 @@ audio_hw_modules { } inputs { submix { - sampling_rates 44100|48000 + sampling_rates 48000 channel_masks AUDIO_CHANNEL_IN_STEREO formats AUDIO_FORMAT_PCM_16_BIT devices AUDIO_DEVICE_IN_REMOTE_SUBMIX From 448f1e246b51905bbbf1e8374e280311945b0945 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Fri, 31 Jan 2014 11:55:35 -0800 Subject: [PATCH 08/24] m7-common: Remove HCE Change-Id: I81151a7073db5d4fdb799c4414ae0b1d39886ec8 --- m7-common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/m7-common.mk b/m7-common.mk index 1a0393fc..c9715ba7 100644 --- a/m7-common.mk +++ b/m7-common.mk @@ -142,7 +142,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \ frameworks/native/data/etc/android.hardware.consumerir.xml:system/etc/permissions/android.hardware.consumerir.xml \ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ - frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \ frameworks/base/nfc-extras/com.android.nfc_extras.xml:system/etc/permissions/com.android.nfc_extras.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.wifi.direct.xml:system/etc/permissions/android.hardware.wifi.direct.xml From 8fe5a8383f3e0d4a78e53ff388741156b362b1bf Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sat, 1 Feb 2014 21:59:42 -0800 Subject: [PATCH 09/24] m7-common: switch back to ondemand Change-Id: I0465bd8a36214a0faeab1c1088d7bf791550be82 --- configs/init.post_boot.sh | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/configs/init.post_boot.sh b/configs/init.post_boot.sh index fadc6081..e84941bb 100644 --- a/configs/init.post_boot.sh +++ b/configs/init.post_boot.sh @@ -54,27 +54,27 @@ case "$target" in echo 1 > /sys/devices/system/cpu/cpu1/online echo 1 > /sys/devices/system/cpu/cpu2/online echo 1 > /sys/devices/system/cpu/cpu3/online - #echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - #echo "ondemand" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor - #echo "ondemand" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor - #echo "ondemand" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor - #echo 50000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - #echo 90 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold - #echo 1 > /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - #echo 4 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - #echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential - #echo 70 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core - #echo 3 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core - #echo 918000 > /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq - #echo 1026000 > /sys/devices/system/cpu/cpufreq/ondemand/sync_freq - #echo 80 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load - #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - #chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - echo "interactive" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - echo "interactive" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor - echo "interactive" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor - echo "interactive" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor + echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + echo "ondemand" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor + echo "ondemand" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor + echo "ondemand" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor + echo 50000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate + echo 90 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold + echo 1 > /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy + echo 4 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential + echo 70 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core + echo 3 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core + echo 918000 > /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq + echo 1026000 > /sys/devices/system/cpu/cpufreq/ondemand/sync_freq + echo 80 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load + chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate + chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy + #echo "interactive" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor + #echo "interactive" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor + #echo "interactive" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor + #echo "interactive" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor echo 40000 > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time echo 1134000 > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay From 9553be6ba702a1d1bd6fe2ba77b54cf692bc04f5 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sat, 8 Feb 2014 12:36:44 -0800 Subject: [PATCH 10/24] m7-common: Move post-boot functionality into init Change-Id: Ic089092b20708f0004076f7c86a92b37baaa296f --- configs/init.post_boot.sh | 176 -------------------------------------- m7-common.mk | 4 - rootdir/etc/init.qcom.rc | 137 +++++++++++++++++++++++++++-- 3 files changed, 130 insertions(+), 187 deletions(-) delete mode 100644 configs/init.post_boot.sh diff --git a/configs/init.post_boot.sh b/configs/init.post_boot.sh deleted file mode 100644 index e84941bb..00000000 --- a/configs/init.post_boot.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/system/bin/sh -# Copyright (c) 2009-2012, 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. -# - -target=`getprop ro.board.platform` -case "$target" in - "msm8960") - echo 1 > /sys/module/rpm_resources/enable_low_power/L2_cache - echo 1 > /sys/module/rpm_resources/enable_low_power/pxo - echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_dig - echo 1 > /sys/module/rpm_resources/enable_low_power/vdd_mem - echo 1 > /sys/module/pm_8x60/modes/cpu0/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/retention/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/suspend_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/idle_enabled - echo 1 > /sys/module/pm_8x60/modes/cpu0/power_collapse/idle_enabled - echo 0 > /sys/module/msm_thermal/core_control/enabled - echo 1 > /sys/devices/system/cpu/cpu1/online - echo 1 > /sys/devices/system/cpu/cpu2/online - echo 1 > /sys/devices/system/cpu/cpu3/online - echo "ondemand" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - echo "ondemand" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor - echo "ondemand" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor - echo "ondemand" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor - echo 50000 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - echo 90 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold - echo 1 > /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - echo 4 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential - echo 70 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core - echo 3 > /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core - echo 918000 > /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq - echo 1026000 > /sys/devices/system/cpu/cpufreq/ondemand/sync_freq - echo 80 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load - chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate - chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor - chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy - #echo "interactive" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - #echo "interactive" > /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor - #echo "interactive" > /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor - #echo "interactive" > /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor - echo 40000 > /sys/devices/system/cpu/cpufreq/interactive/min_sample_time - echo 1134000 > /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq - echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay - echo 30000 > /sys/devices/system/cpu/cpufreq/interactive/timer_rate - echo 100000 > /sys/devices/system/cpu/cpufreq/interactive/sampling_down_factor - echo 1 > /sys/devices/system/cpu/cpufreq/interactive/io_is_busy - echo 20 > /sys/module/cpu_boost/parameters/boost_ms - echo 1566000 > /sys/module/cpu_boost/parameters/sync_threshold - echo 1134000 > /sys/module/cpu_boost/parameters/input_boost_freq - echo 40 > /sys/module/cpu_boost/parameters/input_boost_ms - echo 384000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq - echo 384000 > /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpufreq/interactive/above_hispeed_delay - chown -h system /sys/devices/system/cpu/cpufreq/interactive/boost - chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse - chown -h system /sys/devices/system/cpu/cpufreq/interactive/boostpulse_duration - chown -h system /sys/devices/system/cpu/cpufreq/interactive/go_hispeed_load - chown -h system /sys/devices/system/cpu/cpufreq/interactive/hispeed_freq - chown -h system /sys/devices/system/cpu/cpufreq/interactive/io_is_busy - chown -h system /sys/devices/system/cpu/cpufreq/interactive/min_sample_time - chown -h system /sys/devices/system/cpu/cpufreq/interactive/target_loads - chown -h system /sys/devices/system/cpu/cpufreq/interactive/timer_slack - chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq - chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq - chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq - echo 1 > /sys/module/msm_thermal/core_control/enabled - echo 1 > /dev/cpuctl/apps/cpu.notify_on_migrate - chown -h root.system /sys/devices/system/cpu/mfreq - chmod -h 220 /sys/devices/system/cpu/mfreq - chown -h root.system /sys/devices/system/cpu/cpu1/online - chown -h root.system /sys/devices/system/cpu/cpu2/online - chown -h root.system /sys/devices/system/cpu/cpu3/online - chmod -h 664 /sys/devices/system/cpu/cpu1/online - chmod -h 664 /sys/devices/system/cpu/cpu2/online - chmod -h 664 /sys/devices/system/cpu/cpu3/online - # Set DCVS parameters for CPU - echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us - echo 40000 > /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu0/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu0/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu0/disable_pc_threshold - echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_max_us - echo 25000 > /sys/module/msm_dcvs/cores/cpu1/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu1/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu1/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu1/disable_pc_threshold - echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_max_us - echo 25000 > /sys/module/msm_dcvs/cores/cpu2/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu2/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu2/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu2/disable_pc_threshold - echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_max_us - echo 25000 > /sys/module/msm_dcvs/cores/cpu3/slack_time_min_us - echo 100000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_min_us - echo 500000 > /sys/module/msm_dcvs/cores/cpu3/em_win_size_max_us - echo 0 > /sys/module/msm_dcvs/cores/cpu3/slack_mode_dynamic - echo 1000000 > /sys/module/msm_dcvs/cores/cpu3/disable_pc_threshold - # Set DCVS parameters for GPU - echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_max_us - echo 20000 > /sys/module/msm_dcvs/cores/gpu0/slack_time_min_us - echo 0 > /sys/module/msm_dcvs/cores/gpu0/slack_mode_dynamic - # Set msm_mpdecision parameters - echo 45000 > /sys/module/msm_mpdecision/slack_time_max_us - echo 15000 > /sys/module/msm_mpdecision/slack_time_min_us - echo 100000 > /sys/module/msm_mpdecision/em_win_size_min_us - echo 1000000 > /sys/module/msm_mpdecision/em_win_size_max_us - echo 3 > /sys/module/msm_mpdecision/online_util_pct_min - echo 25 > /sys/module/msm_mpdecision/online_util_pct_max - echo 97 > /sys/module/msm_mpdecision/em_max_util_pct - echo 2 > /sys/module/msm_mpdecision/rq_avg_poll_ms - echo 10 > /sys/module/msm_mpdecision/mp_em_rounding_point_min - echo 85 > /sys/module/msm_mpdecision/mp_em_rounding_point_max - echo 50 > /sys/module/msm_mpdecision/iowait_threshold_pct - # Set permissions for the nodes needed by display on/off hook - chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us - chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us - chown -h system /sys/module/msm_mpdecision/slack_time_max_us - chown -h system /sys/module/msm_mpdecision/slack_time_min_us - chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us - chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us - chmod -h 664 /sys/module/msm_mpdecision/slack_time_max_us - chmod -h 664 /sys/module/msm_mpdecision/slack_time_min_us - echo 1 > /sys/module/rmnet_usb/parameters/rmnet_data_init - # Allow QMUX daemon to assign port open wait time - chown radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait - # Wake on volume - echo 1 > /sys/keyboard/vol_wakeup - ;; -esac diff --git a/m7-common.mk b/m7-common.mk index c9715ba7..4f371b85 100644 --- a/m7-common.mk +++ b/m7-common.mk @@ -32,10 +32,6 @@ PRODUCT_PACKAGES += \ init.target.rc \ ueventd.qcom.rc -# Post boot service -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/init.post_boot.sh:system/etc/init.post_boot.sh - # Recovery PRODUCT_PACKAGES += \ lpm.rc \ diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 904d6e85..3f94a2ea 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -347,11 +347,7 @@ service netmgrd /system/bin/netmgrd service mpdecision /system/bin/mpdecision --no_sleep --avg_comp class main user root - -service post-boot /system/bin/sh /system/etc/init.post_boot.sh - user root disabled - oneshot service qcamerasvr /system/bin/mm-qcamera-daemon class late_start @@ -453,9 +449,10 @@ service iprenew_bt-pan /system/bin/dhcpcd -n # Property triggers begin here on property:init.svc.bootanim=stopped - start post-boot - stop thermald_boot - start thermald + # Allow QMUX daemon to assign port open wait time + chown radio.radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait + # Init modem + write /sys/module/rmnet_usb/parameters/rmnet_data_init 1 on property:init.svc.wpa_supplicant=stopped stop dhcpcd @@ -464,3 +461,129 @@ on property:service.adb.root=1 write /sys/class/android_usb/android0/enable 0 restart adbd write /sys/class/android_usb/android0/enable 1 + +on property:sys.boot_completed=1 + # Set up power modes + write /sys/module/rpm_resources/enable_low_power/L2_cache 1 + write /sys/module/rpm_resources/enable_low_power/pxo 1 + write /sys/module/rpm_resources/enable_low_power/vdd_dig 1 + write /sys/module/rpm_resources/enable_low_power/vdd_mem 1 + write /sys/module/pm_8x60/modes/cpu0/retention/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu1/retention/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu2/retention/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu3/retention/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu0/power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu1/power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu2/power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu3/power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/suspend_enabled 1 + write /sys/module/pm_8x60/modes/cpu0/standalone_power_collapse/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu1/standalone_power_collapse/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu2/standalone_power_collapse/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu3/standalone_power_collapse/idle_enabled 1 + write /sys/module/pm_8x60/modes/cpu0/power_collapse/idle_enabled 1 + write /sys/module/msm_thermal/core_control/enabled 0 + write /sys/devices/system/cpu/cpu1/online 1 + write /sys/devices/system/cpu/cpu2/online 1 + write /sys/devices/system/cpu/cpu3/online 1 + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate 50000 + write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold 90 + write /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy 1 + write /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor 4 + write /sys/devices/system/cpu/cpufreq/ondemand/down_differential 10 + write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core 70 + write /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core 3 + write /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq 918000 + write /sys/devices/system/cpu/cpufreq/ondemand/sync_freq 1026000 + write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load 80 + chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate + chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor + chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy + write /sys/module/cpu_boost/parameters/boost_ms 20 + write /sys/module/cpu_boost/parameters/sync_threshold 1566000 + write /sys/module/cpu_boost/parameters/input_boost_freq 1134000 + write /sys/module/cpu_boost/parameters/input_boost_ms 40 + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq 384000 + write /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq 384000 + write /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq 384000 + write /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq 384000 + chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu1/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu2/cpufreq/scaling_min_freq + chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_max_freq + chown -h system /sys/devices/system/cpu/cpu3/cpufreq/scaling_min_freq + write /sys/module/msm_thermal/core_control/enabled 1 + write /dev/cpuctl/apps/cpu.notify_on_migrate 1 + chown -h root.system /sys/devices/system/cpu/mfreq + chmod -h 220 /sys/devices/system/cpu/mfreq + chown -h root.system /sys/devices/system/cpu/cpu1/online + chown -h root.system /sys/devices/system/cpu/cpu2/online + chown -h root.system /sys/devices/system/cpu/cpu3/online + chmod -h 664 /sys/devices/system/cpu/cpu1/online + chmod -h 664 /sys/devices/system/cpu/cpu2/online + chmod -h 664 /sys/devices/system/cpu/cpu3/online + # Set DCVS parameters for CPU + write /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us 40000 + write /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us 40000 + write /sys/module/msm_dcvs/cores/cpu0/em_win_size_min_us 100000 + write /sys/module/msm_dcvs/cores/cpu0/em_win_size_max_us 500000 + write /sys/module/msm_dcvs/cores/cpu0/slack_mode_dynamic 0 + write /sys/module/msm_dcvs/cores/cpu0/disable_pc_threshold 1000000 + write /sys/module/msm_dcvs/cores/cpu1/slack_time_max_us 25000 + write /sys/module/msm_dcvs/cores/cpu1/slack_time_min_us 25000 + write /sys/module/msm_dcvs/cores/cpu1/em_win_size_min_us 100000 + write /sys/module/msm_dcvs/cores/cpu1/em_win_size_max_us 500000 + write /sys/module/msm_dcvs/cores/cpu1/slack_mode_dynamic 0 + write /sys/module/msm_dcvs/cores/cpu1/disable_pc_threshold 1000000 + write /sys/module/msm_dcvs/cores/cpu2/slack_time_max_us 25000 + write /sys/module/msm_dcvs/cores/cpu2/slack_time_min_us 25000 + write /sys/module/msm_dcvs/cores/cpu2/em_win_size_min_us 100000 + write /sys/module/msm_dcvs/cores/cpu2/em_win_size_max_us 500000 + write /sys/module/msm_dcvs/cores/cpu2/slack_mode_dynamic 0 + write /sys/module/msm_dcvs/cores/cpu2/disable_pc_threshold 1000000 + write /sys/module/msm_dcvs/cores/cpu3/slack_time_max_us 25000 + write /sys/module/msm_dcvs/cores/cpu3/slack_time_min_us 25000 + write /sys/module/msm_dcvs/cores/cpu3/em_win_size_min_us 100000 + write /sys/module/msm_dcvs/cores/cpu3/em_win_size_max_us 500000 + write /sys/module/msm_dcvs/cores/cpu3/slack_mode_dynamic 0 + write /sys/module/msm_dcvs/cores/cpu3/disable_pc_threshold 1000000 + # Set DCVS parameters for GPU + write /sys/module/msm_dcvs/cores/gpu0/slack_time_max_us 20000 + write /sys/module/msm_dcvs/cores/gpu0/slack_time_min_us 20000 + write /sys/module/msm_dcvs/cores/gpu0/slack_mode_dynamic 0 + # Set msm_mpdecision parameters + write /sys/module/msm_mpdecision/slack_time_max_us 45000 + write /sys/module/msm_mpdecision/slack_time_min_us 15000 + write /sys/module/msm_mpdecision/em_win_size_min_us 100000 + write /sys/module/msm_mpdecision/em_win_size_max_us 1000000 + write /sys/module/msm_mpdecision/online_util_pct_min 3 + write /sys/module/msm_mpdecision/online_util_pct_max 25 + write /sys/module/msm_mpdecision/em_max_util_pct 97 + write /sys/module/msm_mpdecision/rq_avg_poll_ms 2 + write /sys/module/msm_mpdecision/mp_em_rounding_point_min 10 + write /sys/module/msm_mpdecision/mp_em_rounding_point_max 85 + write /sys/module/msm_mpdecision/iowait_threshold_pct 50 + # Set permissions for the nodes needed by display on/off hook + chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + chown -h system /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + chown -h system /sys/module/msm_mpdecision/slack_time_max_us + chown -h system /sys/module/msm_mpdecision/slack_time_min_us + chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_max_us + chmod -h 664 /sys/module/msm_dcvs/cores/cpu0/slack_time_min_us + chmod -h 664 /sys/module/msm_mpdecision/slack_time_max_us + chmod -h 664 /sys/module/msm_mpdecision/slack_time_min_us + # Wake on volume + write /sys/keyboard/vol_wakeup 1 + # Enable mpdecision + start mpdecision + start thermald From 9670d03fec997157c8060cfab101daa049de6e21 Mon Sep 17 00:00:00 2001 From: Randall Rushing Date: Fri, 14 Feb 2014 01:30:53 -0800 Subject: [PATCH 11/24] Fix USB tether Change-Id: I10b19d4fb86fe477655af369726bc26ba301c0f4 --- overlay/frameworks/base/core/res/res/values/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index e4024941..b9fa3510 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -56,7 +56,7 @@ USB interfaces. If the device doesn't want to support tething over USB this should be empty. An example would be "usb.*" --> - "rndis\\d" + "usb\\d" 3 + + sys.perf.profile + 1 + diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 3f94a2ea..f4bf7bc2 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -489,20 +489,6 @@ on property:sys.boot_completed=1 write /sys/devices/system/cpu/cpu1/online 1 write /sys/devices/system/cpu/cpu2/online 1 write /sys/devices/system/cpu/cpu3/online 1 - write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "ondemand" - write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor "ondemand" - write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor "ondemand" - write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor "ondemand" - write /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate 50000 - write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold 90 - write /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy 1 - write /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor 4 - write /sys/devices/system/cpu/cpufreq/ondemand/down_differential 10 - write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core 70 - write /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core 3 - write /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq 918000 - write /sys/devices/system/cpu/cpufreq/ondemand/sync_freq 1026000 - write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load 80 chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate chown -h system /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor chown -h system /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy @@ -584,6 +570,49 @@ on property:sys.boot_completed=1 chmod -h 664 /sys/module/msm_mpdecision/slack_time_min_us # Wake on volume write /sys/keyboard/vol_wakeup 1 - # Enable mpdecision - start mpdecision + # Set performance profile + setprop sys.perf.profile 1 start thermald + +# CM Performance Profiles + +# Powersave +on property:sys.perf.profile=0 + start mpdecision + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "conservative" + write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor "conservative" + write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor "conservative" + write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor "conservative" + write /sys/class/kgsl/kgsl-3d0/pwrscale/trustzone/governor "ondemand" + +# Balanced +on property:sys.perf.profile=1 + start mpdecision + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor "ondemand" + write /sys/devices/system/cpu/cpufreq/ondemand/sampling_rate 50000 + write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold 90 + write /sys/devices/system/cpu/cpufreq/ondemand/io_is_busy 1 + write /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor 4 + write /sys/devices/system/cpu/cpufreq/ondemand/down_differential 10 + write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_multi_core 70 + write /sys/devices/system/cpu/cpufreq/ondemand/down_differential_multi_core 3 + write /sys/devices/system/cpu/cpufreq/ondemand/optimal_freq 918000 + write /sys/devices/system/cpu/cpufreq/ondemand/sync_freq 1026000 + write /sys/devices/system/cpu/cpufreq/ondemand/up_threshold_any_cpu_load 80 + write /sys/class/kgsl/kgsl-3d0/pwrscale/trustzone/governor "ondemand" + +# Performance +on property:sys.perf.profile=2 + stop mpdecision + write /sys/devices/system/cpu/cpu0/online 1 + write /sys/devices/system/cpu/cpu1/online 1 + write /sys/devices/system/cpu/cpu2/online 1 + write /sys/devices/system/cpu/cpu3/online 1 + write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor "performance" + write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor "performance" + write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor "performance" + write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor "performance" + write /sys/class/kgsl/kgsl-3d0/pwrscale/trustzone/governor "performance" From f4c6bbd80f3502f37c95bc18765f9ee7661dbe2e Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Thu, 27 Feb 2014 11:27:54 -0600 Subject: [PATCH 14/24] m7-common: update wifi.active power profile Fix wifi.active power consumption value. This addresses CYAN-3560. Change-Id: I0ad54f21e8b2bfa0402cf600cba7aeea8619ed28 --- overlay/frameworks/base/core/res/res/xml/power_profile.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 7519de39..a2e9ed5e 100644 --- a/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -33,7 +33,7 @@ 0.5 0 1 - 74000 + 74 15 3 11 @@ -79,4 +79,4 @@ 42 45 - \ No newline at end of file + From a498ed58b796ad6d7da8712fdab6b807e6117429 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Thu, 6 Mar 2014 01:22:01 -0600 Subject: [PATCH 15/24] m7-common: update mms overlays frameworks/base - default config.xml: - Remove content disposition override which should be limited to Sprint. mcc311/mnc480: - Remove overlays which duplicate the default configuration. - Remove overrides for defaultMMSMessagesPerThread and defaultSMSMessagesPerThread. mcc310mnc120: - Remove overlays which duplicate the default configuration. - Remove overrides for defaultMMSMessagesPerThread and defaultSMSMessagesPerThread. - Remove enableSprintVVM which seems to no longer be used. Change-Id: I6d8f089856c377b40752019f751cbd5cd64344d3 --- .../base/core/res/res/values/config.xml | 4 -- .../Mms/res/xml-mcc310-mnc120/mms_config.xml | 41 ------------------ .../Mms/res/xml-mcc311-mnc480/mms_config.xml | 43 ------------------- 3 files changed, 88 deletions(-) diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 2a621338..e1aa5216 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -236,10 +236,6 @@ true - - false - - - - - true - - - 307200 - 1000 1296 - - 500 - - - 50 - - - 10 - - - 5000 - EVO http://device.sprintpcs.com/HTC/APX325CKT/1136511.rdf - - -1 - 4 @@ -72,12 +39,4 @@ version 4 - added sms to mms text threshold. true - - - -1 - - - true - diff --git a/overlay/packages/apps/Mms/res/xml-mcc311-mnc480/mms_config.xml b/overlay/packages/apps/Mms/res/xml-mcc311-mnc480/mms_config.xml index aee14b16..59ada6c5 100644 --- a/overlay/packages/apps/Mms/res/xml-mcc311-mnc480/mms_config.xml +++ b/overlay/packages/apps/Mms/res/xml-mcc311-mnc480/mms_config.xml @@ -14,63 +14,20 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - true - - - 307200 - 1000 1296 - - 500 - - - 50 - - - 10 - - - 5000 - HTC6500LVW http://uaprof.vtext.com/pcd/adr6500/adr6500.xml - - -1 - 4 - - - true - - - -1 - From 934d60f01cd6ee40740d3e6369001a4c19cd4087 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sun, 9 Mar 2014 18:47:26 -0700 Subject: [PATCH 16/24] m7-common: Remove deprecated bnep services Change-Id: I43e305b2d82b7c699a7207ede084037cf5f7a5f1 --- rootdir/etc/init.qcom.rc | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index f4bf7bc2..ed4b264b 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -417,26 +417,6 @@ service iprenew_p2p /system/bin/dhcpcd -n disabled oneshot -service dhcpcd_bnep0 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep1 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep2 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep3 /system/bin/dhcpcd -BKLG - disabled - oneshot - -service dhcpcd_bnep4 /system/bin/dhcpcd -BKLG - disabled - oneshot - service dhcpcd_bt-pan /system/bin/dhcpcd -BKLG disabled oneshot From d16c8bb3732ba4490023d77a6860fc4ed4f51a53 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Wed, 5 Mar 2014 23:09:33 -0600 Subject: [PATCH 17/24] m7-common: overlay vzw-specific eri.xml The mcc/mnc specific config.xml in values-xxx and xml-xxx were apparently copied from Sprint. I see no reason they sould have been included in the first place. This is re-affirmed by decompiling the frameworks apks from stock. Include more mcc/mnc eri overlays to correct the R(oaming) symbol in 3G. Change-Id: I2b279cb03c28b7c2a580440a7456dee113338d3c --- .../res/res/values-mcc311-mnc480/config.xml | 63 ------- .../core/res/res/xml-mcc310-mnc00/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc002/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc003/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc004/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc005/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc006/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc012/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc480/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc481/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc483/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc486/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc489/eri.xml | 44 +++++ .../core/res/res/xml-mcc310-mnc99/eri.xml | 44 +++++ .../core/res/res/xml-mcc311-mnc480/config.xml | 52 ------ .../core/res/res/xml-mcc311-mnc480/eri.xml | 171 +++--------------- .../core/res/res/xml-mcc311-mnc482/eri.xml | 44 +++++ .../core/res/res/xml-mcc311-mnc485/eri.xml | 44 +++++ 18 files changed, 684 insertions(+), 262 deletions(-) delete mode 100644 overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc00/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc002/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc003/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc004/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc005/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc006/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc012/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc480/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc481/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc483/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc486/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc489/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc310-mnc99/eri.xml delete mode 100644 overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/config.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc311-mnc482/eri.xml create mode 100644 overlay/frameworks/base/core/res/res/xml-mcc311-mnc485/eri.xml diff --git a/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml b/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml deleted file mode 100644 index dacd31a5..00000000 --- a/overlay/frameworks/base/core/res/res/values-mcc311-mnc480/config.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - 1 - 4 - 7 - 9 - - - - true - - - true - - - true - - - 6 - - - 4 - - - 51200 - diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc00/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc00/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc00/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc002/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc002/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc002/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc003/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc003/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc003/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc004/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc004/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc004/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc005/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc005/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc005/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc006/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc006/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc006/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc012/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc012/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc012/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc480/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc480/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc480/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc481/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc481/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc481/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc483/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc483/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc483/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc486/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc486/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc486/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc489/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc489/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc489/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc310-mnc99/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc99/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc310-mnc99/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/config.xml b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/config.xml deleted file mode 100644 index 4b0c7e4b..00000000 --- a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/config.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - "wifi,1,1,1,-1,true" - "mobile,0,0,0,-1,true" - "mobile_mms,2,0,2,60000,true" - "mobile_supl,3,0,2,60000,true" - "mobile_dun,4,0,3,60000,true" - "mobile_hipri,5,0,3,60000,true" - "mobile_bluetooth,7,7,1,-1,true" - "mobile_fota,10,0,2,60000,true" - "mobile_ims,11,0,2,-1,true" - "mobile_cbs,12,0,2,60000,true" - "wifi_p2p,13,1,0,-1,true" - - - - - - - - - "default" - "dun" - "mms" - "supl" - - diff --git a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml index 3ad248b1..f7ad05d5 100644 --- a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml +++ b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc480/eri.xml @@ -18,150 +18,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc482/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc482/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc482/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/overlay/frameworks/base/core/res/res/xml-mcc311-mnc485/eri.xml b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc485/eri.xml new file mode 100644 index 00000000..f7ad05d5 --- /dev/null +++ b/overlay/frameworks/base/core/res/res/xml-mcc311-mnc485/eri.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f77d6ca6cee4b950010a2b555788f128e6b80315 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Thu, 13 Mar 2014 11:39:37 -0700 Subject: [PATCH 18/24] m7-common: Update media_profiles for HFR attributes Change-Id: I8c3c4f867c03707696d39504a1d222f17ff52003 --- configs/media_profiles.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml index 5fd59cc8..64ba247c 100644 --- a/configs/media_profiles.xml +++ b/configs/media_profiles.xml @@ -55,6 +55,9 @@ + + + @@ -367,19 +370,25 @@ minBitRate="64000" maxBitRate="20000000" minFrameWidth="176" maxFrameWidth="1920" minFrameHeight="144" maxFrameHeight="1088" - minFrameRate="15" maxFrameRate="30" /> + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="720" maxHFRFrameHeight="480" + maxHFRMode="120" /> + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="0" maxHFRFrameHeight="0" + maxHFRMode="0" /> + minFrameRate="15" maxFrameRate="30" + maxHFRFrameWidth="0" maxHFRFrameHeight="0" + maxHFRMode="0" /> Date: Thu, 13 Mar 2014 19:33:49 +0000 Subject: [PATCH 19/24] Revert "m7-common: Update media_profiles for HFR attributes" * This shouldn't be mandatory. This reverts commit f77d6ca6cee4b950010a2b555788f128e6b80315. Change-Id: I8a9d2ca01be176b08976d19eb8ec3932d9a05551 --- configs/media_profiles.xml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml index 64ba247c..5fd59cc8 100644 --- a/configs/media_profiles.xml +++ b/configs/media_profiles.xml @@ -55,9 +55,6 @@ - - - @@ -370,25 +367,19 @@ minBitRate="64000" maxBitRate="20000000" minFrameWidth="176" maxFrameWidth="1920" minFrameHeight="144" maxFrameHeight="1088" - minFrameRate="15" maxFrameRate="30" - maxHFRFrameWidth="720" maxHFRFrameHeight="480" - maxHFRMode="120" /> + minFrameRate="15" maxFrameRate="30" /> + minFrameRate="15" maxFrameRate="30" /> + minFrameRate="15" maxFrameRate="30" /> Date: Thu, 13 Mar 2014 19:42:09 -0700 Subject: [PATCH 20/24] m7-common: Disable input filtering * These devices don't need it, and it reduces latency Change-Id: I6a342f1d52c78f213a517fa5e6951000e9742322 --- m7-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/m7-common.mk b/m7-common.mk index 4f371b85..428a8302 100644 --- a/m7-common.mk +++ b/m7-common.mk @@ -167,6 +167,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.cam.hw.version=m7 \ ro.cwm.forbid_format="/firmware/mdm,/firmware/q6" \ ro.cwm.forbid_mount="/firmware/mdm,/firmware/q6" \ + ro.input.noresample=1 \ ro.opengles.version=196608 \ ro.telephony.call_ring.multiple=false \ ro.telephony.call_ring.delay=3000 \ From ca0f1786e898063615ec88397b1bbb021a3628af Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sat, 15 Mar 2014 12:16:30 -0700 Subject: [PATCH 21/24] m7-common: Move cm.dependencies to common Change-Id: I4f31bcdaae6d6da81a2db3d425eb4aa0f61ddf6d --- cm.dependencies | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 cm.dependencies diff --git a/cm.dependencies b/cm.dependencies new file mode 100644 index 00000000..d662c053 --- /dev/null +++ b/cm.dependencies @@ -0,0 +1,10 @@ +[ + { + "repository": "android_device_htc_msm8960-common", + "target_path": "device/htc/msm8960-common" + }, + { + "repository": "android_kernel_htc_msm8960", + "target_path": "kernel/htc/msm8960" + } +] From fdd80a639083abc7efb1097c4918d3a17048d3f2 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 12 Mar 2014 23:11:02 -0700 Subject: [PATCH 22/24] m7-common: Switch to DMIC Endfire for Speaker DMIC Endfire * This is supposed to use DMIC4 on stock, but that appears to be horrible. Use DMIC Endfire setup instead. Change-Id: Id4e583f58cee6bd8fcb1e1815f5c6b1e3664809f --- dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 index 4ee3f138..515a7782 100644 --- a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 +++ b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 @@ -1698,21 +1698,29 @@ SectionDevice Name "Speaker DMIC Endfire" EnableSequence - 'SLIM_0_TX Channels':0:One - 'SLIM TX7 MUX':0:DEC9 + 'SLIM_0_TX Channels':0:Two + 'SLIM TX7 MUX':0:DEC8 + 'DEC8 MUX':0:DMIC2 + 'DEC8 Volume':2:57 + 'SLIM TX8 MUX':0:DEC9 'DEC9 MUX':0:DMIC4 - 'DEC9 Volume':2:5C + 'DEC9 Volume':2:57 + 'MICBIAS1 CAPLESS Switch':1:0 'MICBIAS3 CAPLESS Switch':1:0 EndSequence DisableSequence 'SLIM TX7 MUX':0:ZERO + 'SLIM TX8 MUX':0:ZERO + 'DEC8 MUX':0:ZERO 'DEC9 MUX':0:ZERO + 'DEC8 Volume':2:0 'DEC9 Volume':2:0 + 'MICBIAS1 CAPLESS Switch':1:0 'MICBIAS3 CAPLESS Switch':1:0 EndSequence - ACDBID 52:2 + ACDBID 51:2 EndSection SectionDevice From ab540f8bd453ac97c20574eb10d913377ab1b601 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Wed, 12 Mar 2014 23:11:24 -0700 Subject: [PATCH 23/24] m7-common: Use dual mic for Speaker DMIC Stereo Change-Id: Ia269ba5df1b8cc3476d6f17c076ca5c0cb03d8b1 --- dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 index 515a7782..90b8763b 100644 --- a/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 +++ b/dsp/snd_soc_msm/snd_soc_msm_2x_Fusion3 @@ -1727,21 +1727,28 @@ SectionDevice Name "Speaker DMIC Stereo" EnableSequence - 'SLIM_0_TX Channels':0:One - 'SLIM TX7 MUX':0:DEC9 + 'SLIM_0_TX Channels':0:Two + 'SLIM TX7 MUX':0:DEC8 + 'DEC8 MUX':0:DMIC2 + 'DEC8 Volume':2:57 + 'SLIM TX8 MUX':0:DEC9 'DEC9 MUX':0:DMIC4 - 'DEC9 Volume':2:5C + 'DEC9 Volume':2:57 + 'MICBIAS1 CAPLESS Switch':1:0 'MICBIAS3 CAPLESS Switch':1:0 EndSequence DisableSequence 'SLIM TX7 MUX':0:ZERO + 'DEC8 MUX':0:ZERO + 'DEC9 MUX':0:ZERO 'DEC9 MUX':0:ZERO 'DEC9 Volume':2:0 + 'MICBIAS1 CAPLESS Switch':1:0 'MICBIAS3 CAPLESS Switch':1:0 EndSequence - ACDBID 35:2 + ACDBID 51:2 EndSection SectionDevice From ddadb66e0a71587af58489372aaf6e9dff4df295 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Fri, 21 Mar 2014 15:14:39 -0500 Subject: [PATCH 24/24] m7-common: show cdma auto mode on m7vzw ... when global roaming. Change-Id: I28dd2cef4a18ebf4a4d191ef2c21fd1c017fd4c0 --- .../services/Telephony/res/values-mcc311-mnc480/config.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/overlay/packages/services/Telephony/res/values-mcc311-mnc480/config.xml b/overlay/packages/services/Telephony/res/values-mcc311-mnc480/config.xml index 4f5d2f1c..4e74623d 100644 --- a/overlay/packages/services/Telephony/res/values-mcc311-mnc480/config.xml +++ b/overlay/packages/services/Telephony/res/values-mcc311-mnc480/config.xml @@ -19,4 +19,7 @@ true + + + true