treewide: Disable some oplus features

Signed-off-by: LibXZR <i@xzr.moe>

Author: libxzr

OplusKernelEnvConfig.mk

@@ -41,29 +41,21 @@ $(foreach myfeature,$(OPLUS_CONNECTIVITY_NATIVE_FEATURE_SET),\
 )
 ###endif OPLUS_ARCH_INJECT
 
-ALLOWED_MCROS := OPLUS_FEATURE_FG_IO_OPT  \
-OPLUS_FEATURE_SPECIALOPT \
-OPLUS_FEATURE_PERFORMANCE  \
+ALLOWED_MCROS := OPLUS_FEATURE_PERFORMANCE  \
 OPLUS_FEATURE_STORAGE_TOOL  \
 OPLUS_FEATURE_UFS_DRIVER  \
 OPLUS_FEATURE_UFS_SHOW_LATENCY \
 OPLUS_FEATURE_UFSPLUS  \
 OPLUS_FEATURE_PADL_STATISTICS \
 OPLUS_FEATURE_EMMC_SDCARD_OPTIMIZE  \
 OPLUS_FEATURE_EMMC_DRIVER  \
-OPLUS_FEATURE_HEALTHINFO  \
-OPLUS_FEATURE_TASK_CPUSTATS \
 OPLUS_FEATURE_HANS_FREEZE  \
-OPLUS_FEATURE_SCHED_ASSIST  \
-OPLUS_FEATURE_IOMONITOR  \
 OPLUS_FEATURE_TP_BSPFWUPDATE  \
-OPLUS_FEATURE_LOWMEM_DBG  \
 OPLUS_FEATURE_QCOM_PMICWD  \
 OPLUS_FEATURE_CHG_BASIC  \
 OPLUS_FEATURE_NWPOWER  \
 OPLUS_FEATURE_WIFI_BDF  \
 OPLUS_FEATURE_CONNFCSOFT  \
-OPLUS_FEATURE_AGINGTEST  \
 OPLUS_FEATURE_SENSOR_SMEM  \
 OPLUS_FEATURE_SSR  \
 OPLUS_FEATURE_TP_BASIC  \
@@ -84,13 +76,10 @@ OPLUS_FEATURE_MEMORY_ISOLATE  \
 OPLUS_FEATURE_MULTI_KSWAPD  \
 OPLUS_FEATURE_WIFI_MTUDETECT  \
 OPLUS_FEATURE_XTOWNER_INPUT  \
-OPLUS_FEATURE_SELINUX_CONTROL_LOG  \
 OPLUS_FEATURE_PXLW_IRIS5  \
 OPLUS_FEATURE_MULTI_FREEAREA  \
 OPLUS_FEATURE_VIRTUAL_RESERVE_MEMORY  \
-OPLUS_FEATURE_GPU_MINIDUMP  \
 OPLUS_FEATURE_PROCESS_RECLAIM  \
-OPLUS_FEATURE_ZRAM_OPT \
 OPLUS_FEATURE_AUDIO_FTM \
 OPLUS_FEATURE_SPEAKER_MUTE \
 OPLUS_FEATURE_MM_FEEDBACK \
@@ -110,12 +99,10 @@ OPLUS_FEATURE_AUDIODETECT \
 VENDOR_EDIT \
 OPLUS_FEATURE_DC \
 OPLUS_FEATURE_POWERINFO_STANDBY \
-OPLUS_FEATURE_POWERINFO_RPMH \
 OPLUS_FEATURE_CAMERA_COMMON \
 OPLUS_FEATURE_ADSP_RECOVERY \
 OPLUS_FEATURE_SMARTPA_PM \
 OPLUS_FEATURE_IMPEDANCE_MATCH \
-OPLUS_FEATURE_MODEM_MINIDUMP \
 OPLUS_FEATURE_THEIA \
 OPLUS_FEATURE_POWER_CPUFREQ \
 OPLUS_FEATURE_MIDAS \
