Neternels
diff --git a/‎arch/arm64/configs/vendor/bengal-perf_defconfig
+2 b/‎arch/arm64/configs/vendor/bengal-perf_defconfig
+2
diff --git a/‎arch/arm64/configs/vendor/bengal_defconfig
+2 b/‎arch/arm64/configs/vendor/bengal_defconfig
+2
diff --git a/‎arch/arm64/configs/vendor/kona-perf_defconfig
+1 b/‎arch/arm64/configs/vendor/kona-perf_defconfig
+1
diff --git a/‎arch/arm64/configs/vendor/kona_defconfig
+1 b/‎arch/arm64/configs/vendor/kona_defconfig
+1
diff --git a/‎arch/arm64/configs/vendor/lito-perf_defconfig
+1 b/‎arch/arm64/configs/vendor/lito-perf_defconfig
+1
diff --git a/‎arch/arm64/configs/vendor/lito_defconfig
+1 b/‎arch/arm64/configs/vendor/lito_defconfig
+1
diff --git a/‎block/blk-core.c
+6-2 b/‎block/blk-core.c
+6-2
diff --git a/‎block/elevator.c
+11-4 b/‎block/elevator.c
+11-4
diff --git a/‎drivers/bluetooth/btfm_slim_codec.c
+7-1 b/‎drivers/bluetooth/btfm_slim_codec.c
+7-1
diff --git a/‎drivers/bus/mhi/core/mhi_init.c
+9 b/‎drivers/bus/mhi/core/mhi_init.c
+9
diff --git a/‎drivers/bus/mhi/core/mhi_pm.c
+2-1 b/‎drivers/bus/mhi/core/mhi_pm.c
+2-1
diff --git a/‎drivers/char/adsprpc.c
+1-1 b/‎drivers/char/adsprpc.c
+1-1
diff --git a/‎drivers/clk/qcom/debugcc-khaje.c
-4 b/‎drivers/clk/qcom/debugcc-khaje.c
-4
diff --git a/‎drivers/clk/qcom/gpucc-khaje.c
+3-3 b/‎drivers/clk/qcom/gpucc-khaje.c
+3-3
diff --git a/‎drivers/gpu/msm/kgsl.c
+3-3 b/‎drivers/gpu/msm/kgsl.c
+3-3
diff --git a/‎drivers/gpu/msm/kgsl_sharedmem.c
+12-1 b/‎drivers/gpu/msm/kgsl_sharedmem.c
+12-1
diff --git a/‎drivers/gpu/msm/kgsl_sync.c
+43-23 b/‎drivers/gpu/msm/kgsl_sync.c
+43-23
@@ -395,6 +395,7 @@ CONFIG_QTI_BCL_SOC_DRIVER=y
 CONFIG_QTI_QMI_COOLING_DEVICE=y
 CONFIG_QTI_THERMAL_LIMITS_DCVS=y
 CONFIG_REGULATOR_COOLING_DEVICE=y
+CONFIG_QTI_RPM_SMD_COOLING_DEVICE=y
 CONFIG_QTI_CPU_ISOLATE_COOLING_DEVICE=y
 CONFIG_QTI_LMH_CPU_VDD_COOLING_DEVICE=y
 CONFIG_QTI_CX_IPEAK_COOLING_DEVICE=y
@@ -503,6 +504,7 @@ CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_ION=y
+CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_ION_POOL_AUTO_REFILL=y
 CONFIG_QPNP_REVID=y
 CONFIG_SPS=y
 
@@ -408,6 +408,7 @@ CONFIG_QTI_BCL_SOC_DRIVER=y
 CONFIG_QTI_QMI_COOLING_DEVICE=y
 CONFIG_QTI_THERMAL_LIMITS_DCVS=y
 CONFIG_REGULATOR_COOLING_DEVICE=y
+CONFIG_QTI_RPM_SMD_COOLING_DEVICE=y
 CONFIG_QTI_CPU_ISOLATE_COOLING_DEVICE=y
 CONFIG_QTI_LMH_CPU_VDD_COOLING_DEVICE=y
 CONFIG_QTI_CX_IPEAK_COOLING_DEVICE=y
