From 30563b426846ba3c80848be69a784c7a3468976c Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Fri, 16 Jun 2023 15:08:25 +0800 Subject: [PATCH 1/3] powerstats: update TPU energy consumer stats Bug: 253702169 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: I24b846527432aa614534cffe637e306b83af1e81 Signed-off-by: Darren Hsu --- powerstats/ZumaCommonDataProviders.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/powerstats/ZumaCommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp index cd841d2c..c7860b94 100644 --- a/powerstats/ZumaCommonDataProviders.cpp +++ b/powerstats/ZumaCommonDataProviders.cpp @@ -612,13 +612,16 @@ void addTPU(std::shared_ptr p) { stateCoeffs = { // TODO (b/197721618): Measuring the TPU power numbers {"226000", 10}, - {"627000", 20}, - {"845000", 30}, - {"1066000", 40}}; + {"455000", 20}, + {"627000", 30}, + {"712000", 40}, + {"845000", 50}, + {"967000", 60}, + {"1119000", 70}}; p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p, - EnergyConsumerType::OTHER, "TPU", {"S10M_VDD_TPU"}, - {{UID_TIME_IN_STATE, "/sys/class/edgetpu/edgetpu-soc/device/tpu_usage"}}, + EnergyConsumerType::OTHER, "TPU", {"S7M_VDD_TPU"}, + {{UID_TIME_IN_STATE, "/sys/devices/platform/1a000000.rio/tpu_usage"}}, stateCoeffs)); } From 02d739e388ed91af30f68dd4183bcf7a026f32e5 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Fri, 16 Jun 2023 16:55:02 -0700 Subject: [PATCH 2/3] Disable MTE in system_server. Bug: 280343521 Test: debuggerd `pidof system_server` | head -30 | grep tagged_addr does not include PR_MTE_ Change-Id: I64e3cf43162c8ab39f45b37240e26c2f25ea964e --- device-common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device-common.mk b/device-common.mk index d71c79dd..0b1ad51d 100644 --- a/device-common.mk +++ b/device-common.mk @@ -55,4 +55,5 @@ PRODUCT_PRODUCT_PROPERTIES += ro.arm64.memtag.bootctl_supported=1 PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.se=off PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=off PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.android.nfc=off +PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off endif From ec838e4c631a3488cb921b945272268ad6c74aa5 Mon Sep 17 00:00:00 2001 From: joeshih Date: Fri, 16 Jun 2023 15:59:25 +0800 Subject: [PATCH 3/3] [SEPolicy]Change to gs-common. Bug: 287167439 Test: Forrest build to verify pass. Change-Id: Ib4350636c006c996c36bf36d13162e40d4f0f7ac --- device-common.mk | 3 --- device.mk | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/device-common.mk b/device-common.mk index 67fb2335..daac6bbd 100644 --- a/device-common.mk +++ b/device-common.mk @@ -25,9 +25,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml -# Factory OTA --include vendor/unbundled_google/packages/FactoryOtaPrebuilt/factoryota.mk - # Set system properties identifying the chipset PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google TARGET_VENDOR_PROP += device/google/zuma/vendor.prop diff --git a/device.mk b/device.mk index ddae34fa..7d283fcb 100644 --- a/device.mk +++ b/device.mk @@ -35,6 +35,7 @@ include device/google/gs-common/radio/dump.mk include device/google/gs-common/gear/dumpstate/aidl.mk include device/google/gs-common/umfw_stat/umfw_stat.mk include device/google/gs-common/widevine/widevine.mk +include device/google/gs-common/sota_app/factoryota.mk include device/google/zuma/dumpstate/item.mk