sm8250: apply updates from F916NKSU1CUCE

Documentation/networking/ip-sysctl.txt

@@ -949,12 +949,14 @@ icmp_ratelimit - INTEGER
 icmp_msgs_per_sec - INTEGER
 	Limit maximal number of ICMP packets sent per second from this host.
 	Only messages whose type matches icmp_ratemask (see below) are
-	controlled by this limit.
+	controlled by this limit. For security reasons, the precise count
+	of messages per second is randomized.
 	Default: 1000
 
 icmp_msgs_burst - INTEGER
 	icmp_msgs_per_sec controls number of ICMP packets sent per second,
 	while icmp_msgs_burst controls the burst size of these packets.
+	For security reasons, the precise burst size is randomized.
 	Default: 50
 
 icmp_ratemask - INTEGER

arch/arm64/configs/vendor/f2q_kor_singlex_defconfig

@@ -6101,7 +6101,7 @@ CONFIG_FIVE_TEE_DRIVER=y
 # CONFIG_FIVE_USE_EMULATOR is not set
 CONFIG_FIVE_USE_QSEE=y
 # CONFIG_TEE_DRIVER_DEBUG is not set
-CONFIG_FIVE_EARLY_LOAD_TRUSTED_APP=y
+# CONFIG_FIVE_EARLY_LOAD_TRUSTED_APP is not set
 CONFIG_FIVE_SIGN_TA=n
 CONFIG_FIVE_SIGNCLIENT_PATH="/home/dpi/qb5_8815/workspace/P4_1716/buildscript/tools/signclient.jar"
 CONFIG_FIVE_PILSPLITTER_PATH="/home/dpi/qb5_8815/workspace/P4_1716/buildscript/tools/pil_splitter.py"
@@ -6425,7 +6425,7 @@ CONFIG_INTEGRITY_AUDIT=y
 CONFIG_SECURITY_DEFEX=y
 # CONFIG_DEFEX_KERNEL_ONLY is not set
 CONFIG_SECURITY_DSMS=y
-CONFIG_FIVE=n
+CONFIG_FIVE=y
 # CONFIG_FIVE_DEBUG is not set
 CONFIG_FIVE_CERT_USER="x509_five_user.der"
 CONFIG_FIVE_DEFAULT_HASH_SHA1=y

drivers/battery_v2/sec_battery.c

@@ -1598,10 +1598,7 @@ int sec_bat_set_charging_current(struct sec_battery_info *battery)
 
 #if defined(CONFIG_DUAL_BATTERY)
 		sec_bat_divide_charging_current(battery, charging_current);
-#endif
-
-#if defined(CONFIG_DUAL_BATTERY)
-		if (battery->charging_current < charging_current)
+		if (battery->charging_current <= charging_current)
 			sec_bat_set_divide_charging_current(battery);
 #endif
 

drivers/battery_v2/sec_step_charging.c

@@ -446,6 +446,9 @@ bool sec_bat_check_dc_step_charging(struct sec_battery_info *battery)
 			val.intval = battery->pdata->dc_step_chg_val_iout[battery->pdata->age_step][step] / 2;
 			psy_do_property(battery->pdata->charger_name, set,
 				POWER_SUPPLY_EXT_PROP_DIRECT_CURRENT_MAX, val);
+
+			/* updated charging current */
+			battery->charging_current = battery->pdata->dc_step_chg_val_iout[battery->pdata->age_step][step];
 		}
 
 		battery->step_charging_status = step;
@@ -775,7 +778,8 @@ void sec_bat_set_aging_info_step_charging(struct sec_battery_info *battery)
 			if (battery->pdata->dc_step_chg_val_vfloat[battery->pdata->age_step][i] > battery->pdata->chg_float_voltage)
 				battery->pdata->dc_step_chg_val_vfloat[battery->pdata->age_step][i] = battery->pdata->chg_float_voltage;
 		if (battery->dc_step_chg_type & STEP_CHARGING_CONDITION_VOLTAGE)