@@ -523,6 +524,7 @@ CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_STAGING=y
 CONFIG_ASHMEM=y
 CONFIG_ION=y
+CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_ION_POOL_AUTO_REFILL=y
 CONFIG_QPNP_REVID=y
 CONFIG_SPS=y
 
@@ -318,6 +318,7 @@ CONFIG_BONDING=y
 CONFIG_DUMMY=y
 CONFIG_TUN=y
 CONFIG_VETH=y
+CONFIG_AQFWD=y
 CONFIG_SKY2=y
 CONFIG_RMNET=y
 CONFIG_SMSC911X=y
 
@@ -333,6 +333,7 @@ CONFIG_BONDING=y
 CONFIG_DUMMY=y
 CONFIG_TUN=y
 CONFIG_VETH=y
+CONFIG_AQFWD=y
 CONFIG_RMNET=y
 CONFIG_PPP=y
 CONFIG_PPP_BSDCOMP=y
 
@@ -259,6 +259,7 @@ CONFIG_NET_ACT_MIRRED=y
 CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_QRTR=y
+CONFIG_QRTR_WAKEUP_MS=500
 CONFIG_QRTR_SMD=y
 CONFIG_QRTR_MHI=y
 CONFIG_BPF_JIT=y
 
@@ -265,6 +265,7 @@ CONFIG_NET_ACT_MIRRED=y
 CONFIG_NET_ACT_SKBEDIT=y
 CONFIG_DNS_RESOLVER=y
 CONFIG_QRTR=y
+CONFIG_QRTR_WAKEUP_MS=500
 CONFIG_QRTR_SMD=y
 CONFIG_QRTR_MHI=y
 CONFIG_BPF_JIT=y
 
@@ -1778,8 +1778,12 @@ EXPORT_SYMBOL_GPL(part_round_stats);
 #ifdef CONFIG_PM
 static void blk_pm_put_request(struct request *rq)
 {
-	if (rq->q->dev && !(rq->rq_flags & RQF_PM) && !--rq->q->nr_pending)
-		pm_runtime_mark_last_busy(rq->q->dev);
+	if (rq->q->dev && !(rq->rq_flags & RQF_PM) &&
+	    (rq->rq_flags & RQF_PM_ADDED)) {
+		rq->rq_flags &= ~RQF_PM_ADDED;
+		if (!--rq->q->nr_pending)
+			pm_runtime_mark_last_busy(rq->q->dev);
+	}
 }
 #else
 static inline void blk_pm_put_request(struct request *rq) {}
 
