Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647114f9 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 93d96157 on remote branch 

Change-Id: I5e4cbc4820cc08d6cddb4ca496ba4d990af9c5f7
parents 251dd888 93d96157

arch/arm64/configs/vendor/bengal-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/arm64/configs/vendor/bengal_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/bus/mhi/core/mhi_init.c

+9 −0
Original line number Diff line number Diff line
@@ -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,

drivers/bus/mhi/core/mhi_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

	}

drivers/char/diag/diagmem.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ void *diagmem_alloc(struct diagchar_dev *driver, int size, int pool_type) 
			break;

		}

		if (size == 0 || size > mempool->itemsize ||

			size > (int)mempool->pool->pool_data) {

			size > (size_t)mempool->pool->pool_data) {

			pr_err_ratelimited("diag: cannot alloc from mempool %s, invalid size: %d\n",

					   mempool->name, size);

			break;