diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index f633834..50a3f3f 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_BOOTS_16K := true diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 0b23ed5..208ee17 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -22,4 +22,5 @@ PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_RW_FILE_SYSTEM_TYPE := ext4 TARGET_BOOTS_16K := true diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index b34566d..226cf26 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -107,6 +107,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/audio/shiba/aidl_config/audio_platform_configuration.xml b/audio/shiba/aidl_config/audio_platform_configuration.xml index b34566d..226cf26 100644 --- a/audio/shiba/aidl_config/audio_platform_configuration.xml +++ b/audio/shiba/aidl_config/audio_platform_configuration.xml @@ -107,6 +107,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/shiba/aidl_config/audio_policy_volumes.xml b/audio/shiba/aidl_config/audio_policy_volumes.xml index 3fe738d..b087a21 100644 --- a/audio/shiba/aidl_config/audio_policy_volumes.xml +++ b/audio/shiba/aidl_config/audio_policy_volumes.xml @@ -51,8 +51,14 @@ volume index from 0 to 100. 66,-2200 100,-1800 - + + 1,-4500 + 29,-3400 + 57,-2250 + 71,-1900 + 86,-1530 + 100,-1100 + - 1,-2970 - 33,-2010 - 66,-1020 + 1,-4000 + 29,-2950 + 43,-2350 + 57,-1850 + 71,-1400 + 86,-700 100,0 - 1,-6438 - 4,-6438 - 8,-5961 - 12,-5543 - 16,-5167 - 20,-4743 - 24,-4391 - 28,-4061 - 32,-3871 - 36,-3673 - 40,-3471 - 44,-3273 - 48,-3065 - 52,-2850 - 56,-2618 - 60,-2355 - 64,-2060 - 68,-1773 - 72,-1482 - 76,-1205 - 80,-989 - 84,-791 - 88,-578 - 92,-374 - 96,-137 + 1,-5927 + 4,-5927 + 8,-5574 + 12,-5281 + 16,-4952 + 20,-4562 + 24,-4213 + 28,-3838 + 32,-3600 + 36,-3385 + 40,-3116 + 44,-2927 + 48,-2665 + 52,-2436 + 56,-2181 + 60,-1985 + 64,-1743 + 68,-1553 + 72,-1427 + 76,-1166 + 80,-1045 + 84,-895 + 88,-644 + 92,-486 + 96,-209 100,0 - 0,-2970 - 33,-2010 - 66,-1020 + 0,-5600 + 29,-3520 + 57,-1500 + 71,-1150 + 86,-500 100,0 - 1,-2970 - 33,-2010 - 66,-1020 - 100,0 + 1,-4500 + 29,-3800 + 71,-1850 + 86,-1000 + 100,-500 @@ -165,8 +177,14 @@ volume index from 0 to 100. 66,-2200 100,-1800 - + + 1,-4500 + 29,-3400 + 57,-2250 + 71,-1900 + 86,-1530 + 100,-1100 + 66,-2200 100,-1800 - + + 1,-5700 + 29,-4230 + 43,-3300 + 57,-3100 + 71,-2500 + 100,-1400 + - + diff --git a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml index 8b2af59..efd7277 100644 --- a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml +++ b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml @@ -11,6 +11,7 @@ channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> + + + sources="le audio output"/> + \ No newline at end of file diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index df3cab7..172d66d 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -40,3 +40,5 @@ BqrEventMaskValueUpdate = 295006 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus BtOpusEnabled = true + +BtHalRecoveryByRestart = true diff --git a/conf/init.husky.rc b/conf/init.husky.rc index ffd9bd8..3479e7c 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -41,6 +41,7 @@ on post-fs-data # Bluetooth on post-fs-data chown bluetooth system /proc/bluetooth/timesync + chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl # Start the twoshay touch service on property:vendor.device.modules.ready=1 diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index b30f54f..f19c3e2 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -37,6 +37,7 @@ on post-fs-data # Bluetooth on post-fs-data chown bluetooth system /proc/bluetooth/timesync + chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl # Start the twoshay touch service on property:vendor.device.modules.ready=1 diff --git a/device-husky.mk b/device-husky.mk index ca9d447..d1bd5e7 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -72,10 +72,9 @@ endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/husky/audio-tables.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/stm/stm20.mk -include device/google/gs-common/touch/gti/gti.mk +include device/google/gs-common/touch/stm/predump_stm20.mk +include device/google/gs-common/touch/gti/predump_gti.mk include device/google/gs-common/touch/touchinspector/touchinspector.mk # Init files @@ -145,10 +144,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ ifeq ($(USE_AUDIO_HAL_AIDL),true) # AIDL -# declare use of stereo spatialization -PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.stereo_spatialization_enabled=true - else # HIDL @@ -230,11 +225,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled?=true \ bluetooth.profile.vcp.controller.enabled?=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ @@ -247,7 +241,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. @@ -415,14 +409,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 \ - ro.vendor.vibrator.hal.dbc.enable=true \ - ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \ - ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \ - ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 + persist.vendor.vibrator.hal.context.settlingtime=5000 # Override Output Distortion Gain PRODUCT_VENDOR_PROPERTIES += \ @@ -548,3 +535,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 9d81cf0..d22ebca 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -45,7 +45,6 @@ CAMERA_PRODUCT ?= ripcurrent include device/google/shusky/audio/ripcurrent/audio-tables.mk include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/stm/stm20.mk @@ -280,3 +279,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # PKVM Memory Reclaim PRODUCT_VENDOR_PROPERTIES += \ hypervisor.memory_reclaim.supported=1 + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/device-shiba.mk b/device-shiba.mk index df80a6e..aa28f12 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -56,9 +56,8 @@ endif include device/google/shusky/camera/camera.mk include device/google/shusky/audio/shiba/audio-tables.mk include device/google/zuma/device-shipping-common.mk -include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/gti/gti.mk +include device/google/gs-common/touch/gti/predump_gti.mk # Init files PRODUCT_COPY_FILES += \ @@ -133,10 +132,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ ifeq ($(USE_AUDIO_HAL_AIDL),true) # AIDL -# declare use of stereo spatialization -PRODUCT_PROPERTY_OVERRIDES += \ - ro.audio.stereo_spatialization_enabled=true - else # HIDL @@ -218,11 +213,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled?=true \ bluetooth.profile.vcp.controller.enabled?=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # Bluetooth LE Audio enable hardware offloading PRODUCT_PRODUCT_PROPERTIES += \ @@ -235,7 +229,7 @@ PRODUCT_COPY_FILES += \ # LE Audio Unicast Allowlist PRODUCT_PRODUCT_PROPERTIES += \ - persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5 + persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630 # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. @@ -392,14 +386,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.context.scale=60 \ persist.vendor.vibrator.hal.context.fade=true \ persist.vendor.vibrator.hal.context.cooldowntime=1600 \ - persist.vendor.vibrator.hal.context.settlingtime=5000 \ - ro.vendor.vibrator.hal.dbc.enable=true \ - ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \ - ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \ - ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \ - ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \ - ro.vendor.vibrator.hal.pm.activetimeout=5 + persist.vendor.vibrator.hal.context.settlingtime=5000 # Override Output Distortion Gain PRODUCT_VENDOR_PROPERTIES += \ @@ -517,3 +504,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json + +# Enable APF by default +PRODUCT_VENDOR_PROPERTIES += \ + vendor.powerhal.apf_disabled=false \ + vendor.powerhal.apf_enabled=true diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf index 51dfb91..0709eb5 100644 --- a/nfc/libnfc-hal-st.conf +++ b/nfc/libnfc-hal-st.conf @@ -156,7 +156,7 @@ STNFC_REMOTE_FIELD_TIMER=0x01 ############################################################################### # Configure the ACTIVE_RW timer # Default 0x00, set 0x01 to enable it -# STNFC_ACTIVERW_TIMER=0x01 +STNFC_ACTIVERW_TIMER=0x01 ############################################################################### # Core configuration settings diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 64fa155..8a52086 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -97,6 +97,7 @@ "Values": [ "9999999", "1548000", + "1425000", "1197000", "0" ], @@ -136,6 +137,7 @@ "9999999", "2245000", "2130000", + "1572000", "1836000", "0" ], @@ -177,6 +179,7 @@ "2687000", "2363000", "2147000", + "1745000", "1885000", "0" ], @@ -320,6 +323,51 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceEnable", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", + "Values": [ + "570", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", + "Values": [ + "110", + "120" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", + "Values": [ + "139", + "130" + ], + "ResetOnInit": true + }, { "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/groups/fg/uclamp_min", @@ -428,6 +476,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -864,7 +921,8 @@ "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskMid", "Duration": 5000, - "Value": "0x1ff" + "Value": "0x1ff", + "EnableProperty": "vendor.powerhal.apf_disabled" }, { "PowerHint": "LAUNCH", @@ -929,7 +987,8 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "765" + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" }, { "PowerHint": "LAUNCH", @@ -1001,6 +1060,48 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceEnable", + "Duration": 5000, + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "570", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -1526,6 +1627,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", @@ -1832,6 +1951,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -1974,7 +2099,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -2006,6 +2131,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", @@ -2048,6 +2179,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2204,6 +2347,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2330,6 +2485,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", @@ -2486,37 +2647,37 @@ "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 7a34efb..10b337a 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -315,6 +315,51 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceEnable", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", + "Values": [ + "570", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", + "Values": [ + "110", + "120" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", + "Values": [ + "139", + "130" + ], + "ResetOnInit": true + }, { "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/groups/fg/uclamp_min", @@ -423,6 +468,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -895,7 +949,8 @@ "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskMid", "Duration": 5000, - "Value": "0x1ff" + "Value": "0x1ff", + "EnableProperty": "vendor.powerhal.apf_disabled" }, { "PowerHint": "LAUNCH", @@ -960,7 +1015,8 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "765" + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" }, { "PowerHint": "LAUNCH", @@ -1032,6 +1088,48 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceEnable", + "Duration": 5000, + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "570", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -1493,6 +1591,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", @@ -1697,6 +1813,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -1827,7 +1949,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1859,6 +1981,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", @@ -1889,6 +2017,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2027,6 +2167,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2147,6 +2299,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index bccce89..7435de5 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -97,6 +97,7 @@ "Values": [ "9999999", "1548000", + "1425000", "1197000", "0" ], @@ -132,6 +133,7 @@ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq", "Values": [ "9999999", + "1572000", "1836000", "0" ], @@ -168,6 +170,7 @@ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq", "Values": [ "9999999", + "1745000", "1885000", "0" ], @@ -321,6 +324,51 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceEnable", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", + "Values": [ + "570", + "0" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceHighPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", + "Values": [ + "110", + "120" + ], + "ResetOnInit": true + }, + { + "Name": "TAUclampMinOnNiceMidPrio", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", + "Values": [ + "139", + "130" + ], + "ResetOnInit": true + }, { "Name": "FGUClampBoost", "Path": "/proc/vendor_sched/groups/fg/uclamp_min", @@ -429,6 +477,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -865,7 +922,8 @@ "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskMid", "Duration": 5000, - "Value": "0x1ff" + "Value": "0x1ff", + "EnableProperty": "vendor.powerhal.apf_disabled" }, { "PowerHint": "LAUNCH", @@ -930,7 +988,8 @@ "PowerHint": "LAUNCH", "Node": "TAUClampBoost", "Duration": 5000, - "Value": "765" + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_disabled" }, { "PowerHint": "LAUNCH", @@ -1002,6 +1061,48 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceEnable", + "Duration": 5000, + "Value": "1", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "570", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139", + "EnableProperty": "vendor.powerhal.apf_enabled" + }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -1533,6 +1634,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU", "Node": "TAPreferHighCap", @@ -1737,6 +1856,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -1879,7 +2004,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1905,6 +2030,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", @@ -1953,6 +2084,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "AutoPreferIdle", @@ -2037,7 +2180,7 @@ "Duration": 0, "Value": "cam1" }, - { + { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CPUUtilThreshold", "Duration": 0, @@ -2109,6 +2252,18 @@ "Duration": 0, "Value": "0x0" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2235,6 +2390,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", @@ -2391,37 +2552,37 @@ "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUBigClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1745000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPUMidClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1572000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMaxFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "FIXED_PERFORMANCE", "Node": "CPULittleClusterMinFreq", "Duration": 0, - "Value": "9999999" + "Value": "1425000" }, { "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50", diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index d3f1e1a..566c568 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -182,4 +182,6 @@ false: firmware roaming will not be affected. --> true + + false diff --git a/thermal/Android.bp b/thermal/Android.bp deleted file mode 100644 index fed2086..0000000 --- a/thermal/Android.bp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package { - default_applicable_licenses: ["Android-Apache-2.0"], -} - -cc_library { - name: "thermal-config-cpp", - proto: { - type: "lite", - export_proto_headers: true, - include_dirs: [ - "external/protobuf/src", - "device/google/gs-common/thermal/thermal_hal/thermal_config_schemas" - ], - } -} - -cc_test_host { - name: "shusky-thermal-config-test", - srcs: [ - "thermal_config_test.cpp", - ], - static_libs: [ - "libbase", - "libgmock", - "liblog", - "libjsoncpp", - "libjsonpbverify", - "libjsonpbparse", - "thermal_HAL_info_config_proto", - ], - shared_libs: [ - "libprotobuf-cpp-full", - ], - cflags: [ - "-Wall", - "-Werror", - "-Wno-unused-parameter", - ], - data: [ - "*.json" - ], - test_suites: [ - "general-tests", - ], -} \ No newline at end of file diff --git a/thermal/thermal_config_test.cpp b/thermal/thermal_config_test.cpp deleted file mode 100644 index 7b01306..0000000 --- a/thermal/thermal_config_test.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -#include "thermal_info_config_test.h" - -using namespace ::android::jsonpb; -using ::android::base::GetExecutableDirectory; - -namespace devices { -namespace shusky { - -template -JsonSchemaTestConfigFactory MakeTestParam(const std::string &path) { - return android::jsonpb::MakeTestParam(GetExecutableDirectory() + path); -} - -// Make test suite for thermal info config schema. -INSTANTIATE_TEST_SUITE_P( - ThermalSuite, ThermalInfoConfigTest, - ::testing::Values( - MakeTestParam("/thermal_info_config_husky.json"), - MakeTestParam("/thermal_info_config_shiba.json"), - MakeTestParam("/thermal_info_config_charge_husky.json"), - MakeTestParam("/thermal_info_config_charge_shiba.json"), - MakeTestParam("/thermal_info_config_ripcurrent.json"), - MakeTestParam( - "/thermal_info_config_charge_ripcurrent.json"))); - -// Ignores a formatting check (b/c 0.0 != 0 textually) -GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(JsonSchemaTest); - -int main(int argc, char **argv) { - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} - -} // namespace shusky -} // namespace devices diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 66b949d..1ba87af 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -127,13 +127,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -153,8 +163,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -329,8 +340,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 25fa05d..08aaa96 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -160,13 +160,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -186,8 +196,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -362,8 +373,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 29c24cd..e325805 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -717,13 +717,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -743,8 +753,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -1051,8 +1062,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 82c6fbc..fd0e438 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -729,13 +729,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -755,8 +765,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["NO_WLC"], + "CoefficientType": ["SENSOR"], "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, @@ -1084,8 +1095,8 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "L22M_DISP", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM", "VSYS_PWR_RFFE"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 } diff --git a/thermal/thermal_info_config_test.h b/thermal/thermal_info_config_test.h deleted file mode 100644 index 1864420..0000000 --- a/thermal/thermal_info_config_test.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2023 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -#include -#include - -#include "thermal_info_config.pb.h" - -namespace devices { -namespace shusky { - -// JSON schema test wrapper. -class ThermalInfoConfigTest : public android::jsonpb::JsonSchemaTest { -public: - void SetUp() override { - JsonSchemaTest::SetUp(); - thermalInfoConfig_ = static_cast(message()); - } - ThermalConfig *thermalInfoConfig_ = nullptr; -}; - -// Individual test checking for sensor name and type as required fields. -TEST_P(ThermalInfoConfigTest, ThermalConfigRequiredFields) { - std::string error; - - // Checks that no unknown fields are introduced. - EXPECT_TRUE(android::jsonpb::AllFieldsAreKnown(*object_, json_, &error)) - << "File: " << file_path_ << ": " << error; - - // Check all Sensors have a Name and Type. - for (int i = 0; i < thermalInfoConfig_->sensors_size(); ++i) { - auto &&sensor = thermalInfoConfig_->sensors(i); - EXPECT_FALSE(sensor.name().empty()) - << "No name for sensor #" << i << " in " << file_path_; - EXPECT_FALSE(sensor.type().empty()) - << "No type for sensor " << sensor.name() << " in " << file_path_; - } -}; - -} // namespace shusky -} // namespace devices \ No newline at end of file