@@ -124,11 +111,8 @@ OPLUS_FEATURE_WIFI_DUALSTA_AP_BLACKLIST \
 OPLUS_FEATURE_WIFI_DCS_SWITCH \
 OPLUS_FEATURE_SOFTAP_DCS_SWITCH \
 OPLUS_FEATURE_IM \
-OPLUS_FEATURE_TPD \
-OPLUS_FEATURE_APP_MONITOR\
 OPLUS_FEATURE_RT_INFO \
 OPLUS_FEATURE_MIC_VA_MIC_CLK_SWITCH\
-OPLUS_FEATURE_SIGKILL_DIAGNOSIS \
 OPLUS_FEATURE_SENSOR
 
 ifeq ($(OPLUS_FEATURE_ADFR_KERNEL), yes)

arch/arm64/configs/vendor/meteoric_defconfig

@@ -17,19 +17,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_IKHEADERS=y
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=17
-CONFIG_OPLUS_FEATURE_SCHED_ASSIST=y
-CONFIG_OPLUS_FEATURE_SCHED_UX_PRIORITY=y
-CONFIG_OPLUS_UX_IM_FLAG=y
-CONFIG_OPLUS_FEATURE_AUDIO_OPT=y
-CONFIG_OPLUS_LOCKING_STRATEGY=y
-CONFIG_OPLUS_CPU_AUDIO_PERF=y
-CONFIG_OPLUS_LOCKING_OSQ=y
-CONFIG_OPLUS_LOCKING_MONITOR=y
-CONFIG_OPLUS_FEATURE_EAS_OPT=y
-CONFIG_OPLUS_FEATURE_VT_CAP=y
-CONFIG_OPLUS_CPUFREQ_IOWAIT_PROTECT=y
-CONFIG_OPLUS_FEATURE_FRAME_BOOST=y
-CONFIG_UA_KERNEL_CPU_IOCTL=y
 CONFIG_MEMCG=y
 CONFIG_MEMCG_SWAP=y
 CONFIG_BLK_CGROUP=y
@@ -113,23 +100,18 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_IOSCHED_BFQ=y
 CONFIG_BFQ_GROUP_IOSCHED=y
-CONFIG_OPLUS_BLK_MONITOR=y
-CONFIG_LOCKING_PROTECT=y
-CONFIG_OPLUS_FEATURE_SIGKILL_DIAGNOSIS=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_CMA=y
 CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_AREAS=16
 CONFIG_ZSMALLOC=y
 CONFIG_PGTABLE_MAPPING=y
 CONFIG_HAVE_USERSPACE_LOW_MEMORY_KILLER=y
-CONFIG_OPLUS_MEM_MONITOR=y
 CONFIG_OPLUS_MULTI_KSWAPD=y
 CONFIG_KSWAPD_UNBIND_MAX_CPU=y
 CONFIG_KSHRINK_SLABD=y
 CONFIG_SHRINK_LRU_TRYLOCK=y
 CONFIG_OOM_REAPER_RECLAIM_MEMORY=y
-CONFIG_OPLUS_UXMEM_OPT=y
 CONFIG_KMALLOC_DEBUG=y
 CONFIG_VMALLOC_DEBUG=y
 CONFIG_DUMP_TASKS_MEM=y
@@ -710,17 +692,13 @@ CONFIG_QTI_CRYPTO_COMMON=y
 CONFIG_QTI_CRYPTO_TZ=y
 CONFIG_OPLUS_COMMON_SOFT=y
 CONFIG_OPLUS_DEVICE_IFNO=y
-CONFIG_OPLUS_FEATURE_LOWMEM_DBG=y
 CONFIG_OPLUS_FEATURE_MIDAS=y
 CONFIG_OPLUS_FEATURE_BINDER_STATS_ENABLE=y
 CONFIG_SVELTE=y
-CONFIG_IOMONITOR=y
 CONFIG_OPLUS_FEATURE_FEEDBACK=y
 CONFIG_OPLUS_FEATURE_UBOOT_LOG=y
 CONFIG_OPLUS_FEATURE_SHUTDOWN_DETECT=y
 CONFIG_OPLUS_FEATURE_OPROJECT=y
