Snap for 12462067 from 72b12b913c to mainline-tzdata6-release

Change-Id: I0bf0391b7be24bbcbd14acfd8dc6e9e8046fe732
This commit is contained in:
Android Build Coastguard Worker 2024-10-07 09:03:20 +00:00
commit d6d70e5696
19 changed files with 103 additions and 54 deletions

View file

@ -33,8 +33,10 @@ BOARD_PREBUILT_DTBOIMAGE_16KB := $(TARGET_KERNEL_DIR_16K)/dtbo.img
# Zuma targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko.
BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_16K := $(filter-out %/zram.ko,$(BOARD_KERNEL_MODULES_16K))
BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module)))
BOARD_16K_OTA_USE_INCREMENTAL := true
BOARD_16K_OTA_MOVE_VENDOR := true
endif

View file

@ -19,9 +19,6 @@ include build/make/target/board/BoardConfigPixelCommon.mk
# Include settings for 16k developer option, if enabled
include device/google/zuma/BoardConfig-16k-common.mk
# Should be uncommented after fixing vndk-sp violation is fixed.
PRODUCT_FULL_TREBLE_OVERRIDE := true
# HACK : To fix up after bring up multimedia devices.
TARGET_SOC := zuma
@ -33,7 +30,6 @@ TARGET_ARCH := arm64
TARGET_ARCH_VARIANT := armv8-2a
TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_VARIANT := cortex-a55
TARGET_CPU_VARIANT_RUNTIME := cortex-a55
BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10870000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y

View file

