From bb2247f5ba03ab4e23ea345e457d48da6775c5a6 Mon Sep 17 00:00:00 2001 From: Alexander Koskovich Date: Tue, 16 Mar 2021 09:15:43 -0700 Subject: [PATCH 1/3] FP4: init: Don't mount TraceFS twice * AOSP already mounts TraceFS in system init, so mounting it twice causes SEPolicy denials. See the comments in this change. https://android-review.googlesource.com/c/platform/system/sepolicy/+/1294195 Change-Id: Ic5d9ac2dbd36e404a93a8d48aa0ea933fd7fa701 --- rootdir/etc/init.qcom.rc | 2 -- 1 file changed, 2 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index aa2ff2e..53eb520 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -32,8 +32,6 @@ import /vendor/etc/init/hw/init.stnfc.rc on early-init mount debugfs debugfs /sys/kernel/debug chmod 0755 /sys/kernel/debug - mount tracefs tracefs /sys/kernel/tracing - chmod 0755 /sys/kernel/tracing # create symlink for vendor mount points symlink /vendor/firmware_mnt /firmware -- GitLab From beaf0bbb4143f954c3e53f803b6a02a423a4ad75 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Fri, 2 Apr 2021 11:33:45 -0700 Subject: [PATCH 2/3] FP4: Set PRODUCT_SET_DEBUGFS_RESTRICTIONS Starting with Android R launched devices, debugfs cannot be mounted in production builds. In order to avoid accidental debugfs dependencies from creeping in during development with userdebug/eng builds, the build flag PRODUCT_SET_DEBUGFS_RESTRICTIONS can be set by vendors to enforce additional debugfs restrictions for userdebug/eng builds. The same flag will be used to enable sepolicy neveallow statements to prevent new permissions added for debugfs access. Test: build, boot Bug: 184381659 Change-Id: I45e6f20c886d467a215c9466f3a09965ff897d7e --- device.mk | 3 +++ rootdir/etc/init.qcom.rc | 19 ------------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/device.mk b/device.mk index 3492371..2ec55a1 100644 --- a/device.mk +++ b/device.mk @@ -235,6 +235,9 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.display.mapper@3.0.vendor \ vendor.qti.hardware.display.mapper@4.0.vendor +# DebugFS +PRODUCT_SET_DEBUGFS_RESTRICTIONS := true + # DRM PRODUCT_PACKAGES += \ android.hardware.drm@1.3.vendor \ diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 53eb520..c0e5ca7 100755 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -30,28 +30,14 @@ import /vendor/etc/init/hw/init.target.rc import /vendor/etc/init/hw/init.stnfc.rc on early-init - mount debugfs debugfs /sys/kernel/debug - chmod 0755 /sys/kernel/debug - # create symlink for vendor mount points symlink /vendor/firmware_mnt /firmware symlink /vendor/bt_firmware /bt_firmware symlink /vendor/dsp /dsp - # Change ownership of hw_recovery related nodes - chown system graphics /sys/kernel/debug/dri/0/debug/dump - chown system graphics /sys/kernel/debug/dri/0/debug/recovery_reg - chown system graphics /sys/kernel/debug/dri/0/debug/recovery_dbgbus - chown system graphics /sys/kernel/debug/dri/0/debug/recovery_vbif_dbgbus - chown system graphics /sys/kernel/debug/dri/0/debug/recovery_dsi_dbgbus - # Change ownership of sysfs power control node chown system graphics /sys/class/drm/card0/device/power/control - # Change ownership of sw_sync node - chown system graphics /sys/kernel/debug/sync/sw_sync - chmod 0666 /sys/kernel/debug/sync/sw_sync - #Disable UFS clock scaling write /sys/bus/platform/devices/1d84000.ufshc/clkscale_enable 0 @@ -73,9 +59,6 @@ on init chown root system /sys/fs/cgroup/memory/bg/tasks chmod 0660 /sys/fs/cgroup/memory/bg/tasks -on post-fs - chmod 0755 /sys/kernel/debug/tracing - on early-boot # set RLIMIT_MEMLOCK to 64MB setrlimit 8 67108864 67108864 @@ -112,8 +95,6 @@ on boot chown bluetooth bluetooth /sys/module/hci_smd/parameters/hcismd_set chown system system /sys/module/msm_core/parameters/polling_interval chown system system /sys/module/msm_core/parameters/disabled - chown system system /sys/kernel/debug/msm_core/enable - chown system system /sys/kernel/debug/msm_core/ptable chown system system /sys/kernel/boot_slpi/ssr chmod 0660 /sys/module/bluetooth_power/parameters/power chmod 0660 /sys/module/hci_smd/parameters/hcismd_set -- GitLab From c164538f6c71fa086e60e3e371e4c9aea854ec92 Mon Sep 17 00:00:00 2001 From: Rohit Date: Mon, 17 Apr 2023 14:16:38 +0530 Subject: [PATCH 3/3] FP4: Switch to the new kernel fragment handling * TARGET_KERNEL_ADDITIONAL_CONFIG was nuked by https://review.lineageos.org/c/LineageOS/android_vendor_lineage/+/326882 --- BoardConfig.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 0830e06..0be0877 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -93,9 +93,8 @@ BOARD_KERNEL_PAGESIZE := 4096 BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64) BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_KERNEL_IMAGE_NAME := Image -TARGET_KERNEL_ADDITIONAL_CONFIG := vendor/debugfs.config TARGET_KERNEL_SOURCE := kernel/fairphone/FP4 -TARGET_KERNEL_CONFIG := lineage_FP4_defconfig +TARGET_KERNEL_CONFIG := lineage_FP4_defconfig vendor/debugfs.config # Media TARGET_USES_ION := true -- GitLab