Import FP3-REL-2.A.0105-20191217.132527

Changes from unpacked zip: - dos2unix on all changed files - keep *.i gitignore
FairphoneMirrors · Feb 20, 2020 · f5713fc · f5713fc
1 parent c97c17e
commit f5713fc
Show file tree

Hide file tree

Showing 36 changed files with 110 additions and 2,351 deletions.
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
@@ -17,7 +17,3 @@ config SHARP_PARAM
 
 config SHARP_SCOOP
 	bool
-
-config FIQ_GLUE
-	bool
-	select FIQ
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
@@ -4,7 +4,6 @@
 
 obj-y				+= firmware.o
 
-obj-$(CONFIG_FIQ_GLUE)		+= fiq_glue.o fiq_glue_setup.o
 obj-$(CONFIG_ICST)		+= icst.o
 obj-$(CONFIG_SA1111)		+= sa1111.o
 obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o

diff --git a/arch/arm/common/fiq_glue.S b/arch/arm/common/fiq_glue.S
diff --git a/arch/arm/common/fiq_glue_setup.c b/arch/arm/common/fiq_glue_setup.c
diff --git a/arch/arm64/boot/dts/qcom/pmi632.dtsi b/arch/arm64/boot/dts/qcom/pmi632.dtsi
@@ -332,6 +332,11 @@
 					500000 500000>;
 //-->[FairPhone][Charging][JasonHsing] Add condition of charging current for thermal-mitigation 20190327 END --
 
+//<2019/11/28-JessicaTseng, modify charging termination current
+			qcom,chg-term-src = <1>;
+			qcom,chg-term-current-ma = <(-100)>;
+//>2019/11/28-JessicaTseng
+
 			qcom,chgr@1000 {
 				reg = <0x1000 0x100>;
 				interrupts =
@@ -488,7 +493,11 @@
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			qcom,qg-iterm-ma = <100>;
+//<2019/11/28-JessicaTseng, modify charging termination current
+			//qcom,qg-iterm-ma = <100>;
+			qcom,qg-iterm-ma = <150>;
+//>2019/11/28-JessicaTseng
+
 //<--[Fairphone][Charging][JasonHsing] Re-charge condition for battery to 4.3V 20190103 BEGIN -
 			//qcom,hold-soc-while-full;
 			//qcom,linearize-soc;

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
@@ -2116,8 +2116,18 @@ static struct binder_thread *binder_get_txn_from_and_acq_inner(
 
 static void binder_free_transaction(struct binder_transaction *t)
 {
-	if (t->buffer)
-		t->buffer->transaction = NULL;
+	struct binder_proc *target_proc = t->to_proc;
+
+	if (target_proc) {
+		binder_inner_proc_lock(target_proc);
+		if (t->buffer)
+			t->buffer->transaction = NULL;
+		binder_inner_proc_unlock(target_proc);
+	}
+	/*
+	 * If the transaction has no target_proc, then
+	 * t->buffer->transaction has already been cleared.
+	 */
 	kfree(t);
 	binder_stats_deleted(BINDER_STAT_TRANSACTION);
 }
@@ -3656,10 +3666,12 @@ static int binder_thread_write(struct binder_proc *proc,
 				     buffer->debug_id,
 				     buffer->transaction ? "active" : "finished");
 
+			binder_inner_proc_lock(proc);
 			if (buffer->transaction) {
 				buffer->transaction->buffer = NULL;
 				buffer->transaction = NULL;
 			}
+			binder_inner_proc_unlock(proc);
 			if (buffer->async_transaction && buffer->target_node) {
 				struct binder_node *buf_node;
 				struct binder_work *w;

diff --git a/drivers/gpu/msm/adreno_snapshot.c b/drivers/gpu/msm/adreno_snapshot.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018,2019 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -70,6 +70,19 @@ void kgsl_snapshot_push_object(struct kgsl_process_private *process,
 	for (index = 0; index < objbufptr; index++) {
 		if (objbuf[index].gpuaddr == gpuaddr &&
 			objbuf[index].entry->priv == process) {
+			/*
+			 * Check if newly requested size is within the
+			 * allocated range or not, otherwise continue
+			 * with previous size.
+			 */
+			if (!kgsl_gpuaddr_in_memdesc(
+				&objbuf[index].entry->memdesc,
+				gpuaddr, dwords << 2)) {
+				KGSL_CORE_ERR(
+					"snapshot: IB 0x%016llx size is not within the memdesc range\n",
+					gpuaddr);
+				return;
+			}
 
 			objbuf[index].size = max_t(uint64_t,
 						objbuf[index].size,