Snap for 8746893 from 78dba379b6 to udc-release

Change-Id: I6909058fd7e43ee8d58c3cc3f0e109131820cfb2
This commit is contained in:
Android Build Coastguard Worker 2022-06-21 03:02:32 +00:00
commit c89846791c
2 changed files with 5 additions and 12 deletions

View file

@ -989,19 +989,10 @@ on property:vendor.thermal.link_ready=1
chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state
chown system system /dev/thermal/cdev-by-name/usbc-port/cur_state
# Create thermal symlink in off charging mode
on charger
mkdir /dev/thermal 0750 system system
mkdir /dev/thermal/tz-by-name 0750 system system
mkdir /dev/thermal/cdev-by-name 0750 system system
start vendor.thermal.symlinks
write /proc/vendor_sched/sys_uclamp_min 0
write /proc/vendor_sched/sys_prefer_idle 0
# Launch thermal hal in off charging mode
on charger && property:vendor.thermal.link_ready=1
start vendor.thermal-hal-2-0
on property:vendor.disable.bcl.control=1
write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0

View file

@ -45,6 +45,8 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
constexpr char kBootHwSoCRev[] = "ro.boot.hw.soc.rev";
void addAoC(std::shared_ptr<PowerStats> p) {
// AoC clock is synced from "libaoc.c"
static const uint64_t AOC_CLOCK = 4096;
std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
// Add AoC cores (a32, ff1, hf0, and hf1)
@ -57,7 +59,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
std::vector<std::pair<std::string, std::string>> coreStates = {
{"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}};
p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds,
coreStates));
coreStates, AOC_CLOCK));
// Add AoC voltage stats
std::vector<std::pair<std::string, std::string>> voltageIds = {
@ -68,7 +70,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
{"UUD", "ultra_underdrive"},
{"UD", "underdrive"}};
p->addStateResidencyDataProvider(
std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates));
std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates, AOC_CLOCK));
// Add AoC monitor mode
std::vector<std::pair<std::string, std::string>> monitorIds = {
@ -78,7 +80,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
{"MON", "mode"},
};
p->addStateResidencyDataProvider(
std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates));
std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates, AOC_CLOCK));
// Add AoC restart count
const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {