From edcc8052bef05250ebf493dd743279f96b799613 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 02:25:50 +0000 Subject: [PATCH 1/5] Update husky SVN to 21 Bug: 325156176 Change-Id: Ib5a0543902942460fb6818c3d8a540b4d9f5d5de --- device-husky.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-husky.mk b/device-husky.mk index 26e4bc8..bdbb417 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -404,7 +404,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) From 69e44dc03b73f3b1f7c8b3b7e7828f80ad60572e Mon Sep 17 00:00:00 2001 From: Hasan Awais Date: Thu, 14 Dec 2023 19:27:47 +0000 Subject: [PATCH 2/5] Revert "uwb: set calibrations for v6.3" This reverts commit f39e1b74ccba4c736b5da874f7d30d83e4939464. Reason for revert: b/327447971 Bug: 327447971 Change-Id: Ie82683fe1a89040af8ff01dc921c6d58995e9eb6 --- device-husky.mk | 2 +- uwb/calibration-CE.conf | 6 +++--- uwb/calibration-FCC.conf | 6 +++--- uwb/calibration-JP.conf | 4 ++-- uwb/calibration-TW.conf | 6 +++--- uwb/calibration-default.conf | 6 +++--- uwb/calibration.conf | 4 +++- uwb/configuration.conf | 15 ++++++++++++++- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index a8bb47a..6971a68 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -35,7 +35,7 @@ $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-ve $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk) $(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal-r63/Device.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk) # display diff --git a/uwb/calibration-CE.conf b/uwb/calibration-CE.conf index e1a45aa..e1365d4 100644 --- a/uwb/calibration-CE.conf +++ b/uwb/calibration-CE.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=37:37:37:37 ant0.ch5.ref_frame5.tx_power_index=37:37:37:37 ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0xff @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=36:36:36:36 ant0.ch9.ref_frame4.tx_power_index=32:32:32:32 ant0.ch9.ref_frame5.tx_power_index=31:31:31:31 ant0.ch9.ref_frame6.tx_power_index=37:37:37:37 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0xff @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=37:37:37:37 ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B ant1.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0xff diff --git a/uwb/calibration-FCC.conf b/uwb/calibration-FCC.conf index f579c20..0b44c81 100644 --- a/uwb/calibration-FCC.conf +++ b/uwb/calibration-FCC.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration-JP.conf b/uwb/calibration-JP.conf index 463dada..f1b54e2 100644 --- a/uwb/calibration-JP.conf +++ b/uwb/calibration-JP.conf @@ -16,7 +16,7 @@ ant0.ch9.ref_frame3.tx_power_index=32:32:32:32 ant0.ch9.ref_frame4.tx_power_index=41:41:41:41 ant0.ch9.ref_frame5.tx_power_index=40:40:40:40 ant0.ch9.ref_frame6.tx_power_index=35:35:35:35 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0xff @@ -65,7 +65,7 @@ ant1.ch9.ref_frame3.tx_power_index=34:34:34:34 ant1.ch9.ref_frame4.tx_power_index=3C:3C:3C:3C ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B ant1.ch9.ref_frame6.tx_power_index=30:30:30:30 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0xff diff --git a/uwb/calibration-TW.conf b/uwb/calibration-TW.conf index fcac264..5287210 100644 --- a/uwb/calibration-TW.conf +++ b/uwb/calibration-TW.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration-default.conf b/uwb/calibration-default.conf index f579c20..0b44c81 100644 --- a/uwb/calibration-default.conf +++ b/uwb/calibration-default.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration.conf b/uwb/calibration.conf index a985e8a..4c16545 100644 --- a/uwb/calibration.conf +++ b/uwb/calibration.conf @@ -34,6 +34,8 @@ ant3.ch9.pa_gain_offset=0x00 #Coex wifi_coex_mode=01 -wifi_coex_time_gap_t1=01 +wifi_coex_time_gap=01 ch5.wifi_coex_enabled=01 ch9.wifi_coex_enabled=01 + +dual_rx_auto.accum_period=0x00 \ No newline at end of file diff --git a/uwb/configuration.conf b/uwb/configuration.conf index 16b9f36..68d3cab 100644 --- a/uwb/configuration.conf +++ b/uwb/configuration.conf @@ -2,6 +2,19 @@ [FIRA]ant_sets.ch5.range.rx_ant_set_ranging = 0 [FIRA]ant_sets.ch5.range.tx_ant_set_nonranging = 0 [FIRA]ant_sets.ch5.range.tx_ant_set_ranging = 0 +[FIRA]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth.rx_ant_set_ranging = 1 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_ranging = 1 +[FIRA]ant_sets.ch5.elevation.rx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch5.elevation.rx_ant_set_ranging = 2 +[FIRA]ant_sets.ch5.elevation.tx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch5.elevation.tx_ant_set_ranging = 2 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation = 2 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging = 1 [FIRA]ant_sets.ch9.range.rx_ant_set_nonranging = 0 [FIRA]ant_sets.ch9.range.rx_ant_set_ranging = 0 [FIRA]ant_sets.ch9.range.tx_ant_set_nonranging = 0 @@ -119,4 +132,4 @@ post_tx.pattern_data=DD:DD:DD:DD:77:77:77:77 post_tx.pattern_repetitions=0x0002 # Ipatov / STS time difference threshold -ip_sts_sanity_thres_q2=0x48 +ip_sts_sanity_thres_q2=0x0A From aba93465369b4a93d1176b616d865f5dc15324bf Mon Sep 17 00:00:00 2001 From: Hasan Awais Date: Thu, 7 Dec 2023 11:24:12 -0800 Subject: [PATCH 3/5] uwb: add config entry for firmware v7.2.7 Bug: 327447971 Change-Id: I84b83a9c9d92a540f25c9492ffa8e771bfb2c9e3 Signed-off-by: Hasan Awais --- uwb/configuration.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uwb/configuration.conf b/uwb/configuration.conf index 16b9f36..e36609b 100644 --- a/uwb/configuration.conf +++ b/uwb/configuration.conf @@ -29,6 +29,8 @@ [CCC]ant_sets.ch9.range.tx_ant_set_nonranging = 0 [CCC]ant_sets.ch9.range.tx_ant_set_ranging = 0 +[HAL]session_error_monitor_enable = 1 + # Antenna Configuration ant0.config=01 ant1.config=02 From 07379fae8b81a4238b8974f508c2ff8e00647d81 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 15 Feb 2024 02:21:55 +0000 Subject: [PATCH 4/5] Update shiba SVN to 21 Bug: 325156176 Change-Id: I864730ffcb48d6107531db9fcb6d2be962139b6b --- device-shiba.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-shiba.mk b/device-shiba.mk index 75730c0..2c5a532 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -378,7 +378,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ From 693daacfbe20d9f99bd2779b6f9807b23f49d604 Mon Sep 17 00:00:00 2001 From: Sam Paradis Date: Wed, 31 Jan 2024 23:27:56 +0000 Subject: [PATCH 5/5] Change FACE_UNLOCK_BOOST to Maximize CPU Frequency This is part of an optimization that limits the length and prevelance of this power hint. Strict, ultra-agression minimizes power and latency versus always-on mid aggression. Bug: 297964952 Change-Id: I384f2e04f69d570e10c8e52f2818c1ecde6be1a0 --- perf/powerhint-husky.json | 16 +++++----------- perf/powerhint-ripcurrent.json | 16 +++++----------- perf/powerhint-shiba.json | 16 +++++----------- 3 files changed, 15 insertions(+), 33 deletions(-) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 78206c8..987ecf8 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2712,25 +2712,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1852000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 0eb4107..5735e66 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2501,25 +2501,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1852000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, { diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index d272dbf..90ed3b1 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2616,25 +2616,19 @@ { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, + "Duration": 500, "Value": "9999999" }, { "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 1000, - "Value": "1" + "Node": "CPUBigClusterMinFreq", + "Duration": 500, + "Value": "1852000" }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 1000, + "Duration": 500, "Value": "1" }, {