@ -56,6 +56,7 @@ public class CopyEfsTest extends BaseHostJUnit4Test {
testDumpF2FS("efs");
testDumpF2FS("efs_backup");
testDumpF2FS("modem_userdata");
testDumpF2FS("persist");
}
private void testDumpF2FS(String name) throws Exception {
@ -69,15 +70,22 @@ public class CopyEfsTest extends BaseHostJUnit4Test {
r = getDevice().executeShellV2Command("umount /data/local/tmp/efs_test/mnt");
assertEquals(r.getExitCode().intValue(), 0);
r = getDevice().executeShellV2Command(String.format("dump.f2fs -rfPo /data/local/tmp/efs_test/dump /data/local/tmp/efs_test/%s.img", name));
r = getDevice().executeShellV2Command(String.format("dump.f2fs -rfPLo /data/local/tmp/efs_test/dump /data/local/tmp/efs_test/%s.img", name));
assertEquals(r.getExitCode().intValue(), 0);
r = getDevice().executeShellV2Command(String.format("mount -r /data/local/tmp/efs_test/%s.img /data/local/tmp/efs_test/mnt", name));
assertEquals(r.getExitCode().intValue(), 0);
assertEquals("", getDevice().executeShellCommand("diff -rq /data/local/tmp/efs_test/mnt /data/local/tmp/efs_test/dump"));
// Remove timestamps at positions 6 and 7, because ls on device does not support --time-style
r = getDevice().executeShellV2Command("diff -rq --no-dereference /data/local/tmp/efs_test/mnt /data/local/tmp/efs_test/dump");
assertEquals(r.getExitCode().intValue(), 0);
assertEquals(r.getStdout(), "");
// Remove timestamps because ls on device does not support --time-style. This is AWKward.
// Format is [permissions] [links] [uid] [gid] [size] time [name/symlink]
// time may have different numbers of blocks
// symlinks will be of the form a -> b
// So we can check for -> in the second to last spot to determine what position the timestamp ends at
// Remove totals because on disk block usage may change depending on filesystem
String ls_cmd = "cd /data/local/tmp/efs_test/%s;ls -AlLnR . | awk {'$6=\"\";$7=\"\";if ($1 != \"total\"){print $0}'}";
String ls_cmd = "cd /data/local/tmp/efs_test/%s;ls -AlnR . | awk {'if (NF>3 && $(NF-1) == \"->\") end=3; else end=1; for(i=6;i<=NF-end && i>0;i++)$i=\"\";if ($1 != \"total\"){print $0}'}";
String mnt_ls = getDevice().executeShellCommand(String.format(ls_cmd, "mnt"));
assertEquals(getDevice().executeShellCommand("echo $?"), "0\n");
String dump_ls = getDevice().executeShellCommand(String.format(ls_cmd, "dump"));

View file

@ -5,6 +5,6 @@
#
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/dev/block/platform/13200000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,compress_extension=apk,compress_extension=so,compress_extension=vdex,compress_extension=odex,@inlinecrypt@,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fscompress,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,device=zoned:/dev/block/by-name/zoned_device
/dev/block/platform/13200000.ufs/by-name/userdata /data ext4 noatime,nosuid,nodev,@inlinecrypt@ latemount,wait,check,quota,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption
/dev/block/platform/13200000.ufs/by-name/userdata /data ext4 noatime,nosuid,nodev,@inlinecrypt@ latemount,wait,check,quota,formattable,reservedsize=128M,readahead_size_kb=128,@fileencryption@,@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption
/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount
/dev/block/platform/13200000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,data=journal,commit=1 wait,check,first_stage_mount,metadata_csum

View file

@ -1,3 +1,4 @@
import /vendor/etc/init/hw/init.zuma.storage.rc
import /vendor/etc/init/hw/init.zuma.usb.rc
import android.hardware.drm@1.2-service.widevine.rc
import init.exynos.sensorhub.rc
@ -15,10 +16,6 @@ on init
# Disable util-awareness for mids and bigs
write /proc/vendor_sched/teo_util_threshold "2 1024 1024"
# Boot time fs tuning
write /sys/block/sda/queue/scheduler bfq
write /sys/block/sda/queue/iosched/slice_idle 0
chown system system /proc/vendor_sched/groups/bg/set_task_group
chown system system /proc/vendor_sched/groups/cam/set_task_group
chown system system /proc/vendor_sched/groups/fg/set_task_group
@ -47,6 +44,8 @@ on init
chown system system /proc/vendor_sched/prefer_idle_clear
chown system system /proc/vendor_sched/pmu_poll_enable
chown system system /proc/vendor_sched/pmu_poll_time
chown system system /proc/vendor_sched/uclamp_fork_reset_clear
chown system system /proc/vendor_sched/uclamp_fork_reset_set
chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold
chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold
chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency
@ -98,6 +97,8 @@ on init
chmod 0220 /proc/vendor_sched/prefer_idle_clear
chmod 0660 /proc/vendor_sched/pmu_poll_enable
chmod 0220 /proc/vendor_sched/pmu_poll_time
chmod 0220 /proc/vendor_sched/uclamp_fork_reset_clear
chmod 0220 /proc/vendor_sched/uclamp_fork_reset_set
start vendor.keymaster-4-0
@ -394,7 +395,7 @@ on post-fs-data
mkdir /data/vendor/radio/logs/always-on 777 system radio
# Modem extended log folder
mkdir /data/vendor/radio/extended_logs 0770 radio system
mkdir /data/vendor/radio/extended_logs 0771 radio system
# Log Mask Library Mask storage paths
mkdir /data/vendor/radio/log_masks 777 system system
@ -530,10 +531,9 @@ on early-boot
chown system system /dev/logbuffer_tcpm
chown system system /dev/logbuffer_usbpd
chown system system /dev/logbuffer_wireless
chown system system /dev/logbuffer_pca9468
chown system system /dev/logbuffer_dc_mains
chown system system /dev/logbuffer_cpm
chown system system /dev/logbuffer_wc68
chown system system /dev/logbuffer_ln8411
chown system system /dev/logbuffer_pcie0
chown system system /dev/logbuffer_pcie1
chown system system /dev/logbuffer_bd
@ -742,9 +742,9 @@ on property:sys.boot_completed=1
write /sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/exynos_data/cancel_boot_freq 1
# Restore prefer idle
write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0x1ff
write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0x1ff
write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0x1ff
write /proc/vendor_sched/groups/ta/preferred_idle_mask_low 0xff
write /proc/vendor_sched/groups/ta/preferred_idle_mask_mid 0xff
write /proc/vendor_sched/groups/ta/preferred_idle_mask_high 0xff
write /proc/vendor_sched/groups/fg/preferred_idle_mask_low 0x1ff
write /proc/vendor_sched/groups/fg/preferred_idle_mask_mid 0x1ff
write /proc/vendor_sched/groups/fg/preferred_idle_mask_high 0x1ff
@ -977,6 +977,9 @@ on property:vendor.thermal.link_ready=1
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu2_lvl 12000
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_gpu_lvl 9000
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_tpu_lvl 8500
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/ocp_cpu2_lvl 12000
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/ocp_gpu_lvl 12000
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/ocp_tpu_lvl 12000
write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1
write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1
write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1

View file

@ -425,7 +425,7 @@ on property:persist.vendor.usb.displayport.enabled=0
write /sys/class/typec/port0/port0.0/mode1/active "no"
on property:persist.sys.hdcp_checking=always
write /sys/module/exynos_hdcp2/parameters/max_ver 2
write /sys/module/exynos_hdcp2/parameters/max_ver 3
on property:persist.sys.hdcp_checking="drm-only"
write /sys/module/exynos_hdcp2/parameters/max_ver 2

View file

@ -16,9 +16,9 @@ function copy_files_to_data()
if [ ! -e $build_checkpoint ]; then
$BIN_DIR/rm -rf $tmpdir
$BIN_DIR/mkdir -p $tmpdir
$BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device
$BIN_DIR/dump.f2fs -rfPLo $tmpdir $block_device
if [ $? -ne 0 ]; then
echo "Failed to $BIN_DIR/dump.f2fs -rfPo $tmpdir $block_device"
echo "Failed to $BIN_DIR/dump.f2fs -rfPLo $tmpdir $block_device"
return
fi
$BIN_DIR/mv $tmpdir $build_checkpoint
@ -37,9 +37,4 @@ copy_files_to_data "/dev/block/by-name/modem_userdata" "/mnt/vendor/modem_userda
copy_files_to_data "/dev/block/by-name/persist" "/mnt/vendor/persist"
# TODO(b/352567354): fixup symlinks until dump.f2fs is fixed
a=$($BIN_DIR/cat /data/vendor/copied/persist/ss/0)
$BIN_DIR/mv /data/vendor/copied/persist/ss/0 /data/vendor/copied/persist/ss/0_backup
$BIN_DIR/ln -s $a /data/vendor/copied/persist/ss/0
$BIN_DIR/fsync /data/vendor/copied

View file

@ -80,6 +80,7 @@ PRODUCT_SOONG_NAMESPACES += \
device/google/zuma \
device/google/zuma/powerstats \
vendor/google_devices/common/chre/host/hal \
vendor/google_devices/zuma/proprietary/debugpolicy \
vendor/google/whitechapel/tools \
vendor/google/interfaces \
vendor/google_nos/host/android \
@ -94,11 +95,6 @@ TRUSTY_KEYMINT_IMPL := rust
ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true)
# Set the environment variable to enable the Secretkeeper HAL service.
SECRETKEEPER_ENABLED := true
# TODO(b/341708664): Enable Secretkeeper unconditionally once AOSP targets are built with
# compatible bootloader (24Q3+).
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
SECRETKEEPER_ENABLED := false
endif
endif
# OEM Unlock reporting
@ -224,7 +220,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
endif
PRODUCT_PROPERTY_OVERRIDES += \
persist.sys.hdcp_checking=always
persist.sys.hdcp_checking=drm-only
USE_LASSEN_OEMHOOK := true
# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when
@ -241,6 +237,8 @@ $(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true)
ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true)
USE_GOOGLE_DIALER := true
USE_GOOGLE_CARRIER_SETTINGS := true
# GoogleDialer in PDK build with "USES_GOOGLE_DIALER_CARRIER_SETTINGS=true"
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/zuma/proprietary/GoogleDialer
endif
ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true)
@ -402,6 +400,14 @@ PRODUCT_COPY_FILES += \
device/google/zuma/conf/init.freq.userdebug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.freq.userdebug.rc
endif
ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
device/google/zuma/storage/5.15/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc
else
PRODUCT_COPY_FILES += \
device/google/zuma/storage/6.1/init.zuma.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.storage.rc
endif
# Recovery files
PRODUCT_COPY_FILES += \
device/google/zuma/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.zuma.rc
@ -441,9 +447,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_HOST_PACKAGES += \
mkdtimg
PRODUCT_PACKAGES += \
messaging
# CHRE
## Tools
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@ -461,8 +464,6 @@ PRODUCT_COPY_FILES += \
## Enable the CHRE Daemon
CHRE_USF_DAEMON_ENABLED := false
CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true
PRODUCT_PACKAGES += \
preloaded_nanoapps.json
# Filesystem management tools
PRODUCT_PACKAGES += \
@ -581,6 +582,9 @@ PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2
PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2
PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000
# Set util_clamp_min for s/w spatializer
PRODUCT_PROPERTY_OVERRIDES += audio.spatializer.effect.util_clamp_min=300
# Calliope firmware overwrite
#PRODUCT_COPY_FILES += \
device/google/zuma/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \
@ -1151,7 +1155,7 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/google_devices/zuma/proprietary/gchips/tpu/nnapi_stable_aidl \
vendor/google_devices/zuma/proprietary/gchips/tpu/aidl \
vendor/google_devices/zuma/proprietary/gchips/tpu/hal \
vendor/google_devices/zuma/proprietary/gchips/tpu/tachyon/api \
vendor/google_devices/zuma/proprietary/gchips/tpu/tachyon/tachyon_apis \
vendor/google_devices/zuma/proprietary/gchips/tpu/tachyon/service
# TPU firmware
PRODUCT_PACKAGES += edgetpu-rio.fw

View file

@ -153,7 +153,7 @@
</hal>
<hal format="aidl" optional="true">
<name>vendor.google.wifi_ext</name>
<version>2-3</version>
<version>2-4</version>
<interface>
<name>IWifiExt</name>
<instance>default</instance>

View file

@ -24,6 +24,7 @@ cc_binary {
],
vendor: true,
relative_install_path: "dump",
init_rc: ["dump_power.rc"],
}
sh_binary {

View file

@ -21,7 +21,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/sysinfo.h>
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
#include <vector>
#include <android-base/file.h>
@ -305,7 +307,7 @@ void dumpPdEngine() {
const char* pdEngine [][2] {
{"Logbuffer TCPC", "/dev/logbuffer_usbpd"},
{"PPS-google_cpm", "/dev/logbuffer_cpm"},
{"PPS-dc", "/dev/logbuffer_pca9468"},
{"PPS-dc", "/dev/logbuffer_dc_mains"},
};
for (const auto &row : pdEngine) {
@ -629,10 +631,27 @@ void dumpGvoteables() {
void dumpMitigation() {
const char *mitigationList [][2] {
{"LastmealCSV" , "/data/vendor/mitigation/lastmeal.csv"},
{"Lastmeal" , "/data/vendor/mitigation/lastmeal.txt"},
{"Thismeal" , "/data/vendor/mitigation/thismeal.txt"},
};
/* parsing thismeal.bin */
int status;
int pid = fork();
if (pid < 0) {
printf("Fork failed for parsing thismeal.bin.\n");
exit(EXIT_FAILURE);
} else if (pid == 0) {
execl("/vendor/bin/hw/battery_mitigation", "battery_mitigation", "-d", nullptr);
exit(EXIT_SUCCESS);
}
waitpid(pid, &status, 0);
if (WIFSIGNALED(status)) {
printf("Failed to parse thismeal.bin.(killed by: %d)\n", WTERMSIG(status));
}
for (auto &row : mitigationList) {
if (!isValidFile(row[1]))
printTitle(row[0]);

3
dumpstate/dump_power.rc Normal file
View file

@ -0,0 +1,3 @@
on init
# for parsing thismeal.bin
chown system system /vendor/bin/hw/battery_mitigation

View file

@ -1,13 +1,4 @@
<manifest version="1.0" type="device" target-level="8">
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
</interface>
</hal>
<hal format="aidl">
<name>android.hardware.boot</name>
<fqname>IBootControl/default</fqname>

View file

@ -51,11 +51,11 @@
</Decoders>
<Encoders>
<MediaCodec name="c2.google.av1.encoder" type="video/av01">
<Limit name="size" min="64x64" max="3840x2176" />
<Limit name="size" min="80x80" max="3840x2176" />
<Limit name="alignment" value="1x1" />
<Limit name="block-size" value="64x64" />
<Limit name="block-count" range="1-2040" />
<Limit name="blocks-per-second" min="1" max="61200" />
<Limit name="block-count" range="4-2040" />
<Limit name="blocks-per-second" min="4" max="61200" />
<Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1280x720" value="200" />
<Limit name="performance-point-1920x1080" value="180" />

View file

@ -325,4 +325,7 @@
<!-- User activity timeout: Maximum screen dim duration as a percentage of screen off timeout.
-->
<fraction name="config_maximumScreenDimRatio">33%</fraction>
<!-- Whether to enable usb state update via udc sysfs. -->
<bool name="config_enableUdcSysfsUsbStateUpdate">true</bool>
</resources>

View file

@ -282,7 +282,7 @@ void addSoC(std::shared_ptr<PowerStats> p) {
}
void setEnergyMeter(std::shared_ptr<PowerStats> p) {
std::vector<const std::string> deviceNames { "s2mpg14-odpm", "s2mpg15-odpm" };
std::vector<std::string> deviceNames { "s2mpg14-odpm", "s2mpg15-odpm" };
p->setEnergyMeterDataProvider(std::make_unique<IioEnergyMeterDataProvider>(deviceNames, true));
}

View file

@ -0,0 +1,3 @@
on init
write /sys/block/sda/queue/scheduler bfq
write /sys/block/sda/queue/iosched/slice_idle 0

View file

@ -0,0 +1,2 @@
on init
write /sys/block/sda/queue/scheduler mq-deadline

View file

@ -15,6 +15,21 @@
}
]
},
{
"Name": "PreferIdle",
"Actions": [
{
"Name": "WriteFile",
"Params":
{
"FilePath": "/proc/vendor_sched/prefer_idle_set",
"ProcFilePath": "/proc/vendor_sched/prefer_idle_set",
"Value": "<pid>",
"LogFailures": "false"
}
}
]
},
{
"Name": "CameraServicePerformance",
"Actions": [
@ -288,6 +303,10 @@
{
"Name": "OtaProfiles",
"Profiles": [ "OtaPerformance", "ProcessCapacityNormal", "LowIoPriority", "TimerSlackHigh" ]
},
{
"Name": "InputPolicy",
"Profiles": [ "MaxPerformance", "ResetUclampGrp", "PreferIdle" ]
}
]
}