From 6934540e44995c667d409ebc8d80acfb6c8c141d Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 30 Apr 2024 17:56:54 +0800 Subject: [PATCH 1/5] audio: remove non-supported analog headset Bug: 329470379 Change-Id: I989160063611b0572714678103e870a480783766 Signed-off-by: vincenttew --- .../audio_policy_configuration_a2dp_offload_disabled.xml | 6 ------ .../audio_policy_configuration_bluetooth_legacy_hal.xml | 6 ------ .../audio_policy_configuration_le_offload_disabled.xml | 6 ------ 3 files changed, 18 deletions(-) diff --git a/audio/comet/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/comet/config/audio_policy_configuration_a2dp_offload_disabled.xml index 6fa1bed..552618c 100644 --- a/audio/comet/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/comet/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -134,10 +134,6 @@ - - - - @@ -157,8 +153,6 @@ - - diff --git a/audio/comet/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/comet/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 3aa119e..54a4bc5 100644 --- a/audio/comet/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/comet/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -130,10 +130,6 @@ - - - - @@ -153,8 +149,6 @@ - - diff --git a/audio/comet/config/audio_policy_configuration_le_offload_disabled.xml b/audio/comet/config/audio_policy_configuration_le_offload_disabled.xml index 9f20ecb..91fa680 100644 --- a/audio/comet/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/comet/config/audio_policy_configuration_le_offload_disabled.xml @@ -134,10 +134,6 @@ - - - - @@ -157,8 +153,6 @@ - - Date: Thu, 2 May 2024 09:12:57 +0000 Subject: [PATCH 2/5] Revert "Set big core to cpu skip mask by default" This reverts commit 2e325a80b2accd1c65d68767d50e98543725a4b8. Reason for revert: may get geekbench5/6 regressed Bug: 338140604 Bug: 338141118 Change-Id: I7866afa56a598ffcf56c51cbea21a6237372a599 --- powerhint-comet.json | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/powerhint-comet.json b/powerhint-comet.json index da1ae8d..74e136e 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -221,6 +221,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -864,12 +865,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1130,12 +1125,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1297,12 +1286,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1897,12 +1880,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2323,12 +2300,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2473,12 +2444,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From 1cad8e9e192bf42d1e53f87b3ec1481baa1e27d7 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Tue, 30 Apr 2024 11:25:42 +0800 Subject: [PATCH 3/5] gps: disable AGPS L5 Bug: 336287475 Test: verify pass in b/336287475#comment25 Change-Id: Iaa06c3549d0f36e1dcce93b1dba0341bb1256c4a --- location/user/gps.cfg | 2 +- location/userdebug/gps.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/location/user/gps.cfg b/location/user/gps.cfg index 84c0f33..ef1f718 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -53,7 +53,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 4c1d995..665358c 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -179,7 +179,7 @@ GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x5 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 -CP_LocTech_Constraints=0x81 +CP_LocTech_Constraints=1 CP_LocTech_Requirements=0 UP_LocTech_PrimaryConst=0 UP_LocTech_Constraints=1 From 15c78bac5b79592ac8a7d1037a94f52e07a742b0 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 2 May 2024 22:39:33 +0000 Subject: [PATCH 4/5] thermal: Move TPU to the VSKIN-SOC PID loop Bug: 322223131 Test: run TPU test Change-Id: I4996071d1618808068dddddd984f3eca4da32517 --- thermal/thermal_info_config_comet.json | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/thermal/thermal_info_config_comet.json b/thermal/thermal_info_config_comet.json index 22463a5..3d2fac6 100644 --- a/thermal/thermal_info_config_comet.json +++ b/thermal/thermal_info_config_comet.json @@ -261,10 +261,6 @@ "PassiveDelay": 7000, "SendCallback": true, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 99, 99] @@ -556,7 +552,7 @@ ] }, { - "Name": "VIRTUAL-SKIN-CPU-GPU", + "Name": "VIRTUAL-SKIN-SOC", "Type": "UNKNOWN", "Hidden": true, "VirtualSensor": true, @@ -576,7 +572,7 @@ "K_D": ["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "I_Max": ["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "S_Power": ["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], - "MinAllocPower": ["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], + "MinAllocPower": ["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "MaxAllocPower": ["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "I_Cutoff": ["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] }, @@ -607,7 +603,6 @@ "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeilingFrequency": [3105000, 700000, 700000, 700000, 700000, 700000, 700000], "LimitInfoFrequency": [3105000, 3105000, 3105000, 3105000, 3105000, 700000, 700000] - }, { "CdevRequest": "thermal-gpufreq-0", @@ -617,6 +612,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 9, 9, 9, 10, 12, 12], "LimitInfo": [0, 0, 0, 0, 0, 12, 12] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1090,6 +1094,11 @@ "PowerSampleDelay": 7000, "PowerSampleCount": 1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name": "PARTIAL_SYSTEM_POWER", "VirtualRails": true, From 82e60fe15c2a1df26fa6ce33fd10b68d0b50f3bd Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Thu, 2 May 2024 16:51:30 +0800 Subject: [PATCH 5/5] odpm: support 2 random mappings to iio device VSYS_PWR_MMWAVE will be replaced with S12S_VDD_AUR on SUB6 only sku. The replacement failed sometimes because there are 2 random mappings to iio device. Mapping 1 iio:device0 -> s2mpg14-odpm iio:device1 -> s2mpg15-odpm Mapping 2 iio:device0 -> s2mpg15-odpm iio:device1 -> s2mpg14-odpm Bug: 337665886 Bug: 338416918 Bug: 338316877 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I0f469f663ca25dce86f4e9e44442723627fbb724 Signed-off-by: Darren Hsu --- conf/init.comet.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.comet.rc b/conf/init.comet.rc index 3c88556..e505491 100644 --- a/conf/init.comet.rc +++ b/conf/init.comet.rc @@ -77,6 +77,7 @@ on property:vendor.thermal.link_ready=1 # ODPM on early-boot && property:ro.boot.hardware.sku=GC15S + write /sys/bus/iio/devices/iio:device0/enabled_rails "CH11=BUCK12S" write /sys/bus/iio/devices/iio:device1/enabled_rails "CH11=BUCK12S" # SFPS Fingerprint