-CONFIG_OPLUS_FEATURE_QCOM_MINIDUMP_ENHANCE=y
-CONFIG_OPLUS_FEATURE_HUNG_TASK_ENHANCE=y
 CONFIG_OPLUS_FEATURE_PHOENIX=y
 CONFIG_OPLUS_FEATURE_KMSG_WB=y
 CONFIG_OPLUS_FEATURE_PHOENIX_REBOOT_SPEED=y
@@ -739,17 +717,14 @@ CONFIG_OPLUS_FEATURE_THEIA=y
 CONFIG_OPLUS_FEATURE_MDMFEATURE=y
 CONFIG_OPLUS_FEATURE_OLC=y
 CONFIG_OPLUS_FEATURE_FDLEAK_CHECK=y
-CONFIG_OPLUS_HEALTHINFO=y
 CONFIG_MMAP_LOCK_OPT=y
 CONFIG_OPLUS_WAKELOCK_PROFILER=y
 CONFIG_SSC_INTERACTIVE=y
 CONFIG_OPLUS_SENSOR_FB_QC=y
 CONFIG_OPLUS_GPIO=y
 CONFIG_OPLUS_FEATURE_TPP=y
 CONFIG_OPLUS_FEATURE_IM=y
-CONFIG_OPLUS_FEATURE_TPD=y
 CONFIG_OPLUS_FEATURE_GAME_OPT=y
-CONFIG_OPLUS_FEATURE_ABNORMAL_FLAG=y
 CONFIG_DEVFREQ_GOV_PASSIVE=y
 CONFIG_QCOM_BIMC_BWMON=y
 CONFIG_ARM_MEMLAT_MON=y
@@ -810,10 +785,6 @@ CONFIG_INCREMENTAL_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
 CONFIG_EXFAT_FS=y
-CONFIG_OPLUS_FEATURE_CPU_JANKINFO=y
-CONFIG_OPLUS_CTP=y
-CONFIG_OPLUS_SCHED=y
-CONFIG_OPLUS_JANK_INFO=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_ECRYPT_FS=y
 CONFIG_ECRYPT_FS_MESSAGING=y
@@ -875,3 +846,5 @@ CONFIG_CORESIGHT_REMOTE_ETM=y
 CONFIG_CORESIGHT_TGU=y
 CONFIG_UNICODE=y
 CONFIG_FORCE_FAST_CHARGE=y
+# CONFIG_OPLUS_FEATURE_UXIO_FIRST is not set
+# CONFIG_FG_TASK_UID is not set

block/blk-core.c

@@ -3051,7 +3051,9 @@ EXPORT_SYMBOL(blk_peek_request);
 
 static void blk_dequeue_request(struct request *rq)
 {
+#ifdef OPLUS_FEATURE_HEALTHINFO
 	struct request_queue *q = rq->q;
+#endif
 
 	BUG_ON(list_empty(&rq->queuelist));
 	BUG_ON(ELV_ON_HASH(rq));

kernel/futex.c

@@ -2383,8 +2383,12 @@ static inline void __queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
 	locking_vh_alter_futex_plist_add(&q->list, &hb->chain, &already_on_hb);
 #endif
 */
+
+#ifdef CONFIG_OPLUS_LOCKING_STRATEGY
 	if (!already_on_hb)
 		plist_add(&q->list, &hb->chain);
+#endif
+
 	q->task = current;
 }
 

kernel/sched/fair.c

@@ -7253,6 +7253,7 @@ static int get_start_cpu(struct task_struct *p)
         }
 #endif
 
+#ifdef CONFIG_OPLUS_FEATURE_SCHED_ASSIST
 	trace_sched_cpu_sel(p,
 			task_boost,
 			task_skip_min,
@@ -7264,6 +7265,7 @@ static int get_start_cpu(struct task_struct *p)
 			task_demand_fits(p, rd->min_cap_orig_cpu),
 			sysctl_prefer_silver,
 			start_cpu);
