From 975145cc52fbc0fd13bc231dc9f4162de84208cd Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 7 Mar 2023 16:03:21 +0000 Subject: [PATCH 1/4] Assign system_dlkm.modules.load to BOARD_SYSTEM_KERNEL_MODULES_LOAD - BOARD_SYSTEM_KERNEL_MODULES_LOAD is for GKI modules - BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD should not contains GKI modules Bug: 267429528 Bug: 322457552 Change-Id: Ib5da01f861a34edec07e2a958f153c876e5cef10 Signed-off-by: Robin Peng --- BoardConfig-common.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 60cbdd75..8c52a207 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -412,6 +412,12 @@ else BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES) endif +BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/system_dlkm.modules.load)) +ifndef BOARD_SYSTEM_KERNEL_MODULES_LOAD +$(warning system_dlkm.modules.load not found or empty) +endif +BOARD_SYSTEM_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_SYSTEM_KERNEL_MODULES_LOAD))) + # Using BUILD_COPY_HEADERS BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true From c6d819462ef9f2ab4ba10b670015a9b28e64b104 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Mon, 20 Mar 2023 03:35:11 +0000 Subject: [PATCH 2/4] Support system_dlkm modules.blocklist from kernel side assign system_dlkm.modules.blocklist to BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE located from kernel prebuilts folder Bug: 267429528 Bug: 322457552 Change-Id: I912f1a8e0df12e4614c74b870921ca0b47b8383e Signed-off-by: Robin Peng --- BoardConfig-common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 8c52a207..4e34ea20 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -381,6 +381,9 @@ BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR) KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko) +ifneq ($(wildcard $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist),) +BOARD_SYSTEM_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/system_dlkm.modules.blocklist +endif BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist # Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load From 0eb7d38545553b45f301c1c07f8313f5a51db1eb Mon Sep 17 00:00:00 2001 From: kierancyphus Date: Wed, 24 Jan 2024 15:30:04 +0800 Subject: [PATCH 3/4] 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: I7fb10e4013da59f42cff47da6d104deed9b4bb71 --- 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 e598cb86..9d626258 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 ff196ef65a7a4033b9537af8d0611a4c4ba18f48 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 26 Jan 2024 16:22:10 +0800 Subject: [PATCH 4/4] powerstats: expose display MRR state residency data provider Bug: 317767775 Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest Change-Id: I72037cc9d5b35a47ae0173d52bbc57708a593936 Signed-off-by: Darren Hsu --- powerstats/Gs201CommonDataProviders.cpp | 11 +++++++++++ powerstats/include/Gs201CommonDataProviders.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index d6f1af58..2b1f5618 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -37,6 +38,7 @@ using aidl::android::hardware::power::stats::AdaptiveDvfsStateResidencyDataProvider; using aidl::android::hardware::power::stats::AocTimedStateResidencyDataProvider; 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; @@ -608,6 +610,15 @@ void addCamera(std::shared_ptr p) { {"VSYS_PWR_CAM"})); } +void addDisplayMrrByEntity(std::shared_ptr p, std::string name, std::string path) { + p->addStateResidencyDataProvider(std::make_unique( + name, path)); +} + +void addDisplayMrr(std::shared_ptr p) { + addDisplayMrrByEntity(p, "Display", "/sys/class/drm/card0/device/primary-panel/"); +} + void addGs201CommonDataProviders(std::shared_ptr p) { setEnergyMeter(p); diff --git a/powerstats/include/Gs201CommonDataProviders.h b/powerstats/include/Gs201CommonDataProviders.h index 97a70668..6cc81361 100644 --- a/powerstats/include/Gs201CommonDataProviders.h +++ b/powerstats/include/Gs201CommonDataProviders.h @@ -24,6 +24,8 @@ void addAoC(std::shared_ptr p); void addCPUclusters(std::shared_ptr p); void addCamera(std::shared_ptr p); void addDevfreq(std::shared_ptr p); +void addDisplayMrr(std::shared_ptr p); +void addDisplayMrrByEntity(std::shared_ptr p, std::string name, std::string path); void addDvfsStats(std::shared_ptr p); void addGNSS(std::shared_ptr p); void addGs201CommonDataProviders(std::shared_ptr p);