From 4293b68380c103bf293ac62dad64223274f282e1 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 5 Jan 2022 14:44:44 -0800 Subject: [PATCH 1/5] 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 e87a8891..5a0f14d2 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 From 3fec66cbb6d85169cba0410aa104f56ded0b48f6 Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux Date: Fri, 4 Mar 2022 13:27:02 +0000 Subject: [PATCH 2/5] Removed audio A2dp and Hearing Aid from device.mk Bug: 220306859 Test: atest Tag: #feature Change-Id: Ia1d4fbe0e406e895d295936c524c5dbba6c269cd --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 68e80ca9..6a824e2c 100644 --- a/device.mk +++ b/device.mk @@ -996,7 +996,6 @@ PRODUCT_PACKAGES += \ audio_spk_35l41 \ audio.usb.default \ audio.usbv2.default \ - audio.a2dp.default \ audio.bluetooth.default \ audio.r_submix.default \ libamcsextfile \ From 264b325dd1dfd7b1e66c72b178b175d57e48ecfb Mon Sep 17 00:00:00 2001 From: chungkai Date: Thu, 10 Mar 2022 19:02:09 +0000 Subject: [PATCH 3/5] Enable load kernel modules in parallel Test: enable successfully Bug: 180676019 Signed-off-by: chungkai Change-Id: I61678ea8123123af4a4b1d2b45a3cf78bfd5d4f7 --- BoardConfig-common.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index f0a226a8..2487d419 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -382,6 +382,9 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100 # Enable larger logbuf BOARD_KERNEL_CMDLINE += log_buf_len=1024K +# Enable load module in parallel +BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true + # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000 From cce5e9f8b0982a8a1093e0fa2f14d0330ec50963 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Thu, 24 Mar 2022 07:56:43 +0800 Subject: [PATCH 4/5] powerstats: add AoC restart count stats Bug: 226173008 Test: dump power stats and verify restart count increased Change-Id: Ia0cfcd9f9dae68dc21c33074147e8b6db547ebc9 Signed-off-by: Darren Hsu --- powerstats/Gs101CommonDataProviders.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp index 05d009fb..13e6b71f 100644 --- a/powerstats/Gs101CommonDataProviders.cpp +++ b/powerstats/Gs101CommonDataProviders.cpp @@ -79,6 +79,23 @@ void addAoC(std::shared_ptr p) { }; p->addStateResidencyDataProvider( std::make_unique(monitorIds, monitorStates)); + + // Add AoC restart count + const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { + .entryCountSupported = true, + .entryCountPrefix = "", + .totalTimeSupported = false, + .lastEntrySupported = false, + }; + const std::vector> restartCountHeaders = { + std::make_pair("RESTART", ""), + }; + std::vector cfgs; + cfgs.emplace_back( + generateGenericStateResidencyConfigs(restartCountConfig, restartCountHeaders), + "AoC-Count", ""); + p->addStateResidencyDataProvider(std::make_unique( + "/sys/devices/platform/19000000.aoc/restart_count", cfgs)); } void addDvfsStats(std::shared_ptr p) { From 293b0c871d4f9387b623a9647fe754459b8b3a50 Mon Sep 17 00:00:00 2001 From: Sam Dubey Date: Fri, 25 Mar 2022 07:33:15 +0000 Subject: [PATCH 5/5] Revert "Enable load kernel modules in parallel" This reverts commit 264b325dd1dfd7b1e66c72b178b175d57e48ecfb. Reason for revert: Boot crashes on gs101 devices Bug: 226705295 Change-Id: Id074bbc5fdc9f747f45d01405f5b08f37e5617f3 --- BoardConfig-common.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 2487d419..f0a226a8 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -382,9 +382,6 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100 # Enable larger logbuf BOARD_KERNEL_CMDLINE += log_buf_len=1024K -# Enable load module in parallel -BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true - # Protected VM firmware BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000