From ee38ca56739d7c26c627d8c2ab312be57c04972f Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Fri, 14 Apr 2023 22:48:00 +0000 Subject: [PATCH 1/6] Add POWER_EFFICIENCY uclamp max to adpf config Add the "UclampMax_EfficientBase" value to the ADPF config in the powerhint.json to specify efficient core scheduling in the static case, and "UclampMax_EfficientOffset" for the dynamic case, for this device. Bug: 277285195 Test: manual Change-Id: I408f207d41271fdf9ae7892ca89efa3bc02c2625 --- perf/powerhint-husky.json | 12 ++++++++++++ perf/powerhint-ripcurrent.json | 12 ++++++++++++ perf/powerhint-shiba.json | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 265c778..cc902c3 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -2750,6 +2750,8 @@ "UclampMin_Init": 231, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2774,6 +2776,8 @@ "UclampMin_Init": 161, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2798,6 +2802,8 @@ "UclampMin_Init": 161, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2825,6 +2831,8 @@ "UclampMin_Init": 250, "UclampMin_High": 196, "UclampMin_Low": 196, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2849,6 +2857,8 @@ "UclampMin_Init": 250, "UclampMin_High": 52, "UclampMin_Low": 52, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2873,6 +2883,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 4118b77..7eeadff 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -2465,6 +2465,8 @@ "UclampMin_Init": 231, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2489,6 +2491,8 @@ "UclampMin_Init": 161, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2513,6 +2517,8 @@ "UclampMin_Init": 161, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2540,6 +2546,8 @@ "UclampMin_Init": 250, "UclampMin_High": 196, "UclampMin_Low": 196, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2564,6 +2572,8 @@ "UclampMin_Init": 250, "UclampMin_High": 52, "UclampMin_Low": 52, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2588,6 +2598,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 4fb526c..926ad45 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -2660,6 +2660,8 @@ "UclampMin_Init": 231, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2684,6 +2686,8 @@ "UclampMin_Init": 161, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2708,6 +2712,8 @@ "UclampMin_Init": 161, "UclampMin_High": 480, "UclampMin_Low": 2, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "SamplingWindow_P": 1, "SamplingWindow_I": 0, "SamplingWindow_D": 1, @@ -2735,6 +2741,8 @@ "UclampMin_Init": 250, "UclampMin_High": 196, "UclampMin_Low": 196, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2759,6 +2767,8 @@ "UclampMin_Init": 250, "UclampMin_High": 52, "UclampMin_Low": 52, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, @@ -2783,6 +2793,8 @@ "UclampMin_Init": 250, "UclampMin_High": 0, "UclampMin_Low": 0, + "UclampMax_EfficientBase": 500, + "UclampMax_EfficientOffset": 200, "ReportingRateLimitNs": 1, "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, From 7238f5c62e3056cdbb5c1c4d9f41964e135222e6 Mon Sep 17 00:00:00 2001 From: Benson Li Date: Mon, 15 Apr 2024 12:14:13 +0000 Subject: [PATCH 2/6] Add system property for concurrent encryption on LE and BR/EDR Bug: 330704060 Change-Id: I31f8bcb49359473d52474231b6e777c62109ae51 Test: make --- device-husky.mk | 4 ++++ device-ripcurrent.mk | 4 ++++ device-shiba.mk | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 8baa722..9b613ee 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -240,6 +240,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 39e892d..39c3160 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -191,6 +191,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service diff --git a/device-shiba.mk b/device-shiba.mk index 71f29ac..91fdcc6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -227,6 +227,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true From 1223265afb17e9f7d7ac0195266fa0123a92d2d6 Mon Sep 17 00:00:00 2001 From: Nelson Li Date: Fri, 26 Apr 2024 06:28:04 +0000 Subject: [PATCH 3/6] Convert p23_common/preloaded_nanoapps.json's .mk file to Android.bp. p23_common includes 4 devices. Since `preloaded_nanoapps.json` has different configurations for `factory` products and `non-factory` products, `soong_namespace {}` needs to be added to the converted Android.bp file to avoid misuse. Additionally, due to ag/27008138, ag/27046793, ag/27008143, and ag/27056982, a common inheritance layer has been added to all `non-factory` products. Therefore, setting different `PRODUCT_SOONG_NAMESPACES` in the corresponding `_generic.mk` and `factory_.mk` files will allow factory products and non-factory products to use different preloaded_nanoapps.json. Bug: 332219400 Test: 1. lunch -trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 2. Check ./out/target/product//.../preloaded_nanoapps.json It should be the version. 3. lunch factory_-trunk_staging-userdebug && \ m -j preloaded_nanoapps.json 4. Check ./out/target/product//.../preloaded_nanoapps.json It should be the factory version. Change-Id: Ife53dddd3469de8eacb6d862bc1b8d9de3ce427e --- factory_husky.mk | 3 +++ factory_ripcurrent.mk | 3 +++ factory_shiba.mk | 3 +++ husky_generic.mk | 3 +++ ripcurrent_generic.mk | 3 +++ shiba_generic.mk | 3 +++ 6 files changed, 18 insertions(+) diff --git a/factory_husky.mk b/factory_husky.mk index 5c2c0ce..c44fc7e 100644 --- a/factory_husky.mk +++ b/factory_husky.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk index b7c64c5..17cf8e8 100644 --- a/factory_ripcurrent.mk +++ b/factory_ripcurrent.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_sb3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_shiba.mk b/factory_shiba.mk index d20f113..2564bfe 100644 --- a/factory_shiba.mk +++ b/factory_shiba.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/husky_generic.mk b/husky_generic.mk index 2bf7caf..61489f4 100644 --- a/husky_generic.mk +++ b/husky_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/shusky/device-husky.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/ripcurrent_generic.mk b/ripcurrent_generic.mk index bb1afb3..3789f83 100644 --- a/ripcurrent_generic.mk +++ b/ripcurrent_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/shusky/device-ripcurrent.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/shiba_generic.mk b/shiba_generic.mk index 064301e..f08b683 100644 --- a/shiba_generic.mk +++ b/shiba_generic.mk @@ -15,3 +15,6 @@ # $(call inherit-product, device/google/shusky/device-shiba.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common From 9cb8882df2a36c469e2f438ac340ba0d71a36a4c Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Mon, 29 Apr 2024 11:24:27 -0700 Subject: [PATCH 4/6] 16kb: Update shusky pgagnostic target configuration The shusky target configuration will support: - Developer option to switch to 16kb kernel - 16kb elf alignment for the android platform Test: source build/envsetup.sh lunch aosp_husky_pgagnostic-trunk-userdebug m Bug: 308663811 Change-Id: I935a3fe7924f1ce2144c5da6b7bddb70247fc8c9 --- aosp_husky_pgagnostic.mk | 5 +++-- aosp_shiba_pgagnostic.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aosp_husky_pgagnostic.mk b/aosp_husky_pgagnostic.mk index 0b10a4e..c005922 100644 --- a/aosp_husky_pgagnostic.mk +++ b/aosp_husky_pgagnostic.mk @@ -16,10 +16,11 @@ $(call inherit-product, device/google/shusky/aosp_husky.mk) PRODUCT_NAME := aosp_husky_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF +PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 +PRODUCT_16K_DEVELOPER_OPTION := true TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/aosp_shiba_pgagnostic.mk b/aosp_shiba_pgagnostic.mk index 9d2434c..91a9992 100644 --- a/aosp_shiba_pgagnostic.mk +++ b/aosp_shiba_pgagnostic.mk @@ -16,10 +16,11 @@ $(call inherit-product, device/google/shusky/aosp_shiba.mk) PRODUCT_NAME := aosp_shiba_pgagnostic -PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF +PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true -PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384 +PRODUCT_16K_DEVELOPER_OPTION := true TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 From 4604f3b565ff84d02259db2a48e140c26ffb2d02 Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Mon, 29 Apr 2024 20:22:12 +0000 Subject: [PATCH 5/6] 16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets Test: source build/envsetup.sh lunch aosp_{shiba,husky}-trunk_staging-userdebug get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO Bug: 310232825 Change-Id: Ib005384c58912f53a3294512a175d1c6fd78dbf6 --- device-husky.mk | 2 ++ device-shiba.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index fbb5e6c..834613c 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -456,3 +456,5 @@ PRODUCT_PACKAGES += \ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/device-shiba.mk b/device-shiba.mk index e5d6fcd..ef8a9ed 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -424,3 +424,5 @@ PRODUCT_PACKAGES += \ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) endif + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true From cdc8605b959d5d7b0545b1a3a3176f68f81e84fc Mon Sep 17 00:00:00 2001 From: Vilas Bhat Date: Mon, 29 Apr 2024 20:22:12 +0000 Subject: [PATCH 6/6] 16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets Test: source build/envsetup.sh lunch aosp_{shiba,husky}-trunk_staging-userdebug get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO Bug: 310232825 Merged-In: Ib005384c58912f53a3294512a175d1c6fd78dbf6 Change-Id: Ib202adce4cf34c0e30aaa6c27a4c9a18a37f8797 --- device-husky.mk | 2 ++ device-shiba.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/device-husky.mk b/device-husky.mk index 003e33d..18d24b9 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -439,3 +439,5 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PACKAGES += \ NfcOverlayHusky \ + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true diff --git a/device-shiba.mk b/device-shiba.mk index f7879f6..e3e0679 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -405,3 +405,5 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_PACKAGES += \ NfcOverlayShiba + +PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true