diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index fdf9ef83..afcb1f51 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -27,19 +27,32 @@ TARGET_SOC_NAME := google USES_DEVICE_GOOGLE_GS201 := true TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-a +TARGET_ARCH_VARIANT := armv8-2a TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_VARIANT := generic -TARGET_CPU_VARIANT_RUNTIME := cortex-a53 +TARGET_CPU_VARIANT := cortex-a55 +TARGET_CPU_VARIANT_RUNTIME := cortex-a55 BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\" BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y +BOARD_KERNEL_CMDLINE += cgroup_disable=memory +BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all +BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on +BOARD_KERNEL_CMDLINE += swiotlb=1024 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := false TARGET_NO_RADIOIMAGE := true +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) +else +BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot-user.img) +endif +ifneq (,$(BOARD_PREBUILT_BOOTIMAGE)) +TARGET_NO_KERNEL := true +else +TARGET_NO_KERNEL := false +endif BOARD_USES_GENERIC_KERNEL_IMAGE := true BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true diff --git a/aosp_common.mk b/aosp_common.mk index 52ea5974..30d037c5 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -46,3 +46,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) # TODO: fix # PRODUCT_RESTRICT_VENDOR_FILES := all + +# b/189477034: Bypass build time check on uses_libs until vendor fixes all their apps +PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 4444b9c5..79f8cc82 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -15,10 +15,9 @@ vendor_dlkm /vendor_dlkm /dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable /dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable /dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable -/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect /dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait /dev/block/platform/14700000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/14700000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount -/dev/block/platform/14700000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,compress_extension=vdex,compress_extension=odex,atgc,checkpoint_merge latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=@fileencryption@,metadata_encryption=@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,fscompress,readahead_size_kb=128 +/dev/block/platform/14700000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,compress_extension=vdex,compress_extension=odex,atgc,checkpoint_merge,compress_cache latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=@fileencryption@,metadata_encryption=@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,fscompress,readahead_size_kb=128 /dev/block/platform/14700000.ufs/by-name/vbmeta /vbmeta emmc defaults slotselect,first_stage_mount /devices/platform/11210000.usb* auto vfat defaults voldmanaged=usb:auto diff --git a/conf/fstab.modem b/conf/fstab.modem new file mode 100644 index 00000000..d687ace5 --- /dev/null +++ b/conf/fstab.modem @@ -0,0 +1,5 @@ +# Android fstab file. +# +# Create the specific fstab file for modem partition as flexibility +/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img erofs ro,defaults,context=u:object_r:modem_img_file:s0 wait,slotselect +/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect diff --git a/conf/init.factory.rc b/conf/init.factory.rc index 42a1ad15..ed294fda 100644 --- a/conf/init.factory.rc +++ b/conf/init.factory.rc @@ -12,3 +12,8 @@ on boot # Audio test folder mkdir /data/AudioTest 0775 system system + +on property:sys.boot_completed=1 + # Bump nnapi min clamp & add adbd to it for factory (b/222226268) + write /proc/vendor_sched/nnapi_uclamp_min 512 + exec - root root -- /vendor/bin/factory/factory_post_boot diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index 25dcadeb..835d13b4 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -17,55 +17,59 @@ on init write /dev/sys/fs/by-name/userdata/data_io_flag 56 write /dev/sys/fs/by-name/userdata/node_io_flag 56 - chown system system /sys/kernel/vendor_sched/set_task_group_bg - chown system system /sys/kernel/vendor_sched/set_task_group_cam - chown system system /sys/kernel/vendor_sched/set_task_group_fg - chown system system /sys/kernel/vendor_sched/set_task_group_nnapi - chown system system /sys/kernel/vendor_sched/set_task_group_sys - chown system system /sys/kernel/vendor_sched/set_task_group_sysbg - chown system system /sys/kernel/vendor_sched/set_task_group_ta - chown system system /sys/kernel/vendor_sched/set_task_group_rt - chown system system /sys/kernel/vendor_sched/set_task_group_sf - chown system system /sys/kernel/vendor_sched/set_task_group_dex2oat - chown system system /sys/kernel/vendor_sched/set_task_group_cam_power - chown system system /sys/kernel/vendor_sched/set_task_group_ota - chown system system /sys/kernel/vendor_sched/set_proc_group_bg - chown system system /sys/kernel/vendor_sched/set_proc_group_cam - chown system system /sys/kernel/vendor_sched/set_proc_group_fg - chown system system /sys/kernel/vendor_sched/set_proc_group_nnapi - chown system system /sys/kernel/vendor_sched/set_proc_group_sys - chown system system /sys/kernel/vendor_sched/set_proc_group_sysbg - chown system system /sys/kernel/vendor_sched/set_proc_group_ta - chown system system /sys/kernel/vendor_sched/set_proc_group_rt - chown system system /sys/kernel/vendor_sched/set_proc_group_sf - chown system system /sys/kernel/vendor_sched/set_proc_group_dex2oat - chown system system /sys/kernel/vendor_sched/set_proc_group_cam_power - chown system system /sys/kernel/vendor_sched/set_proc_group_ota + chown system system /proc/vendor_sched/set_task_group_bg + chown system system /proc/vendor_sched/set_task_group_cam + chown system system /proc/vendor_sched/set_task_group_fg + chown system system /proc/vendor_sched/set_task_group_nnapi + chown system system /proc/vendor_sched/set_task_group_sys + chown system system /proc/vendor_sched/set_task_group_sysbg + chown system system /proc/vendor_sched/set_task_group_ta + chown system system /proc/vendor_sched/set_task_group_rt + chown system system /proc/vendor_sched/set_task_group_sf + chown system system /proc/vendor_sched/set_task_group_dex2oat + chown system system /proc/vendor_sched/set_task_group_cam_power + chown system system /proc/vendor_sched/set_task_group_ota + chown system system /proc/vendor_sched/set_proc_group_bg + chown system system /proc/vendor_sched/set_proc_group_cam + chown system system /proc/vendor_sched/set_proc_group_fg + chown system system /proc/vendor_sched/set_proc_group_nnapi + chown system system /proc/vendor_sched/set_proc_group_sys + chown system system /proc/vendor_sched/set_proc_group_sysbg + chown system system /proc/vendor_sched/set_proc_group_ta + chown system system /proc/vendor_sched/set_proc_group_rt + chown system system /proc/vendor_sched/set_proc_group_sf + chown system system /proc/vendor_sched/set_proc_group_dex2oat + chown system system /proc/vendor_sched/set_proc_group_cam_power + chown system system /proc/vendor_sched/set_proc_group_ota + chown system system /proc/vendor_sched/prefer_idle_set + chown system system /proc/vendor_sched/prefer_idle_clear - chmod 0220 /sys/kernel/vendor_sched/set_task_group_bg - chmod 0220 /sys/kernel/vendor_sched/set_task_group_cam - chmod 0220 /sys/kernel/vendor_sched/set_task_group_fg - chmod 0220 /sys/kernel/vendor_sched/set_task_group_nnapi - chmod 0220 /sys/kernel/vendor_sched/set_task_group_sys - chmod 0220 /sys/kernel/vendor_sched/set_task_group_sysbg - chmod 0220 /sys/kernel/vendor_sched/set_task_group_ta - chmod 0220 /sys/kernel/vendor_sched/set_task_group_rt - chmod 0220 /sys/kernel/vendor_sched/set_task_group_sf - chmod 0220 /sys/kernel/vendor_sched/set_task_group_dex2oat - chmod 0220 /sys/kernel/vendor_sched/set_task_group_cam_power - chmod 0220 /sys/kernel/vendor_sched/set_task_group_ota - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_bg - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_cam - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_fg - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_nnapi - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sys - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sysbg - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_ta - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_rt - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_sf - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_dex2oat - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_cam_power - chmod 0220 /sys/kernel/vendor_sched/set_proc_group_ota + chmod 0220 /proc/vendor_sched/set_task_group_bg + chmod 0220 /proc/vendor_sched/set_task_group_cam + chmod 0220 /proc/vendor_sched/set_task_group_fg + chmod 0220 /proc/vendor_sched/set_task_group_nnapi + chmod 0220 /proc/vendor_sched/set_task_group_sys + chmod 0220 /proc/vendor_sched/set_task_group_sysbg + chmod 0220 /proc/vendor_sched/set_task_group_ta + chmod 0220 /proc/vendor_sched/set_task_group_rt + chmod 0220 /proc/vendor_sched/set_task_group_sf + chmod 0220 /proc/vendor_sched/set_task_group_dex2oat + chmod 0220 /proc/vendor_sched/set_task_group_cam_power + chmod 0220 /proc/vendor_sched/set_task_group_ota + chmod 0220 /proc/vendor_sched/set_proc_group_bg + chmod 0220 /proc/vendor_sched/set_proc_group_cam + chmod 0220 /proc/vendor_sched/set_proc_group_fg + chmod 0220 /proc/vendor_sched/set_proc_group_nnapi + chmod 0220 /proc/vendor_sched/set_proc_group_sys + chmod 0220 /proc/vendor_sched/set_proc_group_sysbg + chmod 0220 /proc/vendor_sched/set_proc_group_ta + chmod 0220 /proc/vendor_sched/set_proc_group_rt + chmod 0220 /proc/vendor_sched/set_proc_group_sf + chmod 0220 /proc/vendor_sched/set_proc_group_dex2oat + chmod 0220 /proc/vendor_sched/set_proc_group_cam_power + chmod 0220 /proc/vendor_sched/set_proc_group_ota + chmod 0220 /proc/vendor_sched/prefer_idle_set + chmod 0220 /proc/vendor_sched/prefer_idle_clear wait /dev/block/platform/${ro.boot.boot_devices} symlink /dev/block/platform/${ro.boot.boot_devices} /dev/block/bootdevice @@ -127,12 +131,12 @@ on init mkdir /dev/socket/pdx/system/vr/sensors 0775 system system # Boot time 183626384 - write /sys/kernel/vendor_sched/ta_uclamp_min 1024 - write /sys/kernel/vendor_sched/ta_prefer_idle 1 - write /sys/kernel/vendor_sched/fg_uclamp_min 1024 - write /sys/kernel/vendor_sched/fg_prefer_idle 1 - write /sys/kernel/vendor_sched/sys_uclamp_min 1024 - write /sys/kernel/vendor_sched/sys_prefer_idle 1 + write /proc/vendor_sched/ta_uclamp_min 1024 + write /proc/vendor_sched/ta_prefer_idle 1 + write /proc/vendor_sched/fg_uclamp_min 1024 + write /proc/vendor_sched/fg_prefer_idle 1 + write /proc/vendor_sched/sys_uclamp_min 1024 + write /proc/vendor_sched/sys_prefer_idle 1 # governor setting write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel @@ -173,8 +177,8 @@ on init chown system system /dev/cpuset/camera-daemon-mid-high-group/tasks chmod 0664 /dev/cpuset/camera-daemon-mid-high-group/tasks - write /sys/kernel/vendor_sched/cam_prefer_idle 1 - write /sys/kernel/vendor_sched/cam_uclamp_min 1 + write /proc/vendor_sched/cam_prefer_idle 1 + write /proc/vendor_sched/cam_uclamp_min 1 chown system system /dev/cpuset/cgroup.procs @@ -214,6 +218,8 @@ on init chown system system /sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom chown system system /sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom chown system system /sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom + chown system system /dev/battery_history + chmod 0644 /dev/battery_history # Modem temperature driver chown radio system /sys/devices/platform/cp-tm1/cp_temp @@ -278,8 +284,8 @@ on init start watchdogd # Add a boost for NNAPI HAL - write /sys/kernel/vendor_sched/nnapi_prefer_idle 0 - write /sys/kernel/vendor_sched/nnapi_uclamp_min 512 + write /proc/vendor_sched/nnapi_prefer_idle 0 + write /proc/vendor_sched/nnapi_uclamp_min 512 # Add memlat governor settings write /sys/class/devfreq/gs_memlat_devfreq:devfreq_mif_cpu0_memlat@17000010/polling_interval 10 @@ -392,7 +398,7 @@ on post-fs-data on zygote-start # For PixelLogger configuration file. chmod 0771 /data/vendor/wifi - write /sys/kernel/vendor_sched/sys_uclamp_min 0 + write /proc/vendor_sched/sys_uclamp_min 0 on post-fs-data # Create the directories used by the Wireless subsystem @@ -509,6 +515,10 @@ on fs restorecon_recursive /mnt/vendor/modem_userdata chown radio system /mnt/vendor/modem_userdata + # Mount modem partition + mount_all /vendor/etc/fstab.modem --early + restorecon_recursive /mnt/vendor/modem_img + restorecon_recursive /mnt/vendor/persist restorecon_recursive /mnt/vendor/persist/aoc restorecon_recursive /mnt/vendor/persist/audio @@ -560,9 +570,9 @@ on fs chown system system /sys/class/dqe0/atc/lt_calc_ab_shift chown system system /sys/devices/platform/1c240000.drmdecon/early_wakeup - chmod 0220 /sys/devices/platform/1c240000.drmdecon/early_wakeup + chmod 0660 /sys/devices/platform/1c240000.drmdecon/early_wakeup chown system system /sys/devices/platform/1c242000.drmdecon/early_wakeup - chmod 0220 /sys/devices/platform/1c242000.drmdecon/early_wakeup + chmod 0660 /sys/devices/platform/1c242000.drmdecon/early_wakeup # Copy DRM Key # copy /system/app/wv.keys /factory/wv.keys @@ -672,10 +682,6 @@ on property:sys.boot_completed=1 chown system system /dev/sys/fs/by-name/userdata/gc_segment_mode chown system system /dev/sys/fs/by-name/userdata/gc_reclaimed_segments - # Block layer tuning: discard chunk size up to 128MB - # Otherwise, contiguous discards can be merged - write /sys/block/sda/queue/discard_max_bytes 134217728 - # Enable ZRAM on boot_complete swapon_all /vendor/etc/fstab.${ro.board.platform} write /proc/sys/vm/swappiness 100 @@ -697,28 +703,29 @@ on property:sys.boot_completed=1 setprop vendor.powerhal.init 1 # Setup final cpu.uclamp - write /sys/kernel/vendor_sched/ta_uclamp_min 1 - write /sys/kernel/vendor_sched/fg_uclamp_min 0 - write /sys/kernel/vendor_sched/sys_prefer_idle 0 + write /proc/vendor_sched/uclamp_threshold 8 + write /proc/vendor_sched/ta_uclamp_min 1 + write /proc/vendor_sched/fg_uclamp_min 0 + write /proc/vendor_sched/sys_prefer_idle 0 # cfs_rq clamp is using tg->uclamp setting # align it with the vendor_group setting - write /sys/kernel/vendor_sched/bg_uclamp_max 512 + write /proc/vendor_sched/bg_uclamp_max 512 write /dev/cpuctl/background/cpu.uclamp.max 50 - write /sys/kernel/vendor_sched/bg_group_throttle 512 - write /sys/kernel/vendor_sched/sysbg_uclamp_max 512 + write /proc/vendor_sched/bg_group_throttle 512 + write /proc/vendor_sched/sysbg_uclamp_max 512 write /dev/cpuctl/system-background/cpu.uclamp.max 50 - write /sys/kernel/vendor_sched/sysbg_group_throttle 512 - write /sys/kernel/vendor_sched/dex2oat_uclamp_max 615 + write /proc/vendor_sched/sysbg_group_throttle 512 + write /proc/vendor_sched/dex2oat_uclamp_max 615 write /dev/cpuctl/dex2oat/cpu.uclamp.max 60 - write /sys/kernel/vendor_sched/dex2oat_group_throttle 615 - write /sys/kernel/vendor_sched/ota_uclamp_max 410 - write /sys/kernel/vendor_sched/ota_group_throttle 410 + write /proc/vendor_sched/dex2oat_group_throttle 615 + write /proc/vendor_sched/ota_uclamp_max 410 + write /proc/vendor_sched/ota_group_throttle 410 # Setup groups for SF (RT used for SF RE, SF used for SF main) - write /sys/kernel/vendor_sched/rt_uclamp_min 125 - write /sys/kernel/vendor_sched/rt_prefer_idle 1 - write /sys/kernel/vendor_sched/sf_uclamp_min 30 - write /sys/kernel/vendor_sched/sf_prefer_idle 1 + write /proc/vendor_sched/rt_uclamp_min 125 + write /proc/vendor_sched/rt_prefer_idle 1 + write /proc/vendor_sched/sf_uclamp_min 30 + write /proc/vendor_sched/sf_prefer_idle 1 # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 5% dex2oat ~2.5%) write /dev/cpuctl/background/cpu.shares 1024 @@ -803,12 +810,6 @@ on property:persist.sys.test_harness=1 && property:persist.vendor.testing_batte setprop persist.vendor.charge.start.level 0 setprop vendor.battery.defender.disable 1 -on property:persist.vendor.charge.stop.level=* - write /sys/devices/platform/google,charger/charge_stop_level ${persist.vendor.charge.stop.level} - -on property:persist.vendor.charge.start.level=* - write /sys/devices/platform/google,charger/charge_start_level ${persist.vendor.charge.start.level} - service insmod_sh_common /vendor/bin/init.insmod.sh /vendor/etc/init.insmod.gs201.cfg class main user root @@ -869,13 +870,20 @@ on fs on property:vendor.thermal.link_ready=1 # BCL + write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_light_clk_ratio 0xfff041c1 #DFS + write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu1_heavy_clk_ratio 0xfff041c1 #DFS + write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c1 #DFS + write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_light_clk_ratio 0xfff04381 #DFS + write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_light_clk_ratio 0xfff041c3 #OCP + write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385 #OCP + write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c3 #OCP write /sys/devices/virtual/pmic/mitigation/triggered_lvl/smpl_lvl 3100 - write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu2_lvl 9000 + 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/clock_div/tpu_clk_div 0x201 - write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x801 - write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x801 + 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 chown system system /dev/thermal/tz-by-name/soc/mode chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_temp chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_hyst @@ -901,6 +909,8 @@ on property:vendor.thermal.link_ready=1 chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_hyst chown system system /dev/thermal/tz-by-name/soc/trip_point_0_temp chown system system /dev/thermal/tz-by-name/soc/trip_point_0_hyst + chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp + chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst # Thermal 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 @@ -913,6 +923,7 @@ on property:vendor.thermal.link_ready=1 chown system system /dev/thermal/cdev-by-name/fcc/cur_state chown system system /dev/thermal/cdev-by-name/dc_icl/cur_state chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state + chown system system /dev/thermal/cdev-by-name/chg_mdis/cur_state on property:vendor.disable.bcl.control=1 write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0 @@ -938,3 +949,8 @@ on property:persist.vendor.softmaxfreq.cl1=* on property:persist.vendor.softmaxfreq.cl2=* write /sys/devices/platform/exynos-acme/freq_qos_max "6 ${persist.vendor.softmaxfreq.cl2}" + +# UFS +on property:ro.boot.mode=charger && property:init.svc.vendor.charger=running + # Enable UFS powersaving in Off Mode Charger + write /dev/sys/block/bootdevice/clkgate_enable 1 diff --git a/conf/init.gs201.usb.rc b/conf/init.gs201.usb.rc index 87245709..d8f89965 100644 --- a/conf/init.gs201.usb.rc +++ b/conf/init.gs201.usb.rc @@ -165,12 +165,6 @@ on property:vendor.usb.config=* on property:persist.vendor.usb.usbradio.config=* start usbd -on property:vendor.usb.dwc3_irq=medium - exec /vendor/bin/hw/set_usb_irq.sh medium - -on property:vendor.usb.dwc3_irq=big - exec /vendor/bin/hw/set_usb_irq.sh big - on charger mkdir /config/usb_gadget/g1 mkdir /config/usb_gadget/g1/strings/0x409 diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.gs201.rc index b9a9f7c6..c4006353 100644 --- a/conf/ueventd.gs201.rc +++ b/conf/ueventd.gs201.rc @@ -177,6 +177,9 @@ # TPU /dev/janeiro 0660 system system +# DSP +/dev/gxp 0666 system camera + # TOE /dev/dit2 0660 radio radio @@ -209,5 +212,8 @@ # Direct Charging /dev/logbuffer_pca9468_tcpm 0600 system system +# Raw HID devices +/dev/hidraw* 0660 system system + # Wlan /dev/wlan 0660 wifi wifi diff --git a/device.mk b/device.mk index c928b3c8..629f8407 100644 --- a/device.mk +++ b/device.mk @@ -153,50 +153,52 @@ endif USE_SWIFTSHADER := false # HWUI -TARGET_USES_VULKAN = false +TARGET_USES_VULKAN = true -PRODUCT_SOONG_NAMESPACES += vendor/arm/mali/valhall +PRODUCT_SOONG_NAMESPACES += \ + vendor/arm/mali/valhall $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) +include device/google/gs101/neuralnetwork/neuralnetwork.mk + PRODUCT_PACKAGES += \ - csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ - libGLES_mali \ - vulkan.mali \ - libOpenCL \ - libgpudataproducer \ + csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ + libGLES_mali \ + vulkan.mali \ + libOpenCL \ + libgpudataproducer \ PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.vulkan=mali - -include device/google/gs101/neuralnetwork/neuralnetwork.mk + ro.hardware.vulkan=mali ifeq ($(USE_SWIFTSHADER),true) PRODUCT_PACKAGES += \ - libGLESv1_CM_swiftshader \ - libEGL_swiftshader \ - libGLESv2_swiftshader + libGLESv1_CM_swiftshader \ + libEGL_swiftshader \ + libGLESv2_swiftshader endif PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ - frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ - frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ - frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ - frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ - frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml + frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ + frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ + frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ + frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.compute.xml \ + frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ + frameworks/native/data/etc/android.software.opengles.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml ifeq ($(USE_SWIFTSHADER),true) PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = swiftshader + ro.hardware.egl = swiftshader else PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = mali + ro.hardware.egl = mali endif + PRODUCT_VENDOR_PROPERTIES += \ - ro.opengles.version=196610 \ - debug.renderengine.backend=skiaglthreaded \ - graphics.gpu.profiler.support=true \ + ro.opengles.version=196610 \ + graphics.gpu.profiler.support=true \ + debug.renderengine.backend=skiaglthreaded \ # GRAPHICS - GPU (end) # #################### @@ -228,8 +230,8 @@ DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay # This will be updated to 33 (Android T) for shipping PRODUCT_SHIPPING_API_LEVEL := 32 -# Temporarily disable the debugfs restriction on 31 (Android S) -PRODUCT_SET_DEBUGFS_RESTRICTIONS := false +# RKP VINTF +-include vendor/google_nos/host/android/hals/keymaster/aidl/strongbox/RemotelyProvisionedComponent-citadel.mk # Enforce the Product interface PRODUCT_PRODUCT_VNDK_VERSION := current @@ -259,13 +261,14 @@ PRODUCT_PACKAGES += \ fstab.gs201.vendor_ramdisk \ fstab.gs201-fips \ fstab.gs201-fips.vendor_ramdisk + PRODUCT_COPY_FILES += \ - device/google/gs201/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem # Shell scripts PRODUCT_COPY_FILES += \ device/google/gs201/init.insmod.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.insmod.sh \ - device/google/$(TARGET_BOARD_PLATFORM)/set_usb_irq.sh:$(TARGET_COPY_OUT_VENDOR)/bin/hw/set_usb_irq.sh # insmod files PRODUCT_COPY_FILES += \ @@ -449,10 +452,6 @@ PRODUCT_PACKAGES += \ android.hardware.graphics.allocator@4.0-impl \ android.hardware.graphics.allocator-V1-service -# AIDL memtrack -PRODUCT_PACKAGES += \ - android.hardware.memtrack-service.example - PRODUCT_PACKAGES += \ memtrack.$(TARGET_BOARD_PLATFORM) \ libion_exynos \ @@ -604,6 +603,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms?=80 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_touch_timer_ms=200 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer_ms=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.max_frame_buffer_acquired_buffers=3 + +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.supports_background_blur=1 +PRODUCT_SYSTEM_PROPERTIES += ro.launcher.blur.appLaunch=0 # Must align with HAL types Dataspace # The data space of wide color gamut composition preference is Dataspace::DISPLAY_P3 @@ -882,9 +885,6 @@ PRODUCT_COPY_FILES += \ device/google/gs201/radio/config/default.nprf:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default.nprf \ device/google/gs201/radio/config/default_metrics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/modem/default_metrics.xml -PRODUCT_COPY_FILES += \ - device/google/gs201/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv - # ARM NN files ARM_COMPUTE_CL_ENABLE := 1 @@ -927,7 +927,6 @@ PRODUCT_PACKAGES += \ audio_amcs_ext \ audio.usb.default \ audio.usbv2.default \ - audio.a2dp.default \ audio.bluetooth.default \ audio.r_submix.default \ audio_spk_35l41 \ diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 2ac454af..bce7e68a 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,4 +1,18 @@ - + + + android.hardware.biometrics.face + + IFace + default + + + + android.hardware.biometrics.fingerprint + + IFingerprint + default + + android.hardware.contexthub 1 @@ -7,6 +21,21 @@ default + + android.hardware.dumpstate + 1.1 + + IDumpstateDevice + default + + + + android.hardware.gnss + + IGnss + default + + android.hardware.graphics.composer3 1 @@ -23,6 +52,14 @@ slot2 + + android.hardware.radio.config + 1.1 + + IRadioConfig + default + + android.hardware.vibrator 2 @@ -113,7 +150,7 @@ hardware.qorvo.uwb - IUwb + IUwbVendor default diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 790ee5bd..1dc3636a 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -63,6 +63,7 @@ namespace V1_1 { namespace implementation { #define GPS_LOG_PREFIX "gl-" +#define GPS_MCU_LOG_PREFIX "esw-" #define MODEM_LOG_PREFIX "sbuff_" #define EXTENDED_LOG_PREFIX "extended_log_" #define RIL_LOG_PREFIX "rild.log." @@ -190,13 +191,18 @@ void dumpModemEFS(std::string destDir) { } } -void DumpstateDevice::dumpGpsLogs(int fd, std::string destDir) { +void DumpstateDevice::dumpGpsLogs(int fd, const std::string &destDir) { const std::string gpsLogDir = GPS_LOG_DIRECTORY; const std::string gpsTmpLogDir = gpsLogDir + "/.tmp"; - int maxFileNum = android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 30); + const std::string gpsDestDir = destDir + "/gps"; + int maxFileNum = android::base::GetIntProperty(GPS_LOG_NUMBER_PROPERTY, 20); - dumpLogs(fd, gpsTmpLogDir, destDir, 1, GPS_LOG_PREFIX); - dumpLogs(fd, gpsLogDir, destDir, maxFileNum, GPS_LOG_PREFIX); + RunCommandToFd(fd, "MKDIR GPS LOG", {"/vendor/bin/mkdir", "-p", gpsDestDir.c_str()}, + CommandOptions::WithTimeout(2).Build()); + + dumpLogs(fd, gpsTmpLogDir, gpsDestDir, 1, GPS_LOG_PREFIX); + dumpLogs(fd, gpsLogDir, gpsDestDir, 3, GPS_MCU_LOG_PREFIX); + dumpLogs(fd, gpsLogDir, gpsDestDir, maxFileNum, GPS_LOG_PREFIX); } void DumpstateDevice::dumpCameraLogs(int fd, const std::string &destDir) { @@ -493,14 +499,20 @@ void DumpstateDevice::dumpThermalSection(int fd) { "for f in /sys/class/thermal/cooling* ; do " "type=`cat $f/type` ; temp=`cat $f/cur_state` ; echo \"$type: $temp\" ; " "done"}); + RunCommandToFd(fd, "Cooling Device User Vote State", {"/vendor/bin/sh", "-c", + "for f in /sys/class/thermal/cooling* ; do " + "if [ ! -f $f/user_vote ]; then continue; fi; " + "type=`cat $f/type` ; temp=`cat $f/user_vote` ; echo \"$type: $temp\" ; " + "done"}); RunCommandToFd(fd, "Cooling Device Time in State", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; " "do type=`cat $f/type` ; temp=`cat $f/stats/time_in_state_ms` ; echo \"$type:\n$temp\" ; done"}); RunCommandToFd(fd, "Cooling Device Trans Table", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; " "do type=`cat $f/type` ; temp=`cat $f/stats/trans_table` ; echo \"$type:\n$temp\" ; done"}); RunCommandToFd(fd, "Cooling Device State2Power Table", {"/vendor/bin/sh", "-c", "for f in /sys/class/thermal/cooling* ; do " - "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; " - "done"}); + "if [ ! -f $f/state2power_table ]; then continue; fi; " + "type=`cat $f/type` ; state2power_table=`cat $f/state2power_table` ; echo \"$type: $state2power_table\" ; " + "done"}); DumpFileToFd(fd, "TMU state:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_state"); DumpFileToFd(fd, "TMU current temperature:", "/sys/module/gs_thermal/parameters/tmu_reg_dump_current_temp"); DumpFileToFd(fd, "TMU_TOP rise thresholds:", "/sys/module/gs_thermal/parameters/tmu_top_reg_dump_rise_thres"); @@ -517,8 +529,63 @@ void DumpstateDevice::dumpTouchSection(int fd) { "/proc/fts_ext/driver_test"}; const char lsi_spi_path[] = "/sys/devices/virtual/sec/tsp"; const char syna_cmd_path[] = "/sys/class/spi_master/spi0/spi0.0/synaptics_tcm.0/sysfs"; + const char focaltech_cmd_path[] = "/proc/focaltech_touch"; char cmd[256]; + if (!access(focaltech_cmd_path, R_OK)) { + // Enable: force touch active + snprintf(cmd, sizeof(cmd), "echo 21 > %s/force_active", focaltech_cmd_path); + RunCommandToFd(fd, "Enable Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); + + // Touch Firmware Version + snprintf(cmd, sizeof(cmd), "%s/FW_Version", focaltech_cmd_path); + DumpFileToFd(fd, "Touch Firmware Version", cmd); + + // Touch INT PIN Test + snprintf(cmd, sizeof(cmd), "%s/INT_PIN", focaltech_cmd_path); + DumpFileToFd(fd, "Touch INT PIN Test", cmd); + + // Get Raw Data - Delta + snprintf(cmd, sizeof(cmd), "%s/selftest/Panel_Differ", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Panel_Differ", cmd); + + // Get Raw Data - Raw + snprintf(cmd, sizeof(cmd), "%s/selftest/Rawdata", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Raw", cmd); + + // Get Raw Data - Baseline + snprintf(cmd, sizeof(cmd), "%s/selftest/Baseline", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Baseline", cmd); + + // Get Raw Data - Noise + snprintf(cmd, sizeof(cmd), "%s/selftest/Noise", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Noise", cmd); + + // Get Raw Data - Uniformity + snprintf(cmd, sizeof(cmd), "%s/selftest/Rawdata_Uniformity", focaltech_cmd_path); + DumpFileToFd(fd, "Get Raw Data - Uniformity", cmd); + + // Get Scap_CB + snprintf(cmd, sizeof(cmd), "%s/selftest/Scap_CB", focaltech_cmd_path); + DumpFileToFd(fd, "Get Scap_CB", cmd); + + // Get Scap_CB - Raw + snprintf(cmd, sizeof(cmd), "%s/selftest/Scap_Rawdata", focaltech_cmd_path); + DumpFileToFd(fd, "Get Scap_Rawdata", cmd); + + // Get Short Test + snprintf(cmd, sizeof(cmd), "%s/selftest/Short", focaltech_cmd_path); + DumpFileToFd(fd, "Get Short Test", cmd); + + // Get HeatMap(ms,ss) + snprintf(cmd, sizeof(cmd), "%s/selftest/Strength", focaltech_cmd_path); + DumpFileToFd(fd, "Get HeatMap(ms,ss)", cmd); + + // Disable: force touch active + snprintf(cmd, sizeof(cmd), "echo 20 > %s/force_active", focaltech_cmd_path); + RunCommandToFd(fd, "Disable Force Touch Active", {"/vendor/bin/sh", "-c", cmd}); + } + if (!access(syna_cmd_path, R_OK)) { // Enable: force touch active snprintf(cmd, sizeof(cmd), "echo 21 > %s/force_active", syna_cmd_path); @@ -820,6 +887,8 @@ void DumpstateDevice::dumpMemorySection(int fd) { "fi; " "done"}); DumpFileToFd(fd, "dmabuf info", "/d/dma_buf/bufinfo"); + DumpFileToFd(fd, "Page Pinner - longterm pin", "/sys/kernel/debug/page_pinner/longterm_pinner"); + DumpFileToFd(fd, "Page Pinner - alloc_contig_failed", "/sys/kernel/debug/page_pinner/alloc_contig_failed"); } static void DumpF2FS(int fd) { @@ -890,13 +959,19 @@ void DumpstateDevice::dumpDisplaySection(int fd) { DumpFileToFd(fd, "CRTC-0 underrun count", "/sys/kernel/debug/dri/0/crtc-0/underrun_cnt"); DumpFileToFd(fd, "CRTC-0 crc count", "/sys/kernel/debug/dri/0/crtc-0/crc_cnt"); DumpFileToFd(fd, "CRTC-0 ecc count", "/sys/kernel/debug/dri/0/crtc-0/ecc_cnt"); + DumpFileToFd(fd, "CRTC-0 idma err count", "/sys/kernel/debug/dri/0/crtc-0/idma_err_cnt"); DumpFileToFd(fd, "CRTC-0 event log", "/sys/kernel/debug/dri/0/crtc-0/event"); DumpFileToFd(fd, "CRTC-1 underrun count", "/sys/kernel/debug/dri/0/crtc-1/underrun_cnt"); DumpFileToFd(fd, "CRTC-1 crc count", "/sys/kernel/debug/dri/0/crtc-1/crc_cnt"); DumpFileToFd(fd, "CRTC-1 ecc count", "/sys/kernel/debug/dri/0/crtc-1/ecc_cnt"); + DumpFileToFd(fd, "CRTC-1 idma err count", "/sys/kernel/debug/dri/0/crtc-1/idma_err_cnt"); DumpFileToFd(fd, "CRTC-1 event log", "/sys/kernel/debug/dri/0/crtc-1/event"); RunCommandToFd(fd, "libdisplaycolor", {"/vendor/bin/dumpsys", "displaycolor", "-v"}, CommandOptions::WithTimeout(2).Build()); + DumpFileToFd(fd, "Primary panel name", "/sys/devices/platform/exynos-drm/primary-panel/panel_name"); + DumpFileToFd(fd, "Primary panel extra info", "/sys/devices/platform/exynos-drm/primary-panel/panel_extinfo"); + DumpFileToFd(fd, "Secondary panel name", "/sys/devices/platform/exynos-drm/secondary-panel/panel_name"); + DumpFileToFd(fd, "Secondary panel extra info", "/sys/devices/platform/exynos-drm/secondary-panel/panel_extinfo"); } // Dump items related to AoC @@ -910,8 +985,23 @@ void DumpstateDevice::dumpAoCSection(int fd) { DumpFileToFd(fd, "AoC audio wake", "/sys/devices/platform/19000000.aoc/control/audio_wakeup"); DumpFileToFd(fd, "AoC logging wake", "/sys/devices/platform/19000000.aoc/control/logging_wakeup"); DumpFileToFd(fd, "AoC hotword wake", "/sys/devices/platform/19000000.aoc/control/hotword_wakeup"); - DumpFileToFd(fd, "AoC memory exception wake", "/sys/devices/platform/19000000.aoc/control/memory_exception"); - DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes"); + RunCommandToFd(fd, "AoC memory exception wake", {"/vendor/bin/sh", "-c", "cat /sys/devices/platform/19000000.aoc/control/memory_exception"}, CommandOptions::WithTimeout(2).Build()); + RunCommandToFd(fd, "AoC memory votes", {"/vendor/bin/sh", "-c", "cat /sys/devices/platform/19000000.aoc/control/memory_votes"}, CommandOptions::WithTimeout(2).Build()); + RunCommandToFd(fd, "AoC Heap Stats (A32)", + {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 1' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"}, + CommandOptions::WithTimeout(1).Build()); + RunCommandToFd(fd, "AoC Heap Stats (F1)", + {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 2' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"}, + CommandOptions::WithTimeout(1).Build()); + RunCommandToFd(fd, "AoC Heap Stats (HF0)", + {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 3' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"}, + CommandOptions::WithTimeout(1).Build()); + RunCommandToFd(fd, "AoC Heap Stats (HF1)", + {"/vendor/bin/sh", "-c", "echo 'dbg heap -c 4' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"}, + CommandOptions::WithTimeout(1).Build()); + RunCommandToFd(fd, "AoC MIF Stats", + {"/vendor/bin/sh", "-c", "echo 'mif details' > /dev/acd-debug; timeout 0.1 cat /dev/acd-debug"}, + CommandOptions::WithTimeout(1).Build()); } // Dump items related to sensors usf. diff --git a/dumpstate/DumpstateDevice.h b/dumpstate/DumpstateDevice.h index 10b95a17..eca59b26 100644 --- a/dumpstate/DumpstateDevice.h +++ b/dumpstate/DumpstateDevice.h @@ -84,7 +84,7 @@ struct DumpstateDevice : public IDumpstateDevice { // Hybrid and binary sections that require an additional file descriptor void dumpModem(int fd, int fdModem); void dumpRilLogs(int fd, std::string destDir); - void dumpGpsLogs(int fd, std::string destDir); + void dumpGpsLogs(int fd, const std::string &destDir); void dumpCameraLogs(int fd, const std::string &destDir); }; diff --git a/factory/factory_post_boot/Android.bp b/factory/factory_post_boot/Android.bp new file mode 100644 index 00000000..cbbebda4 --- /dev/null +++ b/factory/factory_post_boot/Android.bp @@ -0,0 +1,25 @@ +// +// Copyright (C) 2022 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} +sh_binary { + name: "factory_post_boot", + src: "factory_post_boot.sh", + vendor: true, + sub_dir: "factory", +} + diff --git a/factory/factory_post_boot/factory_post_boot.sh b/factory/factory_post_boot/factory_post_boot.sh new file mode 100644 index 00000000..82dfcfb0 --- /dev/null +++ b/factory/factory_post_boot/factory_post_boot.sh @@ -0,0 +1,4 @@ +#!/vendor/bin/sh + +# Add adbd to nnapi vendor cgroup. (b/222226268) +echo `pidof adbd` > /proc/vendor_sched/set_task_group_nnapi diff --git a/factory_common.mk b/factory_common.mk index 0e2fd5c2..fc745873 100644 --- a/factory_common.mk +++ b/factory_common.mk @@ -57,17 +57,23 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_f BOARD_BOOTCONFIG += androidboot.selinux=permissive BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive +# Disable DebugFS restrictions in factory builds +PRODUCT_SET_DEBUGFS_RESTRICTIONS := false + # Disable Bluetooth as default in factory build DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.factory.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.factory.rc +BOARD_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/factory_boost + # Add factory-friendly changes PRODUCT_PACKAGES += \ FactoryOverlaySettings \ FactoryOverlayLauncher3 \ - FactoryOverlayFrameworkRes + FactoryOverlayFrameworkRes \ + factory_post_boot # To prevent rebooting due to crashing services PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so index a5b86a39..48d5336d 100755 Binary files a/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so and b/gnss/47765/bin/android.hardware.gnss@2.1-impl-google.so differ diff --git a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm index ae410521..b679b152 100755 Binary files a/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm and b/gnss/47765/bin/android.hardware.gnss@2.1-service-brcm differ diff --git a/gnss/47765/bin/flp.default.so b/gnss/47765/bin/flp.default.so index 950a9f44..226f61ad 100755 Binary files a/gnss/47765/bin/flp.default.so and b/gnss/47765/bin/flp.default.so differ diff --git a/gnss/47765/bin/gps.default.so b/gnss/47765/bin/gps.default.so index 70f3767e..808f08f9 100755 Binary files a/gnss/47765/bin/gps.default.so and b/gnss/47765/bin/gps.default.so differ diff --git a/gnss/47765/bin/gpsd b/gnss/47765/bin/gpsd index b62e6e72..2d1d8ac4 100755 Binary files a/gnss/47765/bin/gpsd and b/gnss/47765/bin/gpsd differ diff --git a/gnss/47765/bin/lhd b/gnss/47765/bin/lhd index 89222b4a..ec4c7709 100755 Binary files a/gnss/47765/bin/lhd and b/gnss/47765/bin/lhd differ diff --git a/gnss/47765/bin/scd b/gnss/47765/bin/scd index 4a1ca2b7..f9643526 100755 Binary files a/gnss/47765/bin/scd and b/gnss/47765/bin/scd differ diff --git a/gnss/47765/config/lhd.conf b/gnss/47765/config/lhd.conf index 39e53695..efde25ba 100644 --- a/gnss/47765/config/lhd.conf +++ b/gnss/47765/config/lhd.conf @@ -17,7 +17,7 @@ LheBbdControl=/dev/bbd_control # LheBbdSensor=/dev/bbd_sensor -LheFailSafe=/data/vendor/gps/esw-crash-dump.txt +LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt LogLevel=*:I NvStorageDir=/data/vendor/gps/ diff --git a/gnss/47765/firmware/SensorHub.patch b/gnss/47765/firmware/SensorHub.patch index ac19ca17..5cdc8b50 100644 --- a/gnss/47765/firmware/SensorHub.patch +++ b/gnss/47765/firmware/SensorHub.patch @@ -1,9 +1,9 @@ - + - + @@ -78,8 +78,8 @@ C8352146284601F040FB2946204602F020FB022002904F F40050019004F1C80000905B22074B03A104F1900001F4 3BF703B030BD00004170700098E7890050938900690580 0025643A25640953746172742063687070417070546173 -6B0A00000000633A5C77735C626F645F34373736303933 -32315F3532383130325C637573746F6D6572735C676F6F +6B0A00000000633A5C77735C626F645F34373736303934 +39355F3532393437385C637573746F6D6572735C676F6F 676C655C503231466C61677461696C6D63755C64656C69 766572795C53656E736F724875625F5032315C7372635C 6875625F636F6E74726F6C6C65722E63000025643A2564 @@ -390,7 +390,7 @@ D00FF298080FF2206140F271673B4642468B2011F48EF2 F22046FEF700FF07E002464FF4D1630FF2F4518F2011F4 5FF2FEF769FC04F5A6620A23C2E9000105F0F00006F00F 0101433A462046BDE8F041FFF7BDBB0000633A5C77735C -626F645F3437373630393332315F3532383130325C6375 +626F645F3437373630393439355F3532393437385C6375 73746F6D6572735C676F6F676C655C503231466C616774 61696C6D63755C64656C69766572795C53656E736F7248 75625F5032315C7372635C636870705C7472616E73706F @@ -526,7 +526,7 @@ B590B00C46C17B0FF248420E91817B0D91417B0C91017B 25210378204626F4F1F510B010BD000025643A25640948 232568687520756E6B6E6F776E20726571756573742E20 636D643D2523782C2049443D256868750A00633A5C7773 -5C626F645F3437373630393332315F3532383130325C63 +5C626F645F3437373630393439355F3532393437385C63 7573746F6D6572735C676F6F676C655C503231466C6167 7461696C6D63755C64656C69766572795C53656E736F72 4875625F5032315C7372F19403502E8000635C63687070 @@ -658,13 +658,13 @@ F1040F01D1022070BD10F1020F0CBF0320FF2070BD0120 70BD70B5C90382B0A0F5A86419D500F65C552846FDF7E6 DE060012D00020009069462846FDF702DF761E012804DB 024600992046FEF78EF92846FDF75FDE002EECD173BD70 -470000633A5C77735C626F645F3437373630393332315F -3532383130325C637573746F6D6572735C676F6F676C65 +470000633A5C77735C626F645F3437373630393439355F +3532393437385C637573746F6D6572735C676F6F676C65 5C503231466C61677461696C6D63755C64656C69766572 795C53656E736F724875625F5032315C7372635C636870 705C696E636C7564655C636870702F7472616E73706F72 -742E6800633A5C77735C626F645F343737363039333231 -5F3532383130325C637573746F6D6572735C676F6F676C +742E6800633A5C77735C626F645F343737363039343935 +5F3532393437385C637573746F6D6572735C676F6F676C 655C503231466C61677461696C6D63755C64656C697665 72795C53656E736F724875625F5032315C7372635C6368 70705C706C6174666F726D5C62636D5C42434D34373778 @@ -674,8 +674,8 @@ FF32C0E91822002101E0491CC9B290F8342091421FDA00 9C42EBD2D26A04EB440302EBC306327C012AF1D1D6E902 23D0E918679F42E7D8E8D39642E4D2E5E7D0E91823CDE9 00230FF27C010FF2100240F21E238F200FF4A1F503B0F0 -BD0000633A5C77735C626F645F3437373630393332315F -3532383130325C637573746F6D6572735C676F6F676C65 +BD0000633A5C77735C626F645F3437373630393439355F +3532393437385C637573746F6D6572735C676F6F676C65 5C503231466C61677461696C6D63755C64656C69766572 795C53656E736F724875625F5032315C7372635C636870 705C636C69656E74732E630000000025643A2564096E65 @@ -684,8 +684,8 @@ BD0000633A5C77735C626F645F3437373630393332315F 0FF234010190009225238B200FF447F520680221FEF74D F90AE03246294625F410F501207870324620683946FEF7 08F9012003B0F0BD25643A2564094F4F4D206174202573 -3A25640A00633A5C77735C626F645F3437373630393332 -315F3532383130325C637573746F6D6572735C676F6F67 +3A25640A00633A5C77735C626F645F3437373630393439 +355F3532393437385C637573746F6D6572735C676F6F67 6C655C503231466C61677461696C6D63755C64656C6976 6572795C53656E736F724875625F5032315C7372635C63 6870705C73657276696365735C6C6F6F706261636B2E63 @@ -698,7 +698,7 @@ CDE9020122460E2000908F200FF2B0010FF4B3F4286831 4604B0BDE870400E22FEF77CB810B58B880124012B02D1 FFF7BEFF00E00024204610BD25643A2564094F4F4D2061 742025733A25640A00633A5C77735C626F645F34373736 -30393332315F3532383130325C637573746F6D6572735C +30393439355F3532393437385C637573746F6D6572735C 676F6F676C655C503231466C61677461696C6D63755C64 656C69766572795C53656E736F724875625F5032315C73 72635C636870705C73657276696365735C74696D657379 @@ -712,8 +712,8 @@ FFF7BEFF00E00024204610BD25643A2564094F4F4D2061 F4E1F309F101092437207A8145F3D320682A46314603B0 BDE8F043FDF7D2BF10B58A880124012A02D1FFF7BAFF00 E00024204610BD25643A2564094F4F4D2061742025733A -25640A00633A5C77735C626F645F343737363039333231 -5F3532383130325C637573746F6D6572735C676F6F676C +25640A00633A5C77735C626F645F343737363039343935 +5F3532393437385C637573746F6D6572735C676F6F676C 655C503231466C61677461696C6D63755C64656C697665 72795C53656E736F724875625F5032315C7372635C6368 70705C73657276696365735C646973636F766572792E63 @@ -740,7 +740,7 @@ F3FFF755FFC4E900010020C4E90200A878607403B030BD 61EB0905CDE90445AD230FF2AC118F200FF4C8F206B0BD E8708370B50446084615461E46FFF7BEFF324629462068 0068BDE87040FDF787BE00000000633A5C77735C626F64 -5F3437373630393332315F3532383130325C637573746F +5F3437373630393439355F3532393437385C637573746F 6D6572735C676F6F676C655C503231466C61677461696C 6D63755C64656C69766572795C53656E736F724875625F 5032315C7372635C636870705C73657276696365732E63 @@ -767,7 +767,7 @@ E001A8009038230FF264020FF250018B2019E001A80090 020FF22C018E2007E001A8009042230FF22C020FF21801 8F200FF48DF10DF5027D10BC5DF80CFB0FF28401416070 4725643A25640950414C3A2025730A0000633A5C77735C -626F645F3437373630393332315F3532383130325C6375 +626F645F3437373630393439355F3532393437385C6375 73746F6D6572735C676F6F676C655C503231466C616774 61696C6DF19403B043800063755C64656C69766572795C 53656E736F724875625F5032315C7372635C636870705C @@ -827,7 +827,7 @@ BF00210420FCF75DDC002897D120890DF42CF2012792E7 F0070032BD13460A4601460248007810F459B10000005D 890075458000854580005485890060D09100554580004B 468000436870704C696E6B5461736B00000000633A5C77 -735C626F645F3437373630393332315F3532383130325C +735C626F645F3437373630393439355F3532393437385C 637573746F6D6572735C676F6F676C655C503231466C61 677461696C6D63755C64656C69766572795C53656E736F 724875625F5032315C7372635C636870705C706C617466 @@ -893,8 +893,8 @@ E0F19403604E80002C6029460FF280222046FFF760F828 7150B90023002240F293210FF2380001B0BDE83040FBF7 22BC31BD0000B092890025643A256409474E5353207365 727669636520616C7265616479206F70656E0A00000000 -633A5C77735C626F645F3437373630393332315F353238 -3130325C637573746F6D6572735C676F6F676C655C5032 +633A5C77735C626F645F3437373630393439355F353239 +3437385C637573746F6D6572735C676F6F676C655C5032 31466C61677461696C6D63755C64656C69766572795C53 656E736F724875625F5032315C7372635C636870705C73 657276696365735C676E73732E63000025643A25640947 @@ -944,7 +944,7 @@ F19403F051800004F10800FFF7A8FF089E308880446078 4606D10023002295210FF23000FBF7DFF936B900230022 96210FF22000FBF7D7F93620FEF78EF9286030B1811D20 46FFF799FF36203060012070BD633A5C77735C626F645F -3437373630393332315F3532383130325C637573746F6D +3437373630393439355F3532393437385C637573746F6D 6572735C676F6F676C655C503231466C61677461696C6D 63755C64656C69766572795C53656E736F724875625F50 32315C7372635C636870705C636F6D6D6F6E5C676E7373 @@ -999,7 +999,7 @@ F217138F200DF457F7200E012814BF00200FF2B02016BD 2564095B25735D204D6561737572656D656E7420646174 61206576656E74203A206D6561737572656D656E745F63 6F756E74203D20282564290A000000633A5C77735C626F -645F3437373630393332315F3532383130325C63757374 +645F3437373630393439355F3532393437385C63757374 6F6D6572735C676F6F676C655C503231466C6167746169 6C6D63755C64656C69766572795C53656E736F72487562 5F5032315C7372635C636870705C706C6174666F726D5C @@ -1208,7 +1208,7 @@ B1C1B1A188A88830F410F4A988B1804FF47A73A288F280 F111FB00F008E0B08838B1A88070BD00291CBFF0880028 00D0A08070BD0B48017070470000094800787047000008 4801707047000006480078704700000148416170470000 -64858900E60E08002DCC91002ECC9100F19403E06A8000 +64858900461408002DCC91002ECC9100F19403E06A8000 2F2F6465706F742F636C69656E742F636F72652F72656C 2F476F6F676C652F5032322F3532373731392F2E2E2E00 00007E24247E5056542044756D70203A20474C4C207665 diff --git a/health/Health.cpp b/health/Health.cpp index d4030631..453c151a 100644 --- a/health/Health.cpp +++ b/health/Health.cpp @@ -67,7 +67,9 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"}; #define WLC_DIR "/sys/class/power_supply/wireless" -static BatteryDefender battDefender(WLC_DIR "/present"); +static BatteryDefender battDefender(WLC_DIR "/present", + "/sys/devices/platform/google,charger/charge_start_level", + "/sys/devices/platform/google,charger/charge_stop_level"); static BatteryThermalControl battThermalControl( "dev/thermal/tz-by-name/soc/mode"); static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV); diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml index 5ea7c7ea..97afb6b6 100644 --- a/manifest-gralloc3.xml +++ b/manifest-gralloc3.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder @@ -62,15 +62,6 @@ default - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - android.hardware.drm hwbinder @@ -169,5 +160,4 @@ default - diff --git a/manifest.xml b/manifest.xml index 716d5bf1..c1efc47d 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.audio hwbinder @@ -44,24 +44,6 @@ default - - android.hardware.graphics.composer - hwbinder - 2.4 - - IComposer - default - - - - android.hardware.renderscript - passthrough - 1.0 - - IDevice - default - - android.hardware.dumpstate hwbinder @@ -120,5 +102,4 @@ default - diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml index 3ab41a47..62b47070 100644 --- a/media_codecs_aosp_c2.xml +++ b/media_codecs_aosp_c2.xml @@ -115,7 +115,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -214,7 +214,7 @@ - + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 65fdf501..7ef7556f 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -18,6 +18,8 @@ --> + + false false @@ -251,16 +253,6 @@ true - - - com.nianticlabs.pokemongo - com.google.android.documentsui - com.activision.callofduty.shooter - jp.konami.epjCastlevania2 - - - diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml index 0afa3ca8..2a0cf015 100644 --- a/overlay/packages/services/Telephony/res/values/config.xml +++ b/overlay/packages/services/Telephony/res/values/config.xml @@ -31,9 +31,4 @@ com.shannon.rcsservice - - - true diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp index 6a4a3a8e..23ae5f76 100644 --- a/pixelstats/service.cpp +++ b/pixelstats/service.cpp @@ -35,12 +35,14 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { .SlowioWriteCntPath = UFSHC_PATH(slowio_write_cnt), .SlowioUnmapCntPath = UFSHC_PATH(slowio_unmap_cnt), .SlowioSyncCntPath = UFSHC_PATH(slowio_sync_cnt), + .CycleCountBinsPath = "/sys/class/power_supply/battery/cycle_counts", .UFSLifetimeA = UFSHC_PATH(health_descriptor/life_time_estimation_a), .UFSLifetimeB = UFSHC_PATH(health_descriptor/life_time_estimation_b), .UFSLifetimeC = UFSHC_PATH(health_descriptor/life_time_estimation_c), .F2fsStatsPath = "/sys/fs/f2fs/", .ImpedancePath = "/sys/devices/platform/audiometrics/speaker_impedance", .CodecPath = "/sys/devices/platform/audiometrics/codec_state", + .EEPROMPath = "/dev/battery_history", .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp", .SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion", .SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat", @@ -57,7 +59,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = { const struct UeventListener::UeventPaths ueventPaths = { .AudioUevent = "/devices/virtual/amcs/amcs", -}; + .WirelessChargerPtmcPath = "/sys/class/power_supply/wireless/device/ptmc_id", + .TypeCPartnerUevent = "PRODUCT_TYPE="}; int main() { LOG(INFO) << "starting PixelStats"; diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 04de41d7..6232a6e0 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -136,6 +136,23 @@ void addAoC(std::shared_ptr p) { }; p->addStateResidencyDataProvider( std::make_unique(monitorIds, monitorStates)); + + // Add AoC restart count + const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = { + .entryCountSupported = true, + .entryCountPrefix = "", + .totalTimeSupported = false, + .lastEntrySupported = false, + }; + const std::vector> restartCountHeaders = { + std::make_pair("RESTART", ""), + }; + std::vector cfgs; + cfgs.emplace_back( + generateGenericStateResidencyConfigs(restartCountConfig, restartCountHeaders), + "AoC-Count", ""); + p->addStateResidencyDataProvider(std::make_unique( + "/sys/devices/platform/19000000.aoc/restart_count", cfgs)); } void addDvfsStats(std::shared_ptr p) { @@ -221,15 +238,10 @@ void addDvfsStats(std::shared_ptr p) { cfgs.push_back({"TPU", { std::make_pair("1066MHz", "1066000"), std::make_pair("845MHz", "845000"), - std::make_pair("625MHz", "625000"), - std::make_pair("227MHz", "227000"), - std::make_pair("RET_SLOW", "6"), - std::make_pair("S_OFF", "5"), - std::make_pair("S_SLOW", "4"), - std::make_pair("DS_FAST", "3"), - std::make_pair("DS_SLOW", "2"), - std::make_pair("DS_OFF", "1"), - std::make_pair("OFF", "0"), + std::make_pair("627MHz", "627000"), + std::make_pair("401MHz", "401000"), + std::make_pair("226MHz", "226000"), + std::make_pair("0MHz", "0"), }}); p->addStateResidencyDataProvider(std::make_unique( @@ -587,6 +599,10 @@ void addDevfreq(std::shared_ptr p) { p->addStateResidencyDataProvider(std::make_unique( "MFC", "/sys/devices/platform/17000070.devfreq_mfc/devfreq/17000070.devfreq_mfc")); + + p->addStateResidencyDataProvider(std::make_unique( + "BO", + "/sys/devices/platform/17000080.devfreq_bo/devfreq/17000080.devfreq_bo")); } void addTPU(std::shared_ptr p) { @@ -594,8 +610,8 @@ void addTPU(std::shared_ptr p) { stateCoeffs = { // TODO (b/197721618): Measuring the TPU power numbers - {"227000", 10}, - {"625000", 20}, + {"226000", 10}, + {"627000", 20}, {"845000", 30}, {"1066000", 40}}; diff --git a/radio/config/Pixel_Default.cfg b/radio/config/Pixel_Default.cfg new file mode 100644 index 00000000..b1a83fde --- /dev/null +++ b/radio/config/Pixel_Default.cfg @@ -0,0 +1 @@ +Pixel_Default.nprf,Pixel_Default_metrics.xml \ No newline at end of file diff --git a/radio/config/Pixel_Default.nprf b/radio/config/Pixel_Default.nprf new file mode 100644 index 00000000..a44777e0 Binary files /dev/null and b/radio/config/Pixel_Default.nprf differ diff --git a/radio/config/Pixel_Default_metrics.xml b/radio/config/Pixel_Default_metrics.xml new file mode 100644 index 00000000..c678c513 --- /dev/null +++ b/radio/config/Pixel_Default_metrics.xml @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/radio/config/default.nprf b/radio/config/default.nprf index 1b4c00b4..de43b848 100644 Binary files a/radio/config/default.nprf and b/radio/config/default.nprf differ diff --git a/radio/config/logging.conf b/radio/config/logging.conf index deb09dbe..d57c82aa 100644 --- a/radio/config/logging.conf +++ b/radio/config/logging.conf @@ -1 +1 @@ -modem_logging_control START -o /data/vendor/radio/logs/always-on -n 20 -s 50 -m /vendor/etc/modem/default.cfg --enable_exmetric --enable_exmetric_internal +modem_logging_control START -o /data/vendor/radio/logs/always-on -n 10 -s 20 -m /vendor/etc/modem/default.cfg --enable_exmetric --enable_exmetric_internal \ No newline at end of file diff --git a/set_usb_irq.sh b/set_usb_irq.sh deleted file mode 100644 index 29d37812..00000000 --- a/set_usb_irq.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/vendor/bin/sh - -# Switch into /proc/irq/$IRQ for the dwc3 usb controller -cd /proc/irq/*/dwc3/.. || exit 7 - -# Move the USB Controller (DWC3) interrupt as requested -# Modem and DIT are on 0/2/5 depending on throughput, so avoid those. -# 0-3 small, 4-5 medium, 6-7 big -case "$1" in - medium) core=4;; - big) core=6;; - *) core=0;; -esac - -# This can sometimes fail due to smp_affinity_list no longer existing... -echo "${core}" > smp_affinity_list diff --git a/task_profiles.json b/task_profiles.json index ac21c778..4bcfe412 100644 --- a/task_profiles.json +++ b/task_profiles.json @@ -7,8 +7,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_ta", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ta", + "FilePath": "/proc/vendor_sched/set_task_group_ta", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_ta", "Value": "", "LogFailures": "false" } @@ -22,8 +22,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_cam", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_cam", + "FilePath": "/proc/vendor_sched/set_task_group_cam", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_cam", "Value": "", "LogFailures": "false" } @@ -37,8 +37,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_cam_power", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_cam_power", + "FilePath": "/proc/vendor_sched/set_task_group_cam_power", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_cam_power", "Value": "", "LogFailures": "false" } @@ -52,8 +52,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_dex2oat", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_dex2oat", + "FilePath": "/proc/vendor_sched/set_task_group_dex2oat", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_dex2oat", "Value": "", "LogFailures": "false" } @@ -67,8 +67,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_ota", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ota", + "FilePath": "/proc/vendor_sched/set_task_group_ota", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_ota", "Value": "", "LogFailures": "false" } @@ -121,8 +121,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_bg", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_bg", + "FilePath": "/proc/vendor_sched/set_task_group_bg", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_bg", "Value": "", "LogFailures": "false" } @@ -136,8 +136,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_sys", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sys", + "FilePath": "/proc/vendor_sched/set_task_group_sys", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_sys", "Value": "", "LogFailures": "false" } @@ -151,8 +151,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_fg", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_fg", + "FilePath": "/proc/vendor_sched/set_task_group_fg", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_fg", "Value": "", "LogFailures": "false" } @@ -166,8 +166,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_ta", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_ta", + "FilePath": "/proc/vendor_sched/set_task_group_ta", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_ta", "Value": "", "LogFailures": "false" } @@ -181,8 +181,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_nnapi", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_nnapi", + "FilePath": "/proc/vendor_sched/set_task_group_nnapi", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_nnapi", "Value": "", "LogFailures": "false" } @@ -196,8 +196,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_sysbg", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sysbg", + "FilePath": "/proc/vendor_sched/set_task_group_sysbg", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_sysbg", "Value": "", "LogFailures": "false" } @@ -219,8 +219,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_sf", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_sf", + "FilePath": "/proc/vendor_sched/set_task_group_sf", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_sf", "Value": "", "LogFailures": "false" } @@ -242,8 +242,8 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/set_task_group_rt", - "ProcFilePath": "/sys/kernel/vendor_sched/set_proc_group_rt", + "FilePath": "/proc/vendor_sched/set_task_group_rt", + "ProcFilePath": "/proc/vendor_sched/set_proc_group_rt", "Value": "", "LogFailures": "false" } @@ -257,7 +257,7 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/uclamp_fork_reset_set", + "FilePath": "/proc/vendor_sched/uclamp_fork_reset_set", "Value": "", "LogFailures": "false" } @@ -271,7 +271,7 @@ "Name": "WriteFile", "Params": { - "FilePath": "/sys/kernel/vendor_sched/uclamp_fork_reset_clear", + "FilePath": "/proc/vendor_sched/uclamp_fork_reset_clear", "Value": "", "LogFailures": "false" } diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 9fdf2acc..2a1e16c5 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -270,9 +270,13 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) { ret = setVidPid("0x18d1", "0x4eeb"); break; case GadgetFunction::ADB | GadgetFunction::NCM: - if (!(vendorFunctions == "user" || vendorFunctions == "")) - ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); - ret = setVidPid("0x18d1", "0x4eec"); + if (vendorFunctions == "dm") { + ret = setVidPid("0x04e8", "0x6862"); + } else { + if (!(vendorFunctions == "user" || vendorFunctions == "")) + ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); + ret = setVidPid("0x18d1", "0x4eec"); + } break; default: ALOGE("Combination not supported");