From d790cec56965464a9eb53ace6b047fdb92105c3f Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 26 Jan 2024 12:50:28 +0000 Subject: [PATCH 1/3] Disable stripping vendor_dlkm modules Need to disable stripping the vendor_dlkm modules to retain the GKI modules' signature. Fortunately, the kernel build strips the modules for us. Bug: 290274601 Bug: 322457552 Change-Id: I4c8ff2196d062dc65a1f707a738f78bc8bfda704 Signed-off-by: Robin Peng --- BoardConfig-common.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 6fd0c2a7..2fdbc7ff 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -348,6 +348,14 @@ KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist +# Since Pixel 6/6pro doesn't have a system_dlkm partition, the GKI modules are +# on the vendor_dlkm partition. In order to allow them to load properly, we +# need to retain the module signature which would normally get stripped during +# packaging. Disable stripping the vendor_dlkm modules to retain the GKI +# modules' signature. Note, the pixel kernel builds always strip the modules in +# favor of saving space via the kleaf property: strip_modules = True. +BOARD_DO_NOT_STRIP_VENDOR_MODULES := true + # Prebuilt kernel modules that are *not* listed in vendor_boot.modules.load BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140/fips140.ko BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k))) From 34f3ee5073cbe8d99533120e71e285e71c633b3d Mon Sep 17 00:00:00 2001 From: kierancyphus Date: Wed, 24 Jan 2024 15:23:17 +0800 Subject: [PATCH 2/3] liboemservice_proxy: Remove service defs `Liboemservice_proxy` was originally included as a part of the build target for DMD, which meant that the binder aidl declaration had to be done on all devices that used DMD (all Lassen devices), even if they didn't use the service. `Liboemservice_proxy` has now been decoupled from DMD so it only needs to be included on our target devices now. This CL removes the outdated service definitions. Test: Build gs101 and ensure it still builds. Bug: 321867236 Change-Id: Iefd8a4e563c41ffc5221810e3fb042dbe4a3e733 --- device_framework_matrix_product.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index a77e5b36..280c120f 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -142,14 +142,6 @@ sced0 - - com.google.pixel.modem.logmasklibrary - 1 - - ILiboemserviceProxy - default - - vendor.samsung_slsi.telephony.hardware.radioExternal 1.1 From 9f8d68108898e598a6b498b3c5e11f68215e06cb Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 29 Jan 2024 11:26:08 +0800 Subject: [PATCH 3/3] powerstats: expose display MRR state residency data provider Bug: 321848496 Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest Change-Id: I967210bef1d33d8bc344ea80e6c31f70a3414604 Signed-off-by: Darren Hsu --- powerstats/Gs101CommonDataProviders.cpp | 7 +++++++ powerstats/include/Gs101CommonDataProviders.h | 1 + 2 files changed, 8 insertions(+) diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp index 035810b4..615bb164 100644 --- a/powerstats/Gs101CommonDataProviders.cpp +++ b/powerstats/Gs101CommonDataProviders.cpp @@ -18,6 +18,7 @@ #include #include "AocStateResidencyDataProvider.h" #include "DevfreqStateResidencyDataProvider.h" +#include #include "DvfsStateResidencyDataProvider.h" #include "UfsStateResidencyDataProvider.h" #include @@ -34,6 +35,7 @@ using aidl::android::hardware::power::stats::AocStateResidencyDataProvider; using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider; +using aidl::android::hardware::power::stats::DisplayMrrStateResidencyDataProvider; using aidl::android::hardware::power::stats::DvfsStateResidencyDataProvider; using aidl::android::hardware::power::stats::UfsStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; @@ -669,6 +671,11 @@ void addPixelStateResidencyDataProvider(std::shared_ptr p) { p->addStateResidencyDataProvider(std::move(pixelSdp)); } +void addDisplayMrr(std::shared_ptr p) { + p->addStateResidencyDataProvider(std::make_unique( + "Display", "/sys/class/drm/card0/device/primary-panel/")); +} + void addGs101CommonDataProviders(std::shared_ptr p) { setEnergyMeter(p); diff --git a/powerstats/include/Gs101CommonDataProviders.h b/powerstats/include/Gs101CommonDataProviders.h index 98e69538..469d5143 100644 --- a/powerstats/include/Gs101CommonDataProviders.h +++ b/powerstats/include/Gs101CommonDataProviders.h @@ -22,4 +22,5 @@ using aidl::android::hardware::power::stats::PowerStats; void addGs101CommonDataProviders(std::shared_ptr p); +void addDisplayMrr(std::shared_ptr p); void addNFC(std::shared_ptr p, const std::string& path);