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

Commit 83db5e3a authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 575b280b on remote branch 

Change-Id: Ibfec5a7cdbe3fc9cf371f0c165fa5cd19e89efc7
parents 0410ec07 575b280b

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ CONFIG_QCOM_SPMI_ADC5=y 
CONFIG_PWM=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QCOM_PDC=y

CONFIG_ARM_DSU_PMU=y

CONFIG_QCOM_LLCC_PMU=y

CONFIG_RAS=y

CONFIG_ANDROID=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -657,6 +657,7 @@ CONFIG_PWM=y 
CONFIG_PWM_QTI_LPG=y

CONFIG_QCOM_PDC=y

CONFIG_PHY_XGENE=y

CONFIG_ARM_DSU_PMU=y

CONFIG_QCOM_LLCC_PMU=y

CONFIG_RAS=y

CONFIG_ANDROID=y

drivers/bus/mhi/core/mhi_main.c

+6 −0
Original line number Diff line number Diff line
@@ -1739,9 +1739,15 @@ irqreturn_t mhi_intvec_handlr(int irq_number, void *dev) 
{



	struct mhi_controller *mhi_cntrl = dev;

	u32 in_reset = -1;



	/* wake up any events waiting for state change */

	MHI_VERB("Enter\n");

	if (unlikely(mhi_cntrl->initiate_mhi_reset)) {

		mhi_read_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL,

			MHICTRL_RESET_MASK, MHICTRL_RESET_SHIFT, &in_reset);

		mhi_cntrl->initiate_mhi_reset = !!in_reset;

	}

	wake_up_all(&mhi_cntrl->state_event);

	MHI_VERB("Exit\n");

drivers/bus/mhi/core/mhi_pm.c

+11 −8
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ void mhi_set_mhi_state(struct mhi_controller *mhi_cntrl, 
	if (state == MHI_STATE_RESET) {

		mhi_write_reg_field(mhi_cntrl, mhi_cntrl->regs, MHICTRL,

				    MHICTRL_RESET_MASK, MHICTRL_RESET_SHIFT, 1);

		mhi_cntrl->initiate_mhi_reset = true;

	} else {

		mhi_cntrl->write_reg(mhi_cntrl, mhi_cntrl->regs, MHICTRL,

				(state << MHICTRL_MHISTATE_SHIFT));
@@ -602,20 +603,18 @@ 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)) {

		u32 in_reset = -1;

		unsigned long timeout = msecs_to_jiffies(mhi_cntrl->timeout_ms);



		MHI_LOG("Trigger device into MHI_RESET\n");



		write_lock_irq(&mhi_cntrl->pm_lock);

		mhi_set_mhi_state(mhi_cntrl, MHI_STATE_RESET);

		write_unlock_irq(&mhi_cntrl->pm_lock);



		/* wait for reset to be cleared */

		ret = wait_event_timeout(mhi_cntrl->state_event,

					 mhi_read_reg_field(mhi_cntrl,

						mhi_cntrl->regs, MHICTRL,

						MHICTRL_RESET_MASK,

						MHICTRL_RESET_SHIFT, &in_reset)

					 || !in_reset, timeout);

		if ((!ret || in_reset) && cur_state == MHI_PM_SYS_ERR_PROCESS) {

				!mhi_cntrl->initiate_mhi_reset, timeout);

		if (!ret && cur_state == MHI_PM_SYS_ERR_PROCESS) {

			MHI_CRITICAL("Device failed to exit RESET state\n");

			mutex_unlock(&mhi_cntrl->pm_mutex);

			return;
@@ -625,7 +624,11 @@ static void mhi_pm_disable_transition(struct mhi_controller *mhi_cntrl, 
		 * device cleares INTVEC as part of RESET processing,

		 * re-program it

		 */

		mhi_cntrl->write_reg(mhi_cntrl, mhi_cntrl->bhi, BHI_INTVEC, 0);

		if (!mhi_cntrl->initiate_mhi_reset)

			mhi_cntrl->write_reg(mhi_cntrl, mhi_cntrl->bhi,

				BHI_INTVEC, 0);



		mhi_cntrl->initiate_mhi_reset = false;

	}



	MHI_LOG("Waiting for all pending event ring processing to complete\n");

drivers/clk/qcom/camcc-lagoon.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/clk.h>
@@ -15,7 +15,7 @@ 
#include "clk-branch.h"

#include "clk-rcg.h"

#include "common.h"

#include "vdd-level-lito.h"

#include "vdd-level-lagoon.h"



static DEFINE_VDD_REGULATORS(vdd_cx, VDD_NUM, 1, vdd_corner);

static DEFINE_VDD_REGULATORS(vdd_mx, VDD_NUM, 1, vdd_corner);