From 58e2461348d8be87d1a435921ef28b7237b8db83 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Tue, 11 Apr 2023 13:38:10 +0800 Subject: [PATCH 1/3] uwb: update uwb calibration for CCC antenna config Bug: 249170179 Test: build pass Change-Id: Ief9f932b71bba71555d601da92bb7e4d4dc69e1e Signed-off-by: Rex Lin --- uwb/UWB-calibration-ce.conf | 17 ++++++----------- uwb/UWB-calibration-default.conf | 17 ++++++----------- uwb/UWB-calibration-fcc.conf | 17 ++++++----------- uwb/UWB-calibration-jp.conf | 17 ++++++----------- uwb/UWB-calibration-restricted.conf | 17 ++++++----------- uwb/UWB-calibration-tw.conf | 17 ++++++----------- uwb/UWB-calibration.conf | 19 +++++++------------ 7 files changed, 43 insertions(+), 78 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index e123728..fae3dd9 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x53532B53 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 4affed8..99020e6 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 4affed8..99020e6 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 8798ccd..5e45dae 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x01 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x01 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 3732304..864381f 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0xFFFF +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index e7e7863..853f60a 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index a1e9de1..f676eea 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant0 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16447 ant0.ch5.prf16.tx_power=0x67672F67 ant0.ch5.prf16.pg_count=0 @@ -110,6 +104,7 @@ temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 @@ -150,4 +145,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 -alternate_pulse_shape=0x01 +alternate_pulse_shape=0x00 From 900d70ae6f5507daf332f5c45f771123cd25b2f6 Mon Sep 17 00:00:00 2001 From: Suprabh Shukla Date: Wed, 10 May 2023 15:50:49 -0700 Subject: [PATCH 2/3] Adding interrupt mapping for sound_trigger wakeups Test: Manually inspect the output of `dumpsys batterystats --wakeups` Bug: 271922941 Change-Id: I0a79073ae875104495caf87b35ed8fc8bcc6c805 --- .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ .../frameworks/base/core/res/res/xml/irq_device_map.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index f36ea00..2a53b55 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,6 +26,9 @@ Cellular_data + + Sound_trigger + Sensor diff --git a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml index f36ea00..2a53b55 100644 --- a/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml +++ b/panther/overlay/frameworks/base/core/res/res/xml/irq_device_map.xml @@ -26,6 +26,9 @@ Cellular_data + + Sound_trigger + Sensor From a3a36e3b000e6cd1857678c6adb0b1fce137b380 Mon Sep 17 00:00:00 2001 From: Qais Yousef Date: Wed, 10 May 2023 10:39:58 +0000 Subject: [PATCH 3/3] The dvfs headroom was split into its own knob. Update to use it. util_threshold only controls migration margin now. dvfs headroom has its own new knob. Bug: 261705301 Signed-off-by: Qais Yousef Change-Id: If5f24b6efd645c3aed602dfa219f91c8a49cfaf4 --- powerhint-cheetah-a0.json | 16 ++++++++++++++++ powerhint-cheetah.json | 16 ++++++++++++++++ powerhint-cloudripper.json | 16 ++++++++++++++++ powerhint-panther-a0.json | 16 ++++++++++++++++ powerhint-panther.json | 16 ++++++++++++++++ powerhint-ravenclaw.json | 16 ++++++++++++++++ 6 files changed, 96 insertions(+) diff --git a/powerhint-cheetah-a0.json b/powerhint-cheetah-a0.json index a771e86..665c384 100644 --- a/powerhint-cheetah-a0.json +++ b/powerhint-cheetah-a0.json @@ -137,6 +137,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1263,6 +1273,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 08c7e43..35cce08 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -155,6 +155,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1328,6 +1338,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-cloudripper.json b/powerhint-cloudripper.json index c8bda7b..68d5c41 100644 --- a/powerhint-cloudripper.json +++ b/powerhint-cloudripper.json @@ -109,6 +109,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -744,6 +754,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq", diff --git a/powerhint-panther-a0.json b/powerhint-panther-a0.json index 144d0ba..478619f 100644 --- a/powerhint-panther-a0.json +++ b/powerhint-panther-a0.json @@ -126,6 +126,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1150,6 +1160,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-panther.json b/powerhint-panther.json index e8a3fb0..83bf9c5 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -135,6 +135,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -1195,6 +1205,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferHighCap", diff --git a/powerhint-ravenclaw.json b/powerhint-ravenclaw.json index 2a0f41a..d1148b1 100644 --- a/powerhint-ravenclaw.json +++ b/powerhint-ravenclaw.json @@ -109,6 +109,16 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "CPUDVFSHeadroom", + "Path": "/proc/vendor_sched/dvfs_headroom", + "Values": [ + "1280", + "1100" + ], + "DefaultIndex": 0, + "ResetOnInit": true + }, { "Name": "MIFTargetLoad", "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load", @@ -744,6 +754,12 @@ "Duration": 0, "Value": "1100" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CPUDVFSHeadroom", + "Duration": 0, + "Value": "1100" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CPUMidClusterMaxFreq",