@@ -560,15 +560,22 @@ void elv_bio_merged(struct request_queue *q, struct request *rq,
 #ifdef CONFIG_PM
 static void blk_pm_requeue_request(struct request *rq)
 {
-	if (rq->q->dev && !(rq->rq_flags & RQF_PM))
+	if (rq->q->dev && !(rq->rq_flags & RQF_PM) &&
+	    (rq->rq_flags & (RQF_PM_ADDED | RQF_FLUSH_SEQ))) {
+		rq->rq_flags &= ~RQF_PM_ADDED;
 		rq->q->nr_pending--;
+	}
 }
 
 static void blk_pm_add_request(struct request_queue *q, struct request *rq)
 {
-	if (q->dev && !(rq->rq_flags & RQF_PM) && q->nr_pending++ == 0 &&
-	    (q->rpm_status == RPM_SUSPENDED || q->rpm_status == RPM_SUSPENDING))
-		pm_request_resume(q->dev);
+	if (q->dev && !(rq->rq_flags & RQF_PM)) {
+		rq->rq_flags |= RQF_PM_ADDED;
+		if (q->nr_pending++ == 0 &&
+		    (q->rpm_status == RPM_SUSPENDED ||
+		     q->rpm_status == RPM_SUSPENDING))
+			pm_request_resume(q->dev);
+	}
 }
 #else
 static inline void blk_pm_requeue_request(struct request *rq) {}
 
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -13,6 +13,7 @@
 #include <linux/slimbus/slimbus.h>
 #include <linux/ratelimit.h>
 #include <linux/slab.h>
+#include <linux/errno.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
@@ -209,6 +210,11 @@ static int btfm_slim_dai_prepare(struct snd_pcm_substream *substream,
 	/* save the enable channel status */
 	if (ret == 0)
 		bt_soc_enable_status = 1;
+
+	if (ret == -EISCONN) {
+		BTFMSLIM_ERR("channel opened without closing, return success");
+		ret = 0;
+	}
 	return ret;
 }
 
 
@@ -1051,7 +1051,16 @@ void mhi_deinit_chan_ctxt(struct mhi_controller *mhi_cntrl,
 	vfree(buf_ring->base);
 
 	buf_ring->base = tre_ring->base = NULL;
+	tre_ring->ctxt_wp = NULL;
 	chan_ctxt->rbase = 0;
+	chan_ctxt->rlen = 0;
+	chan_ctxt->rp = chan_ctxt->wp = chan_ctxt->rbase;
+	tre_ring->rp = tre_ring->wp = tre_ring->base;
+	buf_ring->rp = buf_ring->wp = buf_ring->base;
+
+	/* Update to all cores */
+	smp_wmb();
+
 }
 
 int mhi_init_chan_ctxt(struct mhi_controller *mhi_cntrl,
 
@@ -395,7 +395,8 @@ int mhi_pm_m0_transition(struct mhi_controller *mhi_cntrl)
 
 		read_lock_irq(&mhi_chan->lock);
 		/* only ring DB if ring is not empty */
-		if (tre_ring->base && tre_ring->wp  != tre_ring->rp)
+		if (tre_ring->base && tre_ring->wp  != tre_ring->rp &&
+		    mhi_chan->ch_state == MHI_CH_STATE_ENABLED)
 			mhi_ring_chan_db(mhi_cntrl, mhi_chan);
 		read_unlock_irq(&mhi_chan->lock);
 	}
 
@@ -2673,7 +2673,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl,
 		if (!init->filelen)
 			goto bail;
 
-		proc_name = kzalloc(init->filelen, GFP_KERNEL);
+		proc_name = kzalloc(init->filelen + 1, GFP_KERNEL);
 		VERIFY(err, !IS_ERR_OR_NULL(proc_name));
 		if (err)
 			goto bail;
 
@@ -124,8 +124,6 @@ static const char *const gcc_debug_mux_parent_names[] = {
 	"gcc_cam_throttle_rt_clk",
 	"gcc_camera_ahb_clk",
 	"gcc_camss_axi_clk",
-	"gcc_camss_camnoc_atb_clk",
-	"gcc_camss_camnoc_nts_xo_clk",
 	"gcc_camss_cci_0_clk",
 	"gcc_camss_cphy_0_clk",
 	"gcc_camss_cphy_1_clk",
@@ -236,8 +234,6 @@ static int gcc_debug_mux_sels[] = {
 	0x4E,		/* gcc_cam_throttle_rt_clk */
 	0x3A,		/* gcc_camera_ahb_clk */
 	0x141,		/* gcc_camss_axi_clk */
-	0x143,		/* gcc_camss_camnoc_atb_clk */
-	0x144,		/* gcc_camss_camnoc_nts_xo_clk */
 	0x13F,		/* gcc_camss_cci_0_clk */
 	0x130,		/* gcc_camss_cphy_0_clk */
 	0x131,		/* gcc_camss_cphy_1_clk */
 
@@ -223,11 +223,11 @@ static struct clk_rcg2 gpu_cc_gx_gfx3d_clk_src = {
 		.vdd_class = &vdd_cx,
 		.num_rate_max = VDD_NUM,
 		.rate_max = (unsigned long[VDD_NUM]) {
-			[VDD_LOWER] = 320000000,
+			[VDD_LOWER] = 320000097,
 			[VDD_LOW] = 465000000,
 			[VDD_LOW_L1] = 600000000,
-			[VDD_NOMINAL] = 785000000,
-			[VDD_HIGH] = 1025000000,
+			[VDD_NOMINAL] = 785088000,
+			[VDD_HIGH] = 1025088000,
 			[VDD_HIGH_L1] = 1114800000},
 	},
 };
 
@@ -698,8 +698,7 @@ void kgsl_context_detach(struct kgsl_context *context)
 	/* Remove the event group from the list */
 	kgsl_del_event_group(&context->events);
 
-	kgsl_sync_timeline_put(context->ktimeline);
-
+	kgsl_sync_timeline_detach(context->ktimeline);
 	kgsl_context_put(context);
 }
 
@@ -718,6 +717,8 @@ kgsl_context_destroy(struct kref *kref)
 	 */
 	BUG_ON(!kgsl_context_detached(context));
 
+	kgsl_sync_timeline_put(context->ktimeline);
+
 	write_lock(&device->context_lock);
 	if (context->id != KGSL_CONTEXT_INVALID) {
 
@@ -741,7 +742,6 @@ kgsl_context_destroy(struct kref *kref)
 		context->id = KGSL_CONTEXT_INVALID;
 	}
 	write_unlock(&device->context_lock);
-	kgsl_sync_timeline_destroy(context);
 	kgsl_process_private_put(context->proc_priv);
 
 	device->ftbl->drawctxt_destroy(context);
 
@@ -171,7 +171,18 @@ imported_mem_show(struct kgsl_process_private *priv,
 			}
 		}
 
