From cfb9058506a7df9e64f08079ebaff47ae4376ddf Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Fri, 24 May 2024 15:52:06 +0800 Subject: [PATCH 1/4] Switch makefile owners to MK_OWNERS Bug: 278167548 Change-Id: I7b1df57f419d8193306a58d4ad5e6c999510ccd9 --- OWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 3a46d1a8..4cfcd6d5 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com,rsubr@google.com,sayanna@google.com,liumartin@google.com,kamewang@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS From 38b33f1d16d2d2b167a5a52dfa7e5310b245ef17 Mon Sep 17 00:00:00 2001 From: Rios Kao Date: Tue, 21 May 2024 03:00:22 +0000 Subject: [PATCH 2/4] caimito: correct property name for gsenet. Test: build pass. Bug: 333497194 Change-Id: I1cc26a012fa49252f47b550988b61fa052f2be0b --- device-caiman.mk | 2 +- device-komodo.mk | 2 +- device-tokay.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index b96947c7..70b3044b 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -165,7 +165,7 @@ endif # HdMic Audio PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/caiman/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.hdmic.version=1 + persist.vendor.app.audio.gsenet.version=1 PRODUCT_PACKAGES += \ libspeechenhancer diff --git a/device-komodo.mk b/device-komodo.mk index 773a3d20..3b4052f4 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -188,7 +188,7 @@ endif # HdMic Audio PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/komodo/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.hdmic.version=1 + persist.vendor.app.audio.gsenet.version=1 PRODUCT_PACKAGES += \ libspeechenhancer diff --git a/device-tokay.mk b/device-tokay.mk index 1e8655f8..1d0123d2 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -158,7 +158,7 @@ endif # HdMic Audio PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/tokay/prebuilt/libspeechenhancer PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.hdmic.version=1 + persist.vendor.app.audio.gsenet.version=1 PRODUCT_PACKAGES += \ libspeechenhancer From 09e63f9519b58bf483fa15468075b679ec581b8a Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Thu, 30 May 2024 00:52:40 +0000 Subject: [PATCH 3/4] Revert "powerhint: add proactive kill hint for camera launch" Revert submission 27473137-P24_PA_KILL_HINT_24Q4 Reason for revert: will merge after mid of June Reverted changes: /q/submissionid:27473137-P24_PA_KILL_HINT_24Q4 Change-Id: Ie6fadb9881a00486ff631ab286aca9ff062a7a40 Bug: 322916612 --- perf/powerhint-caiman.json | 32 ------------------------------- perf/powerhint-komodo.json | 32 ------------------------------- perf/powerhint-ripcurrent24.json | 32 ------------------------------- perf/powerhint-ripcurrentpro.json | 32 ------------------------------- perf/powerhint-tokay.json | 32 ------------------------------- perf/powerhint-zuma.json | 32 ------------------------------- 6 files changed, 192 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 92e7876e..07c53e20 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -476,16 +476,6 @@ "Type": "Property", "ResetOnInit": true }, - { - "Name": "PowerHALLaunch", - "Path": "vendor.powerhal.is_launch", - "Values": [ - "1", - "0" - ], - "Type": "Property", - "ResetOnInit": true - }, { "Name": "BigTjOffset", "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", @@ -850,15 +840,6 @@ "67000" ], "ResetOnInit": true - }, - { - "Name": "PA_KILL", - "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb", - "Values": [ - "102400", - "0" - ], - "ResetOnInit": false } ], "Actions": [ @@ -1039,12 +1020,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "PowerHALLaunch", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUSkipMask", @@ -1331,13 +1306,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PA_KILL", - "EnableProperty": "vendor.powerhal.is_launch", - "Duration": 0, - "Value": "102400" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPUSkipMask", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index c4d2bab0..349da779 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -476,16 +476,6 @@ "Type": "Property", "ResetOnInit": true }, - { - "Name": "PowerHALLaunch", - "Path": "vendor.powerhal.is_launch", - "Values": [ - "1", - "0" - ], - "Type": "Property", - "ResetOnInit": true - }, { "Name": "BigTjOffset", "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", @@ -850,15 +840,6 @@ "67000" ], "ResetOnInit": true - }, - { - "Name": "PA_KILL", - "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb", - "Values": [ - "102400", - "0" - ], - "ResetOnInit": false } ], "Actions": [ @@ -1039,12 +1020,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "PowerHALLaunch", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUSkipMask", @@ -1331,13 +1306,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PA_KILL", - "EnableProperty": "vendor.powerhal.is_launch", - "Duration": 0, - "Value": "102400" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPUSkipMask", diff --git a/perf/powerhint-ripcurrent24.json b/perf/powerhint-ripcurrent24.json index ae1bff00..fb2a7028 100644 --- a/perf/powerhint-ripcurrent24.json +++ b/perf/powerhint-ripcurrent24.json @@ -337,16 +337,6 @@ "Type": "Property", "ResetOnInit": true }, - { - "Name": "PowerHALLaunch", - "Path": "vendor.powerhal.is_launch", - "Values": [ - "1", - "0" - ], - "Type": "Property", - "ResetOnInit": true - }, { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", @@ -604,15 +594,6 @@ "0,1,2,3,4,5,6,7,8" ], "Type": "Property" - }, - { - "Name": "PA_KILL", - "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb", - "Values": [ - "102400", - "0" - ], - "ResetOnInit": false } ], "Actions": [ @@ -723,12 +704,6 @@ "EnableProperty": "vendor.powerhal.camerarunning", "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" }, - { - "PowerHint": "LAUNCH", - "Node": "PowerHALLaunch", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH_PMU", "Node": "PMU_POLL", @@ -747,13 +722,6 @@ "Duration": 33, "Value": "820000" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PA_KILL", - "EnableProperty": "vendor.powerhal.is_launch", - "Duration": 0, - "Value": "102400" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "MemFreq", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 4895bfee..a3780cf4 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -530,16 +530,6 @@ "Type": "Property", "ResetOnInit": true }, - { - "Name": "PowerHALLaunch", - "Path": "vendor.powerhal.is_launch", - "Values": [ - "1", - "0" - ], - "Type": "Property", - "ResetOnInit": true - }, { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", @@ -839,15 +829,6 @@ "20 40" ], "ResetOnInit": true - }, - { - "Name": "PA_KILL", - "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb", - "Values": [ - "102400", - "0" - ], - "ResetOnInit": false } ], "Actions": [ @@ -1028,12 +1009,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "PowerHALLaunch", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUSkipMask", @@ -1320,13 +1295,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PA_KILL", - "EnableProperty": "vendor.powerhal.is_launch", - "Duration": 0, - "Value": "102400" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPUSkipMask", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 92e7876e..07c53e20 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -476,16 +476,6 @@ "Type": "Property", "ResetOnInit": true }, - { - "Name": "PowerHALLaunch", - "Path": "vendor.powerhal.is_launch", - "Values": [ - "1", - "0" - ], - "Type": "Property", - "ResetOnInit": true - }, { "Name": "BigTjOffset", "Path": "/sys/devices/platform/100a0000.BIG/offset_enabled", @@ -850,15 +840,6 @@ "67000" ], "ResetOnInit": true - }, - { - "Name": "PA_KILL", - "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb", - "Values": [ - "102400", - "0" - ], - "ResetOnInit": false } ], "Actions": [ @@ -1039,12 +1020,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "PowerHALLaunch", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUSkipMask", @@ -1331,13 +1306,6 @@ "Duration": 0, "Value": "0x80" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PA_KILL", - "EnableProperty": "vendor.powerhal.is_launch", - "Duration": 0, - "Value": "102400" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPUSkipMask", diff --git a/perf/powerhint-zuma.json b/perf/powerhint-zuma.json index 326c0b19..7476ae4c 100644 --- a/perf/powerhint-zuma.json +++ b/perf/powerhint-zuma.json @@ -485,16 +485,6 @@ "Type": "Property", "ResetOnInit": true }, - { - "Name": "PowerHALLaunch", - "Path": "vendor.powerhal.is_launch", - "Values": [ - "1", - "0" - ], - "Type": "Property", - "ResetOnInit": true - }, { "Name": "INTCAMFreq", "Path": "/sys/devices/platform/17000030.devfreq_intcam/devfreq/17000030.devfreq_intcam/min_freq", @@ -788,15 +778,6 @@ "20 40" ], "ResetOnInit": true - }, - { - "Name": "PA_KILL", - "Path": "/sys/kernel/vendor_mm/pa_kill/reclaim_kb", - "Values": [ - "102400", - "0" - ], - "ResetOnInit": false } ], "Actions": [ @@ -953,12 +934,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "PowerHALLaunch", - "Duration": 5000, - "Value": "1" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1102,13 +1077,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "PA_KILL", - "EnableProperty": "vendor.powerhal.is_launch", - "Duration": 0, - "Value": "102400" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", From b78ba022cbcecd199efb2bc3cf4e9f095c45fa70 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Tue, 21 May 2024 10:03:05 +0000 Subject: [PATCH 4/4] Revert "gps: Disable NFW lock" Revert submission 27263809-disable-nfw-lock Reason for revert: enable NFW after LOCSW-21052 is reverted in b/326439267 and fix test case failure in b/343511469 Reverted changes: /q/submissionid:27263809-disable-nfw-lock Change-Id: Iffa05830a522e8a4e73a534c89dc8b3dec5dec87 --- location/caiman/user/gps.cfg | 1 - location/caiman/userdebug/gps.cfg | 1 - location/komodo/user/gps.cfg | 1 - location/komodo/userdebug/gps.cfg | 1 - location/ripcurrent24/user/gps.cfg | 1 - location/ripcurrent24/userdebug/gps.cfg | 1 - location/ripcurrentpro/user/gps.cfg | 1 - location/ripcurrentpro/userdebug/gps.cfg | 1 - location/tokay/user/gps.cfg | 1 - location/tokay/userdebug/gps.cfg | 1 - 10 files changed, 10 deletions(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 6e11d63e..eb4c98bc 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 GlueLayer_ToolConfigSelection=3 debug_console=0 debug_enable=0 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 43d6a256..50044244 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 ############################################ GlueLayer_ToolConfigSelection=3 user_ports_tcp_name=Autotest diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index ad006853..1a949223 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 GlueLayer_ToolConfigSelection=3 debug_console=0 debug_enable=0 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index 07ea40e9..1fbc0ed7 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 ############################################ GlueLayer_ToolConfigSelection=3 user_ports_tcp_name=Autotest diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 2ed9c9b1..900ad0d3 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 GlueLayer_ToolConfigSelection=3 debug_console=0 debug_enable=0 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 38d62bd1..07159393 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 ############################################ GlueLayer_ToolConfigSelection=3 user_ports_tcp_name=Autotest diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 2ed9c9b1..900ad0d3 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 GlueLayer_ToolConfigSelection=3 debug_console=0 debug_enable=0 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 38d62bd1..07159393 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 ############################################ GlueLayer_ToolConfigSelection=3 user_ports_tcp_name=Autotest diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 4cc8d7b6..8e5f4fbf 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 GlueLayer_ToolConfigSelection=3 debug_console=0 debug_enable=0 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 2cc65bd4..c4fc1860 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -1,4 +1,3 @@ -GlueLayer_IsUseNfwLocAccess=0 ############################################ GlueLayer_ToolConfigSelection=3 user_ports_tcp_name=Autotest