From 8fdd6e65eb29e741440898942bac9d3568d59210 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 12 Jan 2022 08:27:33 -0800 Subject: [PATCH 1/4] powerhint.json: move display wake node earlier Currently it is a KI the vendor group takes time to update through sysfs node. This CL moves display wake earlier than TA boost while waiting for the long term improvement in b/190236772. Bug: 205261899 Test: Build Signed-off-by: Wei Wang Change-Id: Ieb1eb62442e67602605e380b987fe28d1ad2bbd8 --- powerhint.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/powerhint.json b/powerhint.json index 4d047b1c..54f62b3c 100644 --- a/powerhint.json +++ b/powerhint.json @@ -98,6 +98,14 @@ ], "ResetOnInit": true }, + { + "Name": "DisplayWakeup", + "Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup", + "Values": [ + "1", + "0" + ] + }, { "Name": "CPUUtilThreshold", "Path": "/sys/kernel/vendor_sched/util_threshold", @@ -243,14 +251,6 @@ ], "ResetOnInit": true }, - { - "Name": "DisplayWakeup", - "Path": "/sys/devices/platform/1c300000.drmdecon/early_wakeup", - "Values": [ - "1", - "0" - ] - }, { "Name": "LimitFlashCurrent", "Path": "vendor.camera.max_flash_current", From dae7d3ea02eb4617d0274c94d786c42e8a4969d2 Mon Sep 17 00:00:00 2001 From: Pat Tjin Date: Tue, 11 Jan 2022 15:10:07 -0800 Subject: [PATCH 2/4] Move tangor to 64-bit only Bug: 213924541 Test: Build Signed-off-by: Pat Tjin Change-Id: I8e237ab1bf387608331375bee18dbf9b4912e5c1 --- BoardConfig-common.mk | 2 +- aosp_common.mk | 3 ++- device.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index ce7c0b7f..b065cf7e 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := cortex-a55 TARGET_CPU_VARIANT_RUNTIME := cortex-a55 -ifeq (,$(filter %_64,$(TARGET_PRODUCT))) +ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a diff --git a/aosp_common.mk b/aosp_common.mk index 1ad6eb71..e4e68635 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -17,11 +17,12 @@ # # All components inherited here go to system image # -ifeq (,$(filter %_64,$(TARGET_PRODUCT))) +ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) endif + $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) # Enable CSI checking diff --git a/device.mk b/device.mk index 6eef6009..b4d31b9f 100644 --- a/device.mk +++ b/device.mk @@ -18,7 +18,7 @@ include device/google/gs-common/device.mk TARGET_BOARD_PLATFORM := gs101 -ifneq (,$(filter %_64,$(TARGET_PRODUCT))) +ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) LOCAL_64ONLY := _64 endif @@ -899,7 +899,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk) endif -ifeq (,$(filter %_64,$(TARGET_PRODUCT))) +ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT))) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) else $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) From 676247423b9816573a5aa4574802fe5077d57bf4 Mon Sep 17 00:00:00 2001 From: YiHo Cheng Date: Thu, 6 Jan 2022 06:13:20 +0800 Subject: [PATCH 3/4] dumpstate: Add tmu register dump Add tmu register dump in thermal section to get tmu status Bug: 202736838 Test: check tmu register dump info in thermal dumpstate Change-Id: Ife2ff971eaeda2b132658ca2704bf1edde6fd80a --- dumpstate/DumpstateDevice.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 7b98f75b..f5d5862c 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -491,6 +491,12 @@ void DumpstateDevice::dumpThermalSection(int fd) { "for f in /sys/class/thermal/cooling* ; do " "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; " "done"}); + DumpFileToFd(fd, "TMU state:", "/sys/module/gs101_thermal/parameters/tmu_reg_dump_state"); + DumpFileToFd(fd, "TMU current temperature:", "/sys/module/gs101_thermal/parameters/tmu_reg_dump_current_temp"); + DumpFileToFd(fd, "TMU_TOP rise thresholds:", "/sys/module/gs101_thermal/parameters/tmu_top_reg_dump_rise_thres"); + DumpFileToFd(fd, "TMU_TOP fall thresholds:", "/sys/module/gs101_thermal/parameters/tmu_top_reg_dump_fall_thres"); + DumpFileToFd(fd, "TMU_SUB rise thresholds:", "/sys/module/gs101_thermal/parameters/tmu_sub_reg_dump_rise_thres"); + DumpFileToFd(fd, "TMU_SUB fall thresholds:", "/sys/module/gs101_thermal/parameters/tmu_sub_reg_dump_fall_thres"); } // Dump items related to touch From 23a4d7bfb37023a813540d1c8fb0dd5b79436dbc Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 5 Jan 2022 14:44:44 -0800 Subject: [PATCH 4/4] Remove usage of intermediates-dir-for intermediates-dir-for relies on several variables that haven't been set at the time the board configuration runs. The board configuration got around that by using deferred expansion, but deferred expansion is something that starlark doesn't support. Remove intermediates-dir-for by switching to TARGET_RECOVERY_FSTAB_GENRULE, which accepts a genrule module to use instead of a file. Bug: 201700692 Test: Presubmits Change-Id: I6ebb75073abeebce71873f414129759789096b0f --- BoardConfig-common.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index b065cf7e..f775fcc8 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -68,12 +68,7 @@ TARGET_RECOVERY_WIPE := device/google/gs101/conf/recovery.wipe # This is the fstab file that will be included in the recovery image. Note that # recovery doesn't care about the encryption settings, so it doesn't matter # whether we use the normal or the fips fstab here. -# -# Since this is a generated file, it's necessary to use intermediates-dir-for in -# order to refer to it correctly. And since intermediates-dir-for isn't defined -# yet when this file is included, it's necessary to use a deferred variable -# assignment ( = ) rather than an immediate variable assignment ( := ). -TARGET_RECOVERY_FSTAB = $(call intermediates-dir-for,ETC,fstab.gs101)/fstab.gs101 +TARGET_RECOVERY_FSTAB_GENRULE = gen_fstab.gs101 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165