-			battery->pdata->dc_step_chg_cond_vol[i] = battery->pdata->dc_step_chg_val_vfloat[battery->pdata->age_step][i];
+			if (battery->pdata->dc_step_chg_cond_vol[i] > battery->pdata->chg_float_voltage)
+				battery->pdata->dc_step_chg_cond_vol[i] = battery->pdata->chg_float_voltage;
 		if ((battery->dc_step_chg_type & STEP_CHARGING_CONDITION_INPUT_CURRENT) && (i < battery->dc_step_chg_step - 1))
 			battery->pdata->dc_step_chg_cond_iin[i] = battery->pdata->dc_step_chg_val_iout[battery->pdata->age_step][i+1] / 2;
 	}

drivers/bus/mhi/core/mhi_pm.c

@@ -631,8 +631,7 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl,
 
 	/* trigger MHI RESET so device will not access host ddr */
 	if (MHI_REG_ACCESS_VALID(prev_state)) {
-		/* MHI_RESET always timed-out, give 1000 msec for graceful reset */
-		unsigned long timeout = msecs_to_jiffies(1000);
+		unsigned long timeout = msecs_to_jiffies(mhi_cntrl->timeout_ms);
 
 		if (system_state == SYSTEM_POWER_OFF) {
 			MHI_ERR("Do not Trigger device MHI_RESET, late shutdown\n"); 

drivers/char/adsprpc.c

@@ -3284,13 +3284,15 @@ static int fastrpc_internal_munmap(struct fastrpc_file *fl,
 	mutex_unlock(&fl->map_mutex);
 	if (err)
 		goto bail;
-	VERIFY(err, !fastrpc_munmap_on_dsp(fl, map->raddr,
-				map->phys, map->size, map->flags));
-	if (err)
-		goto bail;
-	mutex_lock(&fl->map_mutex);
-	fastrpc_mmap_free(map, 0);
-	mutex_unlock(&fl->map_mutex);
+	if (map) {
+		VERIFY(err, !fastrpc_munmap_on_dsp(fl, map->raddr,
+					map->phys, map->size, map->flags));
+		if (err)
+			goto bail;
+		mutex_lock(&fl->map_mutex);
+		fastrpc_mmap_free(map, 0);
+		mutex_unlock(&fl->map_mutex);
+	}	
 bail:
 	if (err && map) {
 		mutex_lock(&fl->map_mutex);

drivers/gpu/msm/adreno_debugfs.c

@@ -291,7 +291,7 @@ static int ctx_print(struct seq_file *s, void *unused)
 		   ctx_type_str(drawctxt->type),
 		   drawctxt->base.priority,
 		   drawctxt->base.proc_priv->comm,
-		   drawctxt->base.proc_priv->pid,
+		   pid_nr(drawctxt->base.proc_priv->pid),
 		   drawctxt->base.tid);
 
 	seq_puts(s, "flags: ");

drivers/gpu/msm/adreno_dispatch.c

@@ -1670,7 +1670,7 @@ static inline const char *_kgsl_context_comm(struct kgsl_context *context)
 #define pr_fault(_d, _c, fmt, args...) \
 		dev_err((_d)->dev, "%s[%d]: " fmt, \
 		_kgsl_context_comm((_c)->context), \
-		(_c)->context->proc_priv->pid, ##args)
+		pid_nr((_c)->context->proc_priv->pid), ##args)
 
 
 static void adreno_fault_header(struct kgsl_device *device,

drivers/gpu/msm/adreno_profile.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/ctype.h>
@@ -131,7 +131,7 @@ static int _build_pre_ib_cmds(struct adreno_device *adreno_dev,
 	ibcmds += _ib_cmd_mem_write(adreno_dev, ibcmds, gpuaddr + data_offset,
 			drawctxt->base.id, &data_offset);
 	ibcmds += _ib_cmd_mem_write(adreno_dev, ibcmds, gpuaddr + data_offset,
-			drawctxt->base.proc_priv->pid, &data_offset);
+			pid_nr(drawctxt->base.proc_priv->pid), &data_offset);
 	ibcmds += _ib_cmd_mem_write(adreno_dev, ibcmds, gpuaddr + data_offset,
 			drawctxt->base.tid, &data_offset);
 	ibcmds += _ib_cmd_mem_write(adreno_dev, ibcmds, gpuaddr + data_offset,