From 938a1692d5d7a7eea26c978e732bd4855f58ee27 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 13 Jul 2022 10:06:33 +0800 Subject: [PATCH 1/3] thermal: allow system to overwrite the usb_pwr_therm2's trip point Bug: 233003074 Test: ls -al /dev/thermal/tz-by-name/usb_pwr_therm2/ Change-Id: I2ac803d455ebd7240bedf70bbcf98ef3c9e1d8c3 --- conf/init.gs201.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 60f2ab11..7557ac90 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -948,6 +948,8 @@ on property:vendor.thermal.link_ready=1 chown system system /dev/thermal/tz-by-name/skin_therm1/trip_point_0_hyst chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_temp chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_hyst + chown system system /dev/thermal/tz-by-name/usb_pwr_therm2/trip_point_0_temp + chown system system /dev/thermal/tz-by-name/usb_pwr_therm2/trip_point_0_hyst chown system system /dev/thermal/tz-by-name/usb_pwr_therm/trip_point_0_temp chown system system /dev/thermal/tz-by-name/usb_pwr_therm/trip_point_0_hyst chown system system /dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote From 6f754fdde93be2cdae765003da7fb6575a1b9d0c Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Thu, 14 Jul 2022 21:01:02 +0800 Subject: [PATCH 2/3] init.gs201.rc: remove vendor.device.modules.ready from 'on init' section 1) for projects with device specific modules, this property should only be set while device modules been loaded. 2) also remove "wait_for_prop vendor.device.modules.ready 1" to prevent infinite wait 3) migrate vendor.all.modules.ready/vendor.all.devices.ready to init.insmod..cfg and set these proprieties while .cfg not exist Bug: 238853979 Signed-off-by: Robin Peng Change-Id: Ie5a2b939191947c4fce154dde48859a28fe86329 --- conf/init.gs201.rc | 11 ----------- init.insmod.sh | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 7557ac90..35d9cd66 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -320,10 +320,6 @@ on init write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu6_memlat@17000010/mem_latency/ratio_ceil 3200 write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu7_memlat@17000010/mem_latency/ratio_ceil 3200 -# For GKI kernel, no device specific modules -on init - setprop vendor.device.modules.ready 1 - on late-fs # Wait for keymaster HALs exec_start wait_for_keymaster @@ -440,13 +436,6 @@ on early-boot # Wait for insmod_sh to finish all common modules wait_for_prop vendor.common.modules.ready 1 - # Wait for insmod_sh to finish all device specific modules - wait_for_prop vendor.device.modules.ready 1 - - # Other services depend on the properties - setprop vendor.all.modules.ready 1 - setprop vendor.all.devices.ready 1 - # Permission for Health Storage HAL chown system system /dev/sys/block/bootdevice/manual_gc diff --git a/init.insmod.sh b/init.insmod.sh index 97ae7bcb..645391af 100755 --- a/init.insmod.sh +++ b/init.insmod.sh @@ -51,6 +51,8 @@ else # to unblock early-boot trigger setprop vendor.common.modules.ready setprop vendor.device.modules.ready + setprop vendor.all.modules.ready + setprop vendor.all.devices.ready exit 1 fi From f60ad6f3dd446f12c30c97df214d8f17c2786e92 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Fri, 15 Jul 2022 00:26:14 +0000 Subject: [PATCH 3/3] Force build everything as 64 bit. When building the 64 bit and the 32 bit executables, there are a few targets that are prefer32. Using this option forces those executables to be built as 64 bit. Bug: 229787331 Test: With this option, drmserver/mediaserver are built as 64 bit. Test: Without this option, drmserver/mediaserver are built as 32 bit. Change-Id: Ie76ffe17f14b5157983796a616436bfa12987136 --- BoardConfig-common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 3625f0a3..34620e75 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -34,6 +34,11 @@ TARGET_CPU_VARIANT_RUNTIME := cortex-a55 # Enable 64-bit for non-zygote. ZYGOTE_FORCE_64 := true + +# Force any prefer32 targets to be compiled as 64 bit. +FORCE_MULTILIB_FIRST_ON_DEVICE := true + +# Build the 32 bit targets TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a