+#endif
 
 	return start_cpu;
 }
@@ -7310,9 +7312,11 @@ static void find_best_target(struct sched_domain *sd, cpumask_t *cpus,
 	unsigned int target_nr_rtg_high_prio = UINT_MAX;
 	bool rtg_high_prio_task = task_rtg_high_prio(p);
 	cpumask_t new_allowed_cpus;
+#ifdef OPLUS_FEATURE_SCHED_ASSIST
 	bool skip_big_cluster = false;
-#if defined(OPLUS_FEATURE_SCHED_ASSIST) && defined(CONFIG_OPLUS_FEATURE_SCHED_SPREAD)
+#ifdef CONFIG_OPLUS_FEATURE_SCHED_SPREAD
 	bool strict = fbt_env->strict_max;
+#endif
 #endif
 	/*
 	 * In most cases, target_capacity tracks capacity_orig of the most
@@ -9514,7 +9518,9 @@ static int detach_tasks(struct lb_env *env)
 	int detached = 0;
 	int orig_loop = env->loop;
 	u64 start_t = rq_clock(env->src_rq);
+#ifdef OPLUS_FEATURE_SCHED_ASSIST
 	bool skip_big_cluster = false;
+#endif
 
 	lockdep_assert_held(&env->src_rq->lock);
 

oplus/kernel/oplus_performance/healthinfo/ion/Makefile

@@ -1,4 +1,4 @@
 #ifdef OPLUS_FEATURE_HEALTHINFO
-obj-y  +=  oplus_ion.o
+obj-$(CONFIG_OPLUS_HEALTHINFO)  +=  oplus_ion.o
 #endif /* OPLUS_FEATURE_HEALTHINFO */
 

oplus/kernel/oplus_performance/sched_assist/Makefile

@@ -1,8 +1,8 @@
 # project: oplus/kernel/cpu
-obj-y += sched_assist_common.o
-obj-y += sched_assist_workqueue.o
+obj-$(CONFIG_OPLUS_FEATURE_SCHED_ASSIST) += sched_assist_common.o
+obj-$(CONFIG_OPLUS_FEATURE_SCHED_ASSIST) += sched_assist_workqueue.o
 #ifdef CONFIG_OPLUS_FEATURE_CPU_JANKINFO
-obj-y += sa_jankinfo.o
+obj-$(CONFIG_OPLUS_FEATURE_CPU_JANKINFO) += sa_jankinfo.o
 #endif
 obj-$(CONFIG_LOCKING_PROTECT) += sched_assist_locking.o
 

oplus/kernel/oplus_performance/special_opt/Makefile

@@ -1,5 +1 @@
-ifeq (${CONFIG_OPLUS_FEATURE_UIFRIST_HEAVYLOAD},)
-obj-y += special_opt.o
-else
 obj-$(CONFIG_OPLUS_FEATURE_UIFRIST_HEAVYLOAD) += special_opt.o
-endif

oplus/kernel/system/selinux/Makefile

@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
 # Copyright (C) 2018-2020 Oplus. All rights reserved.
 
-obj-$(CONFIG_SECURITY_SELINUX) += proc.o
+obj-$(CONFIG_OPLUS_FEATURE_SELINUX_CONTROL_LOG) += proc.o

oplus_native_features.mk

@@ -18,12 +18,10 @@ OPLUS_FEATURE_ADPF=yes
 OPLUS_FEATURE_ADSP_RECOVERY=true
 OPLUS_FEATURE_ADSP_SSR_TEST=true
 OPLUS_FEATURE_AEC=yes
-OPLUS_FEATURE_AGINGTEST=yes
 OPLUS_FEATURE_AI_FRAMERATE=yes
 OPLUS_FEATURE_AOD=yes
 OPLUS_FEATURE_APE_DECODER=yes
 OPLUS_FEATURE_APP_ACCESS_FILES=true
-OPLUS_FEATURE_APP_MONITOR=true
 OPLUS_FEATURE_AP_LVIMFS=yes
 OPLUS_FEATURE_ATLAS=yes
 OPLUS_FEATURE_AUDIOBITRATE=yes
@@ -75,7 +73,6 @@ OPLUS_FEATURE_EXFAT_SUPPORT=yes
 OPLUS_FEATURE_FACERECOGNITION=yes
 OPLUS_FEATURE_FEEDBACK_INFO=yes
 OPLUS_FEATURE_FFMPEG_INTEGRATION=yes
-OPLUS_FEATURE_FG_IO_OPT=yes
 OPLUS_FEATURE_FINGERPRINT=oneplus_upgrade
 OPLUS_FEATURE_FINGERPRINTPAY=yes
 OPLUS_FEATURE_FONT_FLIP=yes
@@ -92,10 +89,8 @@ OPLUS_FEATURE_GAME_OIFACE=yes
 OPLUS_FEATURE_GAME_OPT=yes
 OPLUS_FEATURE_GESTURE_SCREENSHOT=yes
 OPLUS_FEATURE_GPS_CONFIG_ADAPT=yes
-OPLUS_FEATURE_GPU_MINIDUMP=yes
 OPLUS_FEATURE_HANS_FREEZE=yes
 OPLUS_FEATURE_HAPTIC_VIBRATE=yes
-OPLUS_FEATURE_HEALTHINFO=yes
 OPLUS_FEATURE_HEIF_CONVERTER=yes
 OPLUS_FEATURE_HQV=yes
 OPLUS_FEATURE_HQV_SUPPORT_APP=yes
@@ -115,7 +110,6 @@ OPLUS_FEATURE_MEMORY_ISOLATE=yes
 OPLUS_FEATURE_MI2S_SLAVE=true
 OPLUS_FEATURE_MIC_VA_MIC_CLK_SWITCH=yes
 OPLUS_FEATURE_MM_FEEDBACK=yes
-OPLUS_FEATURE_MODEM_MINIDUMP=true
 OPLUS_FEATURE_MOTION_INTERCEPT=yes
 OPLUS_FEATURE_MP3_RECORDER=yes
 OPLUS_FEATURE_MULTISCENE_RECORD=yes
@@ -166,7 +160,6 @@ OPLUS_FEATURE_REGIONMARK_INDICATION=true
 OPLUS_FEATURE_RESOLUTIONSWITCH=yes
 OPLUS_FEATURE_RESOURCES_COMPILE=yes
 OPLUS_FEATURE_ROI_ENCODE_QCOM=yes
-OPLUS_FEATURE_SCHED_ASSIST=yes
 OPLUS_FEATURE_SDCARDFS_SUPPORT=yes
 OPLUS_FEATURE_SECURE_EXECGUARD=yes
 OPLUS_FEATURE_SECURE_GUARD=yes
@@ -176,7 +169,6 @@ OPLUS_FEATURE_SECURE_MOUNTGUARD=yes
 OPLUS_FEATURE_SECURE_ROOTGUARD=yes
 OPLUS_FEATURE_SECURITY_COMMON_DCS_ENABLE=1
 OPLUS_FEATURE_SELINUX_CONTEXTS=true
-OPLUS_FEATURE_SELINUX_CONTROL_LOG=true
 OPLUS_FEATURE_SELINUX_DEBUG_BUILD=true
 OPLUS_FEATURE_SENSOR=yes
 OPLUS_FEATURE_SENSOR_ALGORITHM=yes
@@ -243,7 +235,6 @@ OPLUS_FEATURE_WIFI_SAR=yes
 OPLUS_FEATURE_WIFI_SLA=yes
 OPLUS_FEATURE_WIFI_SUPPLICANTHIDL=yes
 OPLUS_FEATURE_ZEN_MODE=yes
-OPLUS_FEATURE_ZRAM_OPT=yes
 OPLUS_FEAUTRE_OAPP_NETCONTROL=true
 OPLUS_FEAUTRE_PIN_RETRY=true
 OPLUS_VDF_LEFT_SPEAKER_MUTE=yes