From 78c670a9299903fabd84519c8335059e8520f8b6 Mon Sep 17 00:00:00 2001
From: David Wronek <david@mainlining.org>
Date: Sun, 20 Oct 2024 20:04:21 +0200
Subject: [PATCH] e3q: Import S928BXXS3AXI1 changes

---
 arch/arm64/configs/oem/e3q-lego.config | 16 ++++++++++++++--
 drivers/kperfmon/kperfmon.c            |  6 +++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/configs/oem/e3q-lego.config b/arch/arm64/configs/oem/e3q-lego.config
index c3302ce2f5a3..8e7d998ab3c5 100644
--- a/arch/arm64/configs/oem/e3q-lego.config
+++ b/arch/arm64/configs/oem/e3q-lego.config
@@ -298,8 +298,20 @@ CONFIG_SENSORS_LAF_FAILURE_DEBUG=y
 CONFIG_HV_MUIC_MAX77775_AFC=y
 CONFIG_MUIC_MAX77775=y
 CONFIG_MFD_S2MPB02=m
-CONFIG_QCOM_FSA4480_I2C=n
-CONFIG_QCOM_WCD939X_I2C=n
 
 # Use 1M for kernel log
 CONFIG_LOG_BUF_SHIFT=20
+
+# Disabled configs
+CONFIG_INPUT_QCOM_HV_HAPTICS=n
+CONFIG_QTI_ALTMODE_GLINK=n
+CONFIG_QTI_BATTERY_CHARGER=n
+CONFIG_QTI_BATTERY_GLINK_DEBUG=n
+CONFIG_QTI_CHARGER_ULOG_GLINK=n
+CONFIG_QTI_GLINK_ADC=n
+CONFIG_QTI_PMIC_EUSB2_REPEATER=n
+CONFIG_QTI_PMIC_GLINK=n
+CONFIG_QTI_PMIC_GLINK_DEBUG=n
+CONFIG_UCSI_QTI_GLINK=n
+CONFIG_QCOM_FSA4480_I2C=n
+CONFIG_QCOM_WCD939X_I2C=n
diff --git a/drivers/kperfmon/kperfmon.c b/drivers/kperfmon/kperfmon.c
index 33fc92a3f204..71b315877561 100644
--- a/drivers/kperfmon/kperfmon.c
+++ b/drivers/kperfmon/kperfmon.c
@@ -39,6 +39,7 @@
 #include <linux/sched/signal.h>
 #include <asm/uaccess.h>
 #include <asm/stacktrace.h>
+#include <linux/uidgid.h>
 
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
@@ -617,7 +618,7 @@ static int __init kperfmon_init(void)
 		return -ENOMEM;
 	}
 
-	entry = proc_create(PROC_NAME, 0664, NULL, &kperfmon_fops);
+	entry = proc_create(PROC_NAME, 0660, NULL, &kperfmon_fops);
 
 	if (!entry) {
 		pr_info("%s() - Error creating entry in proc failed!!!\n", __func__);
@@ -625,6 +626,9 @@ static int __init kperfmon_init(void)
 		return -EBUSY;
 	}
 
+	/* Set file user (owner) to shell user UID (2000), to allow file access to both root group and shell as well */
+	proc_set_user(entry, KUIDT_INIT(2000), KGIDT_INIT(0));
+
 	/*dbg_level_is_low = (sec_debug_level() == ANDROID_DEBUG_LEVEL_LOW);*/
 
 	INIT_LIST_HEAD(&before_print_list);