Merge "mhi: core: initialize MHI lpm_mutex before use" (711638a2) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/bus/mhi/core/mhi_boot.c

+30 −18

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 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
		@@ -100,7 +100,16 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl)
		BHIE_RXVECDB_SEQNUM_BMSK, BHIE_RXVECDB_SEQNUM_SHFT,
		sequence_id);

		MHI_LOG("Trigger device into RDDM mode\n");
		/*
		* Make sure device is not already in RDDM.
		* In case device asserts and a kernel panic follows, device will
		* already be in RDDM. Do not trigger SYS ERR again and proceed with
		* waiting for image download completion.
		*/
		ee = mhi_get_exec_env(mhi_cntrl);
		if (ee != MHI_EE_RDDM) {

		MHI_LOG("Trigger device into RDDM mode using SYSERR\n");
		mhi_set_mhi_state(mhi_cntrl, MHI_STATE_SYS_ERR);

		MHI_LOG("Waiting for device to enter RDDM\n");
		@@ -113,15 +122,18 @@ static int __mhi_download_rddm_in_panic(struct mhi_controller *mhi_cntrl)
		}

		if (rddm_retry <= 0) {
		/* This is a hardware reset, will force device to enter rddm */
		/* Hardware reset; force device to enter rddm */
		MHI_LOG(
		"Did not enter RDDM triggering host req. reset to force rddm\n");
		"Did not enter RDDM, do a host req. reset\n");
		mhi_write_reg(mhi_cntrl, mhi_cntrl->regs,
		MHI_SOC_RESET_REQ_OFFSET, MHI_SOC_RESET_REQ);
		MHI_SOC_RESET_REQ_OFFSET,
		MHI_SOC_RESET_REQ);
		udelay(delayus);
		}

		ee = mhi_get_exec_env(mhi_cntrl);
		}

		MHI_LOG("Waiting for image download completion, current EE:%s\n",
		TO_MHI_EXEC_STR(ee));
		while (retry--) {

drivers/bus/mhi/core/mhi_init.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -549,6 +549,7 @@ int mhi_init_timesync(struct mhi_controller *mhi_cntrl)
		return -ENOMEM;

		spin_lock_init(&mhi_tsync->lock);
		mutex_init(&mhi_tsync->lpm_mutex);
		INIT_LIST_HEAD(&mhi_tsync->head);
		init_completion(&mhi_tsync->completion);