-		kgsl_mem_entry_put(entry);
+		/*
+		 * If refcount on mem entry is the last refcount, we will
+		 * call kgsl_mem_entry_destroy and detach it from process
+		 * list. When there is no refcount on the process private,
+		 * we will call kgsl_destroy_process_private to do cleanup.
+		 * During cleanup, we will try to remove the same sysfs
+		 * node which is in use by the current thread and this
+		 * situation will end up in a deadloack.
+		 * To avoid this situation, use a worker to put the refcount
+		 * on mem entry.
+		 */
+		kgsl_mem_entry_put_deferred(entry);
 		spin_lock(&priv->mem_lock);
 	}
 	spin_unlock(&priv->mem_lock);
 
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/file.h>
@@ -249,27 +249,41 @@ static void kgsl_sync_timeline_value_str(struct dma_fence *fence,
 {
 	struct kgsl_sync_fence *kfence = (struct kgsl_sync_fence *)fence;
 	struct kgsl_sync_timeline *ktimeline = kfence->parent;
+	struct kgsl_context *context = NULL;
+	unsigned long flags;
+	int ret = 0;
 
-	unsigned int timestamp_retired = 0;
-	unsigned int timestamp_queued = 0;
+	unsigned int timestamp_retired;
+	unsigned int timestamp_queued;
 
 	if (!kref_get_unless_zero(&ktimeline->kref))
 		return;
+	if (!ktimeline->device)
+		goto put_timeline;
 
-	/*
-	 * ktimeline->device might be NULL here but kgsl_readtimestamp()
-	 * will handle that correctly
-	 */
-	kgsl_readtimestamp(ktimeline->device, ktimeline->context,
-		KGSL_TIMESTAMP_RETIRED, &timestamp_retired);
+	spin_lock_irqsave(&ktimeline->lock, flags);
+	ret = _kgsl_context_get(ktimeline->context);
+	context = ret ? ktimeline->context : NULL;
+	spin_unlock_irqrestore(&ktimeline->lock, flags);
+
+	/* Get the last signaled timestamp if the context is not valid */
+	timestamp_queued = ktimeline->last_timestamp;
+	timestamp_retired = timestamp_queued;
+	if (context) {
+		kgsl_readtimestamp(ktimeline->device, context,
+			KGSL_TIMESTAMP_RETIRED, &timestamp_retired);
 
-	kgsl_readtimestamp(ktimeline->device, ktimeline->context,
-		KGSL_TIMESTAMP_QUEUED, &timestamp_queued);
+		kgsl_readtimestamp(ktimeline->device, context,
+			KGSL_TIMESTAMP_QUEUED, &timestamp_queued);
+
+		kgsl_context_put(context);
+	}
 
 	snprintf(str, size, "%u queued:%u retired:%u",
 		ktimeline->last_timestamp,
 		timestamp_queued, timestamp_retired);
 
+put_timeline:
 	kgsl_sync_timeline_put(ktimeline);
 }
 
@@ -298,7 +312,7 @@ int kgsl_sync_timeline_create(struct kgsl_context *context)
 {
 	struct kgsl_sync_timeline *ktimeline;
 
-	/* Put context when timeline is released */
+	/* Put context at detach time */
 	if (!_kgsl_context_get(context))
 		return -ENOENT;
 
@@ -319,6 +333,11 @@ int kgsl_sync_timeline_create(struct kgsl_context *context)
 	INIT_LIST_HEAD(&ktimeline->child_list_head);
 	spin_lock_init(&ktimeline->lock);
 	ktimeline->device = context->device;
+
+	/*
+	 * The context pointer is valid till detach time, where we put the
+	 * refcount on the context
+	 */
 	ktimeline->context = context;
 
 	context->ktimeline = ktimeline;
@@ -351,30 +370,31 @@ static void kgsl_sync_timeline_signal(struct kgsl_sync_timeline *ktimeline,
 	kgsl_sync_timeline_put(ktimeline);
 }
 
-void kgsl_sync_timeline_destroy(struct kgsl_context *context)
+void kgsl_sync_timeline_detach(struct kgsl_sync_timeline *ktimeline)
 {
-	struct kgsl_sync_timeline *ktimeline = context->ktimeline;
+	unsigned long flags;
+	struct kgsl_context *context = ktimeline->context;
 
-	kfree(ktimeline->name);
-	kfree(ktimeline);
+	/* Set context pointer to NULL and drop our refcount on the context */
+	spin_lock_irqsave(&ktimeline->lock, flags);
+	ktimeline->context = NULL;
+	spin_unlock_irqrestore(&ktimeline->lock, flags);
+	kgsl_context_put(context);
 }
 
-static void kgsl_sync_timeline_release(struct kref *kref)
+static void kgsl_sync_timeline_destroy(struct kref *kref)
 {
 	struct kgsl_sync_timeline *ktimeline =
 		container_of(kref, struct kgsl_sync_timeline, kref);
 
-	/*
-	 * Only put the context refcount here. The context destroy function
-	 * will call kgsl_sync_timeline_destroy() to kfree it
-	 */
-	kgsl_context_put(ktimeline->context);
+	kfree(ktimeline->name);
+	kfree(ktimeline);
 }
 
 void kgsl_sync_timeline_put(struct kgsl_sync_timeline *ktimeline)
 {
 	if (ktimeline)
-		kref_put(&ktimeline->kref, kgsl_sync_timeline_release);
+		kref_put(&ktimeline->kref, kgsl_sync_timeline_destroy);
 }
 
 static const struct dma_fence_ops kgsl_sync_fence_ops = {
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,8 @@ int mhi_pm_m0_transition(struct mhi_controller *mhi_cntrl)`
`395`	`395`
`396`	`396`	`read_lock_irq(&mhi_chan->lock);`
`397`	`397`	`/* only ring DB if ring is not empty */`
`398`		`- if (tre_ring->base && tre_ring->wp != tre_ring->rp)`
	`398`	`+ if (tre_ring->base && tre_ring->wp != tre_ring->rp &&`
	`399`	`+ mhi_chan->ch_state == MHI_CH_STATE_ENABLED)`
`399`	`400`	`mhi_ring_chan_db(mhi_cntrl, mhi_chan);`
`400`	`401`	`read_unlock_irq(&mhi_chan->lock);`
`401`	`402`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,18 @@ imported_mem_show(struct kgsl_process_private *priv,`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`- kgsl_mem_entry_put(entry);`
	`174`	`+ /*`
	`175`	`+ * If refcount on mem entry is the last refcount, we will`
	`176`	`+ * call kgsl_mem_entry_destroy and detach it from process`
	`177`	`+ * list. When there is no refcount on the process private,`
	`178`	`+ * we will call kgsl_destroy_process_private to do cleanup.`
	`179`	`+ * During cleanup, we will try to remove the same sysfs`
	`180`	`+ * node which is in use by the current thread and this`
	`181`	`+ * situation will end up in a deadloack.`
	`182`	`+ * To avoid this situation, use a worker to put the refcount`
	`183`	`+ * on mem entry.`
	`184`	`+ */`
	`185`	`+ kgsl_mem_entry_put_deferred(entry);`
`175`	`186`	`spin_lock(&priv->mem_lock);`
`176`	`187`	`}`
`177`	`188`	`spin_unlock(&priv->mem_lock);`