Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 10347638 from d5f156f654 to udc-qpr1-release

Browse source 
Change-Id: I22df732f60a1f340018a1dffb994bb329da93b10
This commit is contained in:
Android Build Coastguard Worker 2023-06-20 01:07:30 +00:00
commit 42732a7572
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
device-common.mk
View file

@ -25,9 +25,6 @@ PRODUCT_COPY_FILES += \
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 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 # Set system properties identifying the chipset
PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Google
TARGET_VENDOR_PROP += device/google/zuma/vendor.prop TARGET_VENDOR_PROP += device/google/zuma/vendor.prop
@ -55,4 +52,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.android.se=off
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.app.com.google.android.bluetooth=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.app.com.android.nfc=off
PRODUCT_PRODUCT_PROPERTIES += persist.arm64.memtag.system_server=off
endif endif

1
device.mk
View file

@ -36,6 +36,7 @@ include device/google/gs-common/radio/dump.mk
include device/google/gs-common/gear/dumpstate/aidl.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/umfw_stat/umfw_stat.mk
include device/google/gs-common/widevine/widevine.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 include device/google/zuma/dumpstate/item.mk

13
powerstats/ZumaCommonDataProviders.cpp
View file

@ -613,13 +613,16 @@ void addTPU(std::shared_ptr<PowerStats> p) {
stateCoeffs = { stateCoeffs = {
// TODO (b/197721618): Measuring the TPU power numbers // TODO (b/197721618): Measuring the TPU power numbers
{"226000", 10}, {"226000", 10},
{"627000", 20}, {"455000", 20},
{"845000", 30}, {"627000", 30},
{"1066000", 40}}; {"712000", 40},
{"845000", 50},
{"967000", 60},
{"1119000", 70}};
p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p, p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer(p,
EnergyConsumerType::OTHER, "TPU", {"S10M_VDD_TPU"}, EnergyConsumerType::OTHER, "TPU", {"S7M_VDD_TPU"},
{{UID_TIME_IN_STATE, "/sys/class/edgetpu/edgetpu-soc/device/tpu_usage"}}, {{UID_TIME_IN_STATE, "/sys/devices/platform/1a000000.rio/tpu_usage"}},
stateCoeffs)); stateCoeffs));
} }