Snap for 12337407 from 0377917368
to 25Q1-release
Change-Id: I8c80f2e01fbc0f5cae2a32531c9eabd2d6d21907
This commit is contained in:
commit
5891d6d21c
8 changed files with 21 additions and 72 deletions
|
@ -1,3 +1,4 @@
|
|||
import /vendor/etc/init/hw/init.gs101.storage.rc
|
||||
import /vendor/etc/init/hw/init.gs101.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
|
||||
write /proc/vendor_sched/teo_util_threshold "1024 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
|
||||
|
@ -379,7 +376,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
|
||||
|
||||
# Modem MDS log folder
|
||||
mkdir /data/vendor/radio/mds 0771 radio system
|
||||
|
|
|
@ -414,3 +414,7 @@ on property:vendor.usb.contaminantdisable=true
|
|||
|
||||
on property:ro.bootmode=usbuwb
|
||||
setprop persist.vendor.usb.usbradio.config uwb_acm
|
||||
|
||||
# WAR for kernel 5.10 with CONFIG_USB_DUMMY_HCD enabled
|
||||
on property:sys.usb.controller=dummy_udc.0
|
||||
setprop sys.usb.controller "11110000.dwc3"
|
||||
|
|
10
device.mk
10
device.mk
|
@ -213,6 +213,8 @@ PRODUCT_SOONG_NAMESPACES += \
|
|||
vendor/arm/mali/valhall
|
||||
|
||||
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
|
||||
# Used in gfx_tools when defining tests with composer2 interface for gs101 devices
|
||||
$(call soong_config_set,gfx_tools,use_hwc2,true)
|
||||
|
||||
include device/google/gs-common/gpu/gpu.mk
|
||||
PRODUCT_PACKAGES += \
|
||||
|
@ -325,6 +327,14 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/gs101/conf/init.debug.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.debug.rc
|
||||
endif
|
||||
|
||||
ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION)))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/gs101/storage/5.10/init.gs101.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.storage.rc
|
||||
else
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/gs101/storage/6.1/init.gs101.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs101.storage.rc
|
||||
endif
|
||||
|
||||
# Recovery files
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc
|
||||
|
|
|
@ -118,7 +118,6 @@ void dumpAcpmStats() {
|
|||
void dumpPowerSupplyStats() {
|
||||
const char* dumpList[][2] = {
|
||||
{"CPU PM stats", "/sys/devices/system/cpu/cpupm/cpupm/time_in_state"},
|
||||
{"GENPD summary", "/d/pm_genpd/pm_genpd_summary"},
|
||||
{"Power supply property battery", "/sys/class/power_supply/battery/uevent"},
|
||||
{"Power supply property dc", "/sys/class/power_supply/dc/uevent"},
|
||||
{"Power supply property gcpm", "/sys/class/power_supply/gcpm/uevent"},
|
||||
|
@ -293,53 +292,6 @@ void dumpBatteryDefend() {
|
|||
files.clear();
|
||||
}
|
||||
}
|
||||
void dumpChgUserDebug() {
|
||||
std::vector<std::string> files;
|
||||
struct dirent *entry;
|
||||
std::string content;
|
||||
const char *chgUserDebug [][2] {
|
||||
{"DC_registers dump", "/sys/class/power_supply/dc-mains/device/registers_dump"},
|
||||
{"max77759_chg registers dump", "/d/max77759_chg/registers"},
|
||||
{"max77729_pmic registers dump", "/d/max77729_pmic/registers"},
|
||||
{"Charging table dump", "/d/google_battery/chg_raw_profile"},
|
||||
};
|
||||
const std::string debugfs = "/d/";
|
||||
const char *maxFgStrMatch = "maxfg";
|
||||
const char *fgInfo [][2] {
|
||||
{"fg_model", "fg_model"},
|
||||
{"fg_alo_ver", "algo_ver"},
|
||||
{"fg_model_ok", "model_ok"},
|
||||
{"fg registers", "registers"},
|
||||
{"Maxim FG NV RAM", "nv_registers"},
|
||||
};
|
||||
if (!isUserBuild())
|
||||
return;
|
||||
for (auto &row : chgUserDebug) {
|
||||
dumpFileContent(row[0], row[1]);
|
||||
}
|
||||
for (auto &info : fgInfo) {
|
||||
DIR *dir = opendir(debugfs.c_str());
|
||||
if (dir == NULL)
|
||||
return;
|
||||
printTitle(info[0]);
|
||||
while ((entry = readdir(dir)) != NULL)
|
||||
if (std::string(entry->d_name).find(maxFgStrMatch) != std::string::npos)
|
||||
files.push_back(entry->d_name);
|
||||
closedir(dir);
|
||||
sort(files.begin(), files.end());
|
||||
for (auto &file : files) {
|
||||
std::string fileDirectory = debugfs + file;
|
||||
std::string fileLocation = fileDirectory + "/" + std::string(info[1]);
|
||||
if (!android::base::ReadFileToString(fileLocation, &content)) {
|
||||
content = "\n";
|
||||
}
|
||||
printf("%s:\n%s", fileDirectory.c_str(), content.c_str());
|
||||
if (content.back() != '\n')
|
||||
printf("\n");
|
||||
}
|
||||
files.clear();
|
||||
}
|
||||
}
|
||||
void dumpBatteryEeprom() {
|
||||
const char *title = "Battery EEPROM";
|
||||
const char *files[] {
|
||||
|
@ -711,7 +663,6 @@ int main() {
|
|||
dumpLn8411();
|
||||
dumpBatteryHealth();
|
||||
dumpBatteryDefend();
|
||||
dumpChgUserDebug();
|
||||
dumpBatteryEeprom();
|
||||
dumpChargerStats();
|
||||
dumpWlcLogs();
|
||||
|
|
|
@ -12,15 +12,6 @@
|
|||
<instance>default</instance>
|
||||
</interface>
|
||||
</hal>
|
||||
<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="hidl">
|
||||
<name>android.hardware.graphics.composer</name>
|
||||
<transport>hwbinder</transport>
|
||||
|
|
|
@ -1,13 +1,4 @@
|
|||
<manifest version="1.0" type="device" target-level="5">
|
||||
<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="hidl">
|
||||
<name>android.hardware.graphics.composer</name>
|
||||
<transport>hwbinder</transport>
|
||||
|
|
3
storage/5.10/init.gs101.storage.rc
Normal file
3
storage/5.10/init.gs101.storage.rc
Normal file
|
@ -0,0 +1,3 @@
|
|||
on init
|
||||
write /sys/block/sda/queue/scheduler bfq
|
||||
write /sys/block/sda/queue/iosched/slice_idle 0
|
2
storage/6.1/init.gs101.storage.rc
Normal file
2
storage/6.1/init.gs101.storage.rc
Normal file
|
@ -0,0 +1,2 @@
|
|||
on init
|
||||
write /sys/block/sda/queue/scheduler mq-deadline
|
Loading…
Add table
Add a link
Reference in a new issue