From 3bebdc87659369986910fdbf8b46f5adb1ab2c52 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 22:04:16 +0000 Subject: [PATCH 01/26] Update oriole SVN to 84 Bug: 342381152 Change-Id: Ia346c23d8446075d901cce4a08b7f7513ab3c496 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index f72aefe..0b74ed1 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -194,7 +194,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=83 + ro.vendor.build.svn=84 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From eb3b22d11c82114e188c6ef220d8dd7f791af947 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 29 May 2024 23:06:58 +0000 Subject: [PATCH 02/26] Update raven SVN to 84 Bug: 342381152 Change-Id: I2b4b94a72115bc2a7f7200ce7469a74cc5bd7114 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index a14a304..8382360 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -198,7 +198,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=83 + ro.vendor.build.svn=84 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 9bef8781e7589000d31226b896a9014b940b9538 Mon Sep 17 00:00:00 2001 From: Cheng Chang Date: Tue, 25 Jun 2024 09:43:41 +0000 Subject: [PATCH 03/26] gps: Set configuration by kernel version Bug: 258364350 Test: Verification at b/258364350. Test: Function verification at b/258364350. Test: Compile and verify the configuration is correct. Change-Id: I6ea5be077c749684ba35d5e41fafbc82144c5392 --- device-oriole.mk | 14 ++++- device-raven.mk | 14 ++++- location/gps.6.1.xml.oriole | 105 +++++++++++++++++++++++++++++++ location/gps.6.1.xml.raven | 105 +++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.oriole | 104 ++++++++++++++++++++++++++++++ location/gps_user.6.1.xml.raven | 104 ++++++++++++++++++++++++++++++ 6 files changed, 442 insertions(+), 4 deletions(-) create mode 100644 location/gps.6.1.xml.oriole create mode 100644 location/gps.6.1.xml.raven create mode 100644 location/gps_user.6.1.xml.oriole create mode 100644 location/gps_user.6.1.xml.raven diff --git a/device-oriole.mk b/device-oriole.mk index 0b74ed1..f41eb7e 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -281,11 +281,21 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps_user.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Enable DeviceAsWebcam support diff --git a/device-raven.mk b/device-raven.mk index 8382360..6d90b66 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -292,11 +292,21 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif else + ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION))) PRODUCT_COPY_FILES += \ - device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/raviole/location/gps_user.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + else + PRODUCT_COPY_FILES += \ + device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + endif endif # Enable DeviceAsWebcam support diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole new file mode 100644 index 0000000..34a4552 --- /dev/null +++ b/location/gps.6.1.xml.oriole @@ -0,0 +1,105 @@ + + + + + + + + + + diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven new file mode 100644 index 0000000..da9c8b4 --- /dev/null +++ b/location/gps.6.1.xml.raven @@ -0,0 +1,105 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole new file mode 100644 index 0000000..2307636 --- /dev/null +++ b/location/gps_user.6.1.xml.oriole @@ -0,0 +1,104 @@ + + + + + + + + + + diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven new file mode 100644 index 0000000..00d9b45 --- /dev/null +++ b/location/gps_user.6.1.xml.raven @@ -0,0 +1,104 @@ + + + + + + + + + + From 065a8c2c8ddb9338cbc3737a5ac929cf169cfc94 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 2 Jul 2024 08:50:11 +0000 Subject: [PATCH 04/26] Remove NewlyIdleBalancer NewlyIdleBalancer is not supported in kernel 6.1, so remvoe it. Besides, the newly idle balance is mainly for ADPF now, the power impact should be much less than before. Bug: 350212757 Test: build pass Change-Id: Ib952e2c492fbc65b2529d997c511631c341e2a34 --- powerhint-oriole.json | 32 -------------------------------- powerhint-raven.json | 32 -------------------------------- 2 files changed, 64 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 9264d09..bdca86d 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -319,14 +319,6 @@ ], "ResetOnInit": true }, - { - "Name": "NewlyIdleBalancer", - "Path": "/proc/vendor_sched/idle_balancer", - "Values": [ - "0", - "1" - ] - }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -1070,12 +1062,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1148,12 +1134,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1208,12 +1188,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1274,12 +1248,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/powerhint-raven.json b/powerhint-raven.json index af6d3c7..1470f54 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -318,14 +318,6 @@ ], "ResetOnInit": true }, - { - "Name": "NewlyIdleBalancer", - "Path": "/proc/vendor_sched/idle_balancer", - "Values": [ - "0", - "1" - ] - }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", @@ -1069,12 +1061,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1147,12 +1133,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_HIGH", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", @@ -1207,12 +1187,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_STANDARD", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", @@ -1273,12 +1247,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "NewlyIdleBalancer", - "Duration": 0, - "Value": "0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From 6a11d1a9da2c7c69862b3f985e81f12ddd8d05d7 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 11 Jul 2024 03:49:32 +0000 Subject: [PATCH 05/26] add device id Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: I68bcd8f9d5d3ff4c078a30cbf09a52a567e9dfe5 --- device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index f41eb7e..4dbe602 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -309,3 +309,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Disable AVF Remote Attestation PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20486 diff --git a/device-raven.mk b/device-raven.mk index 6d90b66..0c0cdda 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -319,3 +319,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Disable AVF Remote Attestation PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true + +# Bluetooth device id +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.device_id.product_id=20487 From 8062fbd55b92f21bfae9671aa1e8e9a0c100780e Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 4 Apr 2024 00:07:01 +0000 Subject: [PATCH 06/26] raviole: Use build_flags for SVN Flag: build.RELEASE_SVN_ORIOLE Flag: build.RELEASE_SVN_RAVEN Bug: 332726030 Change-Id: I60035ec95cf07e8e992981a61738aa6f0a6d22ef --- device-oriole.mk | 9 ++++++++- device-raven.mk | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4dbe602..a91973d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -193,8 +193,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_ORIOLE +TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 0c0cdda..ceba2f7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -197,8 +197,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) endif # Increment the SVN for any official public releases +ifdef RELEASE_SVN_RAVEN +TARGET_SVN ?= $(RELEASE_SVN_RAVEN) +else +# Set this for older releases that don't use build flag +TARGET_SVN ?= 84 +endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=84 + ro.vendor.build.svn=$(TARGET_SVN) # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f7b5e0409681091598a2743ed2190f57bd3306c0 Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Thu, 18 Jul 2024 11:34:37 +0000 Subject: [PATCH 07/26] Update antenna position coordinates Bug: 353895373 Test: manual Flag: EXEMPT bugfix Change-Id: Ic485114a583e43a2e49a1f3168436d168943da90 --- oriole/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- raven/rro_overlays/NfcOverlay/res/values/config.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml index 1b70812..20ac97d 100644 --- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml +++ b/oriole/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 36 - 106 + 51 true diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml index 9545f18..43b0eda 100644 --- a/raven/rro_overlays/NfcOverlay/res/values/config.xml +++ b/raven/rro_overlays/NfcOverlay/res/values/config.xml @@ -30,7 +30,7 @@ 36 - 106 + 61 true From 14c718c22f457c542885edea58c248356b21885b Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:27:52 +0000 Subject: [PATCH 08/26] Update raven SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix Change-Id: I5514206adfd5f86fe1807f09132d5d3e319d45b6 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index ceba2f7..1e3d6ea 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -201,7 +201,7 @@ ifdef RELEASE_SVN_RAVEN TARGET_SVN ?= $(RELEASE_SVN_RAVEN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \ From 419a9a7da3d3208145d728f18b4a4e200c9cd720 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 12 Jul 2024 23:15:18 +0000 Subject: [PATCH 09/26] Update oriole SVN to 85 Bug: 352170103 Flag: EXEMPT bugfix Change-Id: Iffe880b97e0296047b9e2b9c9929d67d09d257b6 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index a91973d..26b112a 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -197,7 +197,7 @@ ifdef RELEASE_SVN_ORIOLE TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 84 +TARGET_SVN ?= 85 endif PRODUCT_VENDOR_PROPERTIES += \ From 25cf133606aaff70868989ed26020dbfb39111e0 Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 25 Jul 2024 20:08:12 +0000 Subject: [PATCH 10/26] Adpf:raviole: switch to multitier heuristic boost. Bug: 344685639 Test: Checked the trace file running on the device. Flag: NONE powerhal doesn't have a flag yet Change-Id: Ib2dea175a3a9ed3b364e6168341aeb3b01d6bed4 --- powerhint-oriole-mainline.json | 33 ++++++++++++++++++--------------- powerhint-oriole.json | 33 ++++++++++++++++++--------------- powerhint-raven-mainline.json | 33 ++++++++++++++++++--------------- powerhint-raven.json | 33 ++++++++++++++++++--------------- powerhint-slider.json | 33 ++++++++++++++++++--------------- powerhint-whitefin.json | 33 ++++++++++++++++++--------------- 6 files changed, 108 insertions(+), 90 deletions(-) diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json index 29dd8ab..ee7eefd 100644 --- a/powerhint-oriole-mainline.json +++ b/powerhint-oriole-mainline.json @@ -1241,11 +1241,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1274,11 +1275,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1307,11 +1309,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 diff --git a/powerhint-oriole.json b/powerhint-oriole.json index bdca86d..2385b5b 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1726,11 +1726,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1760,11 +1761,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1794,11 +1796,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json index a748e0e..b9a8022 100644 --- a/powerhint-raven-mainline.json +++ b/powerhint-raven-mainline.json @@ -1222,11 +1222,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1255,11 +1256,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1288,11 +1290,12 @@ "TargetTimeFactor": 1, "StaleTimeFactor": 15, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 diff --git a/powerhint-raven.json b/powerhint-raven.json index 1470f54..d449cdd 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1707,11 +1707,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1741,11 +1742,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1775,11 +1777,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 15.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 diff --git a/powerhint-slider.json b/powerhint-slider.json index 98f770e..77cc40c 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1513,11 +1513,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1547,11 +1548,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1581,11 +1583,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index a53293f..80bd297 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1480,11 +1480,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1514,11 +1515,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 @@ -1548,11 +1550,12 @@ "TargetTimeFactor": 1.0, "StaleTimeFactor": 20.0, "HeuristicBoost_On": true, - "HBoostOnMissedCycles": 8, - "HBoostOffMaxAvgRatio": 4.0, - "HBoostOffMissedCycles": 5, - "HBoostPidPuFactor": 0.5, - "HBoostUclampMin": 722, + "HBoostModerateJankThreshold": 2, + "HBoostOffMaxAvgDurRatio": 4.0, + "HBoostSevereJankPidPu": 0.5, + "HBoostSevereJankThreshold": 8, + "HBoostUclampMinCeilingRange": [480, 722], + "HBoostUclampMinFloorRange": [230, 410], "JankCheckTimeFactor": 1.2, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 From e5d07d2fad4e5455001b6ac6a264beea4ea410b6 Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Mon, 29 Jul 2024 04:14:56 +0000 Subject: [PATCH 11/26] gps: Enable ExitOnComFailure Enable ExitOnComFailure so gpsd will call exit() instead of calling abort() when com failed due to system performance degradation. Test: on device Bug: 341508348 Change-Id: Ia1af6a5e13307b6ed9887969449e42b3e4eeb1ef --- location/gps.6.1.xml.oriole | 1 + location/gps.6.1.xml.raven | 1 + location/gps.xml | 1 + location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + 5 files changed, 5 insertions(+) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index 34a4552..90abf83 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index da9c8b4..f759bf5 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" diff --git a/location/gps.xml b/location/gps.xml index fb8dd62..ef328be 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 7dc695c..ae9f6fc 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 31cf6c9..baea540 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -56,6 +56,7 @@ AttributionAppPkgName="com.google.android.carrierlocation" AssertEnabled="true" + ExitOnComFailure="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" ReAidingOnHotStart="false" From 3f6f5bdb3835c1ef292f77f4549a3c431cc156ef Mon Sep 17 00:00:00 2001 From: Chris Paulo Date: Mon, 22 Jul 2024 17:13:23 -0700 Subject: [PATCH 12/26] haptics: Update output distortion gain Recommended output distortion gain is 0.32. Bug: 328799172 Test: getprop | grep hapticgenerator Flag: EXEMPT bugfix Change-Id: Ib531803a448122723b631af8b3cd8d765d027fbd --- device-oriole.mk | 4 ++-- device-raven.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 26b112a..bfd2ebe 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -253,8 +253,8 @@ PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service # Override default distortion output gain according to UX experiments -PRODUCT_PRODUCT_PROPERTIES += \ - vendor.audio.hapticgenerator.distortion.output.gain=0.5 +PRODUCT_VENDOR_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.32 # RKPD PRODUCT_PRODUCT_PROPERTIES += \ diff --git a/device-raven.mk b/device-raven.mk index 1e3d6ea..4e09b42 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -261,8 +261,8 @@ PRODUCT_PACKAGES += \ vendor.samsung_slsi.hardware.tetheroffload@1.1-service # Override default distortion output gain according to UX experiments -PRODUCT_PRODUCT_PROPERTIES += \ - vendor.audio.hapticgenerator.distortion.output.gain=0.5 +PRODUCT_VENDOR_PROPERTIES += \ + vendor.audio.hapticgenerator.distortion.output.gain=0.32 # RKPD PRODUCT_PRODUCT_PROPERTIES += \ From efffce035fe2f376642cc733d7cf9950871b12e5 Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Sat, 6 Apr 2024 00:05:53 +0000 Subject: [PATCH 13/26] raviole: Add build_flags based properties for SMR/EMR build Flag: build.RELEASE_IS_SMR Flag: build.RELEASE_IS_EMR Flag: build.RELEASE_BASE_OS_ORIOLE Flag: build.RELEASE_BASE_OS_RAVEN Bug: 155105803 Change-Id: I79f963805e5f96c05c3c388a4b0b70be30f9ce8a --- device-oriole.mk | 19 +++++++++++++++++++ device-raven.mk | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index bfd2ebe..f852140 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -203,6 +203,25 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR builds +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=O6R4B9 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_ORIOLE)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_ORIOLE) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_ORIOLE)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_ORIOLE) + endif +endif + # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ ro.support_hide_display_cutout=true diff --git a/device-raven.mk b/device-raven.mk index 4e09b42..c69116a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -207,6 +207,25 @@ endif PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.build.svn=$(TARGET_SVN) +# Set device family property for SMR +PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.device_family=O6R4B9 + +# Set build properties for SMR builds +ifeq ($(RELEASE_IS_SMR), true) + ifneq (,$(RELEASE_BASE_OS_RAVEN)) + PRODUCT_BASE_OS := $(RELEASE_BASE_OS_RAVEN) + endif +endif + +# Set build properties for EMR builds +ifeq ($(RELEASE_IS_EMR), true) + ifneq (,$(RELEASE_BASE_OS_RAVEN)) + PRODUCT_PROPERTY_OVERRIDES += \ + ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_RAVEN) + endif +endif + # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ ro.support_hide_display_cutout=true From c899c859ae06099979a7625a28ad387703850fc8 Mon Sep 17 00:00:00 2001 From: samou Date: Tue, 16 Jul 2024 07:50:34 +0000 Subject: [PATCH 14/26] thermal: Remove bcl related tzones Flag: EXEMPT tuning changes Bug: 349935208 Test: Confirm boot Change-Id: I3ffdc8fa36d40368ae117141cda79805b140f2b3 Signed-off-by: samou --- powerhint-oriole-mainline.json | 12 --- powerhint-oriole.json | 12 --- powerhint-raven-mainline.json | 12 --- powerhint-raven.json | 12 --- powerhint-slider.json | 12 --- powerhint-whitefin.json | 12 --- thermal_info_config_oriole.json | 158 --------------------------- thermal_info_config_raven.json | 158 --------------------------- thermal_info_config_slider.json | 171 ------------------------------ thermal_info_config_whitefin.json | 171 ------------------------------ 10 files changed, 730 deletions(-) diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json index ee7eefd..57078f2 100644 --- a/powerhint-oriole-mainline.json +++ b/powerhint-oriole-mainline.json @@ -1023,18 +1023,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 2385b5b..239a90d 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1459,18 +1459,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json index b9a8022..9be9f7f 100644 --- a/powerhint-raven-mainline.json +++ b/powerhint-raven-mainline.json @@ -1004,18 +1004,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/powerhint-raven.json b/powerhint-raven.json index d449cdd..fd59158 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1440,18 +1440,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/powerhint-slider.json b/powerhint-slider.json index 77cc40c..1de48ef 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1348,18 +1348,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 80bd297..9a842a3 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1333,18 +1333,6 @@ "Duration": 50, "Value": "1" }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "100" - }, - { - "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE", - "Node": "LimitFlashCurrent", - "Duration": 0, - "Value": "1500" - }, { "PowerHint": "EXPENSIVE_RENDERING", "Node": "PowerHALRenderingState", diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index ad24136..be128fa 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -449,164 +449,6 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":["-10000", "400", "1000"], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":["-10000", "400", "1000"], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"], - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 10, 10] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index 6f3b0d0..eecaacf 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -439,164 +439,6 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":["-10000", "400", "1000"], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "vdroop1", - "Combination":["battery", "battery_cycle", "vdroop1"], - "Coefficient":["-10000", "400", "1000"], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"], - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"batoilo", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "Name":"vdroop1", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 4, 4, 4] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 3, 3, 3] - } - ] - }, - { - "Name":"vdroop2", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 9, 9, 9] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 6, 6, 6] - } - ] - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Monitor":true, - "BindedCdevInfo": [ - { - "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 7, 7, 7] - }, - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 5, 5, 5] - } - ] - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"], - "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], - "Multiplier":1, - "Hidden":true - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json index 16c795c..6034f03 100644 --- a/thermal_info_config_slider.json +++ b/thermal_info_config_slider.json @@ -70,22 +70,6 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, { "Name":"battery", "Type":"BATTERY", @@ -102,161 +86,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1400, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json index 16c795c..6034f03 100644 --- a/thermal_info_config_whitefin.json +++ b/thermal_info_config_whitefin.json @@ -70,22 +70,6 @@ "VrThreshold":"NAN", "Multiplier":0.001 }, - { - "Name":"battery_cycle", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, { "Name":"battery", "Type":"BATTERY", @@ -102,161 +86,6 @@ "Multiplier":0.001, "Monitor":false }, - { - "Name":"critical-battery-cell", - "Type":"BCL_VOLTAGE", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"FLASH_LED_REDUCE", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"COUNT_THRESHOLD", - "TriggerSensor": "smpl_gm", - "Combination":[ - "battery", - "battery_cycle", - "smpl_gm" - ], - "Coefficient":[ - "-10000", - "400", - "1400" - ], - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 3.00, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true, - "SendPowerHint":true - }, - { - "Name":"soc", - "Type":"BCL_PERCENTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 90, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":false - }, - { - "Name":"smpl_gm", - "Type":"BCL_VOLTAGE", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 1400, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":1, - "Monitor":true - }, - { - "Name":"ocp_cpu1", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 7, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_cpu2", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_tpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 10.5, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, - { - "Name":"ocp_gpu", - "Type":"BCL_CURRENT", - "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - 12, - "NAN", - "NAN" - ], - "VrThreshold":"NAN", - "Multiplier":0.001, - "Monitor":false - }, { "Name":"TPU", "Type":"NPU", From 121db9afdc9a19eebcfeab27c45a246e9400c84f Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Fri, 9 Aug 2024 00:08:23 +0000 Subject: [PATCH 15/26] Update raven SVN to 86 Bug: 352170103 Change-Id: I0e619e253903e15d0a3a56b243349ea92c20d041 Flag: EXEMPT bugfix --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index c69116a..e1c2b1b 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -201,7 +201,7 @@ ifdef RELEASE_SVN_RAVEN TARGET_SVN ?= $(RELEASE_SVN_RAVEN) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 85 +TARGET_SVN ?= 86 endif PRODUCT_VENDOR_PROPERTIES += \ From d245dbc7aa2478ba0ab1fdccf8e834ac5d856034 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Thu, 8 Aug 2024 21:16:22 +0000 Subject: [PATCH 16/26] Update oriole SVN to 86 Bug: 352170103 Change-Id: I7bdd4b0fa902b1b04936ad2a3825331988019d12 Flag: EXEMPT bugfix --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index f852140..e22fb6e 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -197,7 +197,7 @@ ifdef RELEASE_SVN_ORIOLE TARGET_SVN ?= $(RELEASE_SVN_ORIOLE) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 85 +TARGET_SVN ?= 86 endif PRODUCT_VENDOR_PROPERTIES += \ From 944eebcd15152bae037acfafb378b6be338dcc11 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 08:46:05 +0000 Subject: [PATCH 17/26] thermal:remove unused state2power value Bug: 355566259 Test: Build test Change-Id: Iacb553f7a0106b955709dfa346bbd39fef5253ae Signed-off-by: Peter (YM) --- thermal_info_config_oriole.json | 12 ++++-------- thermal_info_config_oriole_WHI_A.json | 12 ++++-------- thermal_info_config_raven.json | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index be128fa..2a57b61 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -469,26 +469,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["4406", "3874", "3500", "3052", "2704", "2334", "2176", "1864", "1492", "1362", "1116", "908", "756", "594", "478", "388", "178"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":["4599", "3727", "3259", "2378", "2044", "1813", "1449", "1223", "1007", "804", "633", "452"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"fcc", diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json index fa7398d..aa59ee5 100644 --- a/thermal_info_config_oriole_WHI_A.json +++ b/thermal_info_config_oriole_WHI_A.json @@ -717,26 +717,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["420", "332", "268", "212", "176", "148", "108", "80", "56", "24"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1216", "1018", "842", "686", "538", "428", "336", "274", "212", "178", "146", "118", "86", "56"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["2322", "1992", "1674", "1412", "1168", "936", "766", "590", "474", "394", "310", "162"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":["2580", "2033", "1427", "826", "358"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"tpu_cooling", diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index eecaacf..fe72c6b 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -459,26 +459,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":["4208", "3692", "3370", "2898", "2562", "2240", "2084", "1780", "1424", "1276", "1042", "858", "714", "560", "448", "364", "166"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":["4371", "3543", "3085", "2293", "1927", "1707", "1394", "1171", "967", "768", "592", "433"] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"fcc", From 031d28881e1abd1150a25ff98e7be348504be25b Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Fri, 16 Aug 2024 06:17:39 +0000 Subject: [PATCH 18/26] thermal: read thermistor temp from sysfs - avoid wrong sensor value reading for thermalHAL Bug: 327327502 Test: Build to boot to home Flag: EXEMPT (bug 337358613) Change-Id: Ie14fa095f695aa6d02f9a73016fe1952943b8b71 Signed-off-by: Peter (YM) --- thermal_info_config_charge_oriole.json | 6 ------ thermal_info_config_charge_raven.json | 7 ------- thermal_info_config_oriole.json | 7 ------- thermal_info_config_oriole_WHI_A.json | 3 --- thermal_info_config_raven.json | 7 ------- 5 files changed, 30 deletions(-) diff --git a/thermal_info_config_charge_oriole.json b/thermal_info_config_charge_oriole.json index 280dd33..17908e9 100644 --- a/thermal_info_config_charge_oriole.json +++ b/thermal_info_config_charge_oriole.json @@ -27,7 +27,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -43,7 +42,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -59,7 +57,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -84,7 +81,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -102,7 +98,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -127,7 +122,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, diff --git a/thermal_info_config_charge_raven.json b/thermal_info_config_charge_raven.json index 411383b..bb0c1c4 100644 --- a/thermal_info_config_charge_raven.json +++ b/thermal_info_config_charge_raven.json @@ -27,7 +27,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -43,7 +42,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -59,7 +57,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -84,7 +81,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -102,7 +98,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -127,7 +122,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -145,7 +139,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json index 2a57b61..e218126 100644 --- a/thermal_info_config_oriole.json +++ b/thermal_info_config_oriole.json @@ -19,25 +19,21 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -45,7 +41,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", "35.0", "NAN","NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -53,7 +48,6 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -61,7 +55,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", "32.9", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json index aa59ee5..1a74ade 100644 --- a/thermal_info_config_oriole_WHI_A.json +++ b/thermal_info_config_oriole_WHI_A.json @@ -36,7 +36,6 @@ 0.0, 0.0 ], - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001, "PollingDelay":60000, @@ -54,7 +53,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, @@ -70,7 +68,6 @@ "NAN", "NAN" ], - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "VrThreshold":"NAN", "Multiplier":0.001 }, diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json index fe72c6b..45c9326 100644 --- a/thermal_info_config_raven.json +++ b/thermal_info_config_raven.json @@ -19,19 +19,16 @@ { "Name":"neutral_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"gnss_tcxo_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { "Name":"qi_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -39,7 +36,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", "32.2", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -47,7 +43,6 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { @@ -55,7 +50,6 @@ "Type":"UNKNOWN", "HotThreshold":["NAN", "40.0", "NAN","NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], - "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000 @@ -63,7 +57,6 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", "Multiplier":0.001 }, { From 6b354fade5a59b45e01b5fda7ed6e5d19f8126ca Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Mon, 12 Aug 2024 17:05:58 +0800 Subject: [PATCH 19/26] gps: add CpEarlyFixGuardTimeSec to prevent earlyfix response delay Bug: 358041425 Test: verify pass Change-Id: I1e59fd67d4e8cd8d30c374d276a0a7e44b9d893d --- location/gps.6.1.xml.oriole | 1 + location/gps.6.1.xml.raven | 1 + location/gps.xml | 1 + location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + location/gps_user.6.1.xml.oriole | 1 + location/gps_user.6.1.xml.raven | 1 + location/gps_user.xml | 1 + location/gps_user.xml.oriole | 1 + location/gps_user.xml.raven | 1 + 10 files changed, 10 insertions(+) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index 90abf83..876e529 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index f759bf5..0e0def8 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml b/location/gps.xml index ef328be..41b8c48 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index ae9f6fc..324c0f2 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index baea540..9e067d4 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -49,6 +49,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index 2307636..a5e6383 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 00d9b45..11a47a5 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index a5a4066..5aaf918 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index e04f9fe..414fee5 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index c132781..f6775ad 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -48,6 +48,7 @@ LtoSyncThresholdDays="1" GnssYearOfHardware="2020" + CpEarlyFixGuardTimeSec="1" CpGuardTimeSec="1" CpLppGuardTimeSec="1" IgnoreInjectedSystemTime="true" From d26fec9d636ba961a95bad9b300fd78a73b1cc0c Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Tue, 27 Aug 2024 06:25:49 +0000 Subject: [PATCH 20/26] gps: Re-enable GLO & QZSS in US Test: on-device Bug: 353579502 Change-Id: I2dd2560b9d8102829c07c027e01f36125e87cd69 --- location/gps.6.1.xml.oriole | 2 ++ location/gps.6.1.xml.raven | 2 ++ location/gps.xml | 2 ++ location/gps.xml.oriole | 2 ++ location/gps.xml.raven | 2 ++ location/gps_user.6.1.xml.oriole | 2 ++ location/gps_user.6.1.xml.raven | 2 ++ location/gps_user.xml | 2 ++ location/gps_user.xml.oriole | 2 ++ location/gps_user.xml.raven | 2 ++ 10 files changed, 20 insertions(+) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index 876e529..f442e3a 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -99,6 +99,8 @@ /> diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index 0e0def8..3726311 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml b/location/gps.xml index 41b8c48..76eb81e 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 324c0f2..1171998 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -99,6 +99,8 @@ /> diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 9e067d4..8ca7eeb 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -99,6 +99,8 @@ /> diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index a5e6383..ccea80d 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 11a47a5..2230ace 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml b/location/gps_user.xml index 5aaf918..405b8b6 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index 414fee5..c29ae2c 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -97,6 +97,8 @@ /> diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index f6775ad..41d38c9 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -97,6 +97,8 @@ /> From 6fd62fe96ede96bfe8546e9fd3dc8bb62c0e5845 Mon Sep 17 00:00:00 2001 From: Pindar Yang Date: Thu, 29 Aug 2024 11:58:09 +0000 Subject: [PATCH 21/26] move bootloader and radio build flag to device mk Flag: build.RELEASE_GOOGLE_PRODUCT_RADIO_DIR, build.RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR Bug: 362618412 Change-Id: Id584497948d5ceb854c5f65a076815c5589ec1c8 Signed-off-by: Pindar Yang --- device-oriole.mk | 8 ++++++++ device-raven.mk | 8 ++++++++ device-slider.mk | 4 ++++ device-whitefin.mk | 4 ++++ oriole/BoardConfig.mk | 5 ----- raven/BoardConfig.mk | 5 ----- slider/BoardConfig.mk | 3 --- whitefin/BoardConfig.mk | 3 --- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index e22fb6e..65bff71 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -17,6 +17,14 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_ORIOLE_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) diff --git a/device-raven.mk b/device-raven.mk index e1c2b1b..4ada8b4 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -17,6 +17,14 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) +ifdef RELEASE_GOOGLE_RAVEN_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) + + TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION) # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR) diff --git a/device-slider.mk b/device-slider.mk index 09eb645..9a51f6f 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -14,6 +14,10 @@ # limitations under the License. # +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers diff --git a/device-whitefin.mk b/device-whitefin.mk index f7e19c3..c9be012 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -14,6 +14,10 @@ # limitations under the License. # +RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) +$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) + # Keeps flexibility for kasan and ufs builds TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 757ee50..36affb6 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -24,11 +24,6 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) - ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 06f97ae..eb1a5c8 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -24,11 +24,6 @@ BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 -RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR) -RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)) - ifdef AUTOMOTIVE_PRODUCT_PATH #RBC# include_top device/google/auto_tcu #RBC# include_top device/google/pixel_tcu diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 917b79a..82425d2 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -15,9 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := slider -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 560 USES_DEVICE_GOOGLE_RAVIOLE := true diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index e28f7bf..5b5a07a 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -15,9 +15,6 @@ # TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := whitefin -RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000 -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR) -$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)) TARGET_SCREEN_DENSITY := 440 USES_DEVICE_GOOGLE_RAVIOLE := true From e0fcb2d3ba011bc7a5a2ea08f57d69b70863c486 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Thu, 23 May 2024 15:14:23 -0700 Subject: [PATCH 22/26] oriole/raven: add etm modules in userdebug/eng builds If etm modules aren't built with kernel prebuilts, then add them manually. Bug: 364309766 Bug: 340617717 Bug: 331725877 Test: build and run oriole-trunk_staging-userdebug Flag: build.RELEASE_ETM_IN_USERDEBUG_ENG Change-Id: Iea66467b22086066972b214ba7af553158f80b03 --- device-oriole.mk | 7 +++++++ device-raven.mk | 7 +++++++ oriole/BoardConfig.mk | 6 ++++++ raven/BoardConfig.mk | 6 ++++++ 4 files changed, 26 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index 65bff71..10048c9 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -347,3 +347,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20486 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/device-raven.mk b/device-raven.mk index 4ada8b4..8b790d9 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -357,3 +357,10 @@ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.device_id.product_id=20487 + +# ETM +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif +endif diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 36affb6..00a9a28 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -43,3 +43,9 @@ include device/google/gs101-sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index eb1a5c8..783511a 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -43,3 +43,9 @@ include device/google/gs101-sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk + +ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/BoardUserdebugModules.mk +endif +endif From bad1fd46490edc933770f971527b614221ef95d3 Mon Sep 17 00:00:00 2001 From: Koli Lin Date: Thu, 5 Sep 2024 08:20:53 +0000 Subject: [PATCH 23/26] Update product id for oriole and raven Test: manual Bug: 316248308 Flag: EXEMPT prop value only update Change-Id: Icf766314c7b23ed6cee0cf70eba5fe796d99a8b5 --- device-oriole.mk | 3 ++- device-raven.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 10048c9..95cc084 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -345,8 +345,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Oriole: 0x4106 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20486 + bluetooth.device_id.product_id=16646 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/device-raven.mk b/device-raven.mk index 8b790d9..4ceb39e 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -355,8 +355,9 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true # Bluetooth device id +# Raven: 0x4107 PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.device_id.product_id=20487 + bluetooth.device_id.product_id=16647 # ETM ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) From 74e1b20cc4bac936c873307cbd07d73d5c773c39 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 6 Sep 2024 07:30:23 +0000 Subject: [PATCH 24/26] Symlink current prebuilt folder to android root The Android are now based on Trunk Stable world and Pixel prebuilts CLs also needs to reply with this which controlled by the flag which results: - the flag value might be different on each branches - the flag value are mostly different on each release configuration - for local builds, ENGs' needs to figure out the correct location of current prebuilts by checking through entire prebuilt textproto files To alleviate this problem, create an symlink file under android root indicates current prebuilt path after invoke the android lunch cmd. Bug: 364831620 Flag: EXEMPT export current prebuilt path Change-Id: I43355dc794b94084a9a1d80cc23382781eace1d8 Signed-off-by: Robin Peng --- oriole/BoardConfig.mk | 1 + raven/BoardConfig.mk | 1 + slider/BoardConfig.mk | 1 + whitefin/BoardConfig.mk | 1 + 4 files changed, 4 insertions(+) diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 00a9a28..d77c0ef 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101-sepolicy/oriole-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 783511a..3d474b6 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -42,6 +42,7 @@ include device/google/gs101/BoardConfig-common.mk include device/google/gs101-sepolicy/raven-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk -include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG)) diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk index 82425d2..2224d56 100644 --- a/slider/BoardConfig.mk +++ b/slider/BoardConfig.mk @@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk index 5b5a07a..27f7c98 100644 --- a/whitefin/BoardConfig.mk +++ b/whitefin/BoardConfig.mk @@ -23,3 +23,4 @@ BOARD_BOOTCONFIG += androidboot.selinux=permissive include device/google/gs101/BoardConfig-common.mk include device/google/gs101/wifi/BoardConfig-wifi.mk -include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk +include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk From ccf5dc11ce22ab494849cb67e42dce7bf3774742 Mon Sep 17 00:00:00 2001 From: James Huang Date: Fri, 26 Jul 2024 15:26:01 +0800 Subject: [PATCH 25/26] gps: Enable Beidou measurements only in the US for P21. Bug: 354884462 Test: Field test in the US Change-Id: Ic78e619a04bcdaa767a2236f9a04fbe1d240a6c4 --- location/gps.xml.oriole | 1 + location/gps.xml.raven | 1 + location/gps_user.xml.oriole | 1 + location/gps_user.xml.raven | 1 + 4 files changed, 4 insertions(+) diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 1171998..2f191d6 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -103,6 +103,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 8ca7eeb..3ddfe1c 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -103,6 +103,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index c29ae2c..f935676 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -101,6 +101,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index 41d38c9..ff3c5e2 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -101,6 +101,7 @@ EnableGloAutoSwitch="false" EnableNicAutoSwitch="true" EnableNavic="true" + ConstellationAutoSwitchOffNavOnly="true" /> From ac1bb3f2dac59774df08f33458bea15d1d680313 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 19 Sep 2024 22:46:24 +0800 Subject: [PATCH 26/26] gps: set default SUPL SSL method to SSLv23 Bug: 363886476 Test: verify SUPL NI test pass (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:96a0ec11ba0545a56f6496c5a93ecb570a3ca7f7) Merged-In: Iefe7acffac50ff14447b7d35c9c50e699637aba1 Change-Id: Iefe7acffac50ff14447b7d35c9c50e699637aba1 --- location/gps.6.1.xml.oriole | 2 +- location/gps.6.1.xml.raven | 2 +- location/gps.xml | 2 +- location/gps.xml.oriole | 2 +- location/gps.xml.raven | 2 +- location/gps_user.6.1.xml.oriole | 2 +- location/gps_user.6.1.xml.raven | 2 +- location/gps_user.xml | 2 +- location/gps_user.xml.oriole | 2 +- location/gps_user.xml.raven | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole index f442e3a..df40156 100644 --- a/location/gps.6.1.xml.oriole +++ b/location/gps.6.1.xml.oriole @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven index 3726311..c831068 100644 --- a/location/gps.6.1.xml.raven +++ b/location/gps.6.1.xml.raven @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml b/location/gps.xml index 76eb81e..009aaec 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole index 2f191d6..4833857 100644 --- a/location/gps.xml.oriole +++ b/location/gps.xml.oriole @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps.xml.raven b/location/gps.xml.raven index 3ddfe1c..d663ebf 100644 --- a/location/gps.xml.raven +++ b/location/gps.xml.raven @@ -18,7 +18,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole index ccea80d..0582009 100644 --- a/location/gps_user.6.1.xml.oriole +++ b/location/gps_user.6.1.xml.oriole @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven index 2230ace..c276c11 100644 --- a/location/gps_user.6.1.xml.raven +++ b/location/gps_user.6.1.xml.raven @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 405b8b6..008efb0 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole index f935676..ec8d881 100644 --- a/location/gps_user.xml.oriole +++ b/location/gps_user.xml.oriole @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true" diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven index ff3c5e2..3489a66 100644 --- a/location/gps_user.xml.raven +++ b/location/gps_user.xml.raven @@ -17,7 +17,7 @@ SuplLogFullName="/data/vendor/gps/suplflow.txt" tlsEnable="true" - SuplSslMethod="SSLv23_NO_TLSv1_2" + SuplSslMethod="SSLv23" SuplEnable="true" SuplUseApn="false" SuplUseApnNI="true"