diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 5fb7a2a9..eebe31c6 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -38,11 +38,21 @@ 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=noforce 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/conf/init.factory.rc b/conf/init.factory.rc index f218f3fd..ed294fda 100644 --- a/conf/init.factory.rc +++ b/conf/init.factory.rc @@ -15,5 +15,5 @@ on boot on property:sys.boot_completed=1 # Bump nnapi min clamp & add adbd to it for factory (b/222226268) - write /sys/kernel/vendor_sched/nnapi_uclamp_min 512 + 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 c03fc64e..9d7fc46b 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -17,55 +17,55 @@ 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 - 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 wait /dev/block/platform/${ro.boot.boot_devices} symlink /dev/block/platform/${ro.boot.boot_devices} /dev/block/bootdevice @@ -127,12 +127,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 +173,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 @@ -280,8 +280,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 +392,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 @@ -697,28 +697,28 @@ 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/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 diff --git a/conf/ueventd.gs201.rc b/conf/ueventd.gs201.rc index 9cc3ceaa..3ea5b585 100644 --- a/conf/ueventd.gs201.rc +++ b/conf/ueventd.gs201.rc @@ -212,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 deffaae0..f61e594c 100644 --- a/device.mk +++ b/device.mk @@ -230,9 +230,6 @@ 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 - # Enforce the Product interface PRODUCT_PRODUCT_VNDK_VERSION := current PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true @@ -890,9 +887,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 diff --git a/factory/factory_post_boot/factory_post_boot.sh b/factory/factory_post_boot/factory_post_boot.sh index f610901a..82dfcfb0 100644 --- a/factory/factory_post_boot/factory_post_boot.sh +++ b/factory/factory_post_boot/factory_post_boot.sh @@ -1,4 +1,4 @@ #!/vendor/bin/sh # Add adbd to nnapi vendor cgroup. (b/222226268) -echo `pidof adbd` > /sys/kernel/vendor_sched/set_task_group_nnapi +echo `pidof adbd` > /proc/vendor_sched/set_task_group_nnapi diff --git a/factory_common.mk b/factory_common.mk index 4a5d42bd..fc745873 100644 --- a/factory_common.mk +++ b/factory_common.mk @@ -57,6 +57,9 @@ 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 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/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" }