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

Commit 7821cfca authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mhi_dev: Update data type to get mhi reset state"

parents 263ab684 e81dee92

drivers/platform/msm/mhi_dev/mhi.c

+18 −4
Original line number Diff line number Diff line
@@ -1496,7 +1496,7 @@ static void mhi_dev_scheduler(struct work_struct *work) 
	struct mhi_dev_ring *ring;

	enum mhi_dev_state state;

	enum mhi_dev_event event = 0;

	bool mhi_reset = false;

	u32 mhi_reset;

	uint32_t bhi_imgtxdb = 0;



	mutex_lock(&mhi_ctx->mhi_lock);
@@ -2371,7 +2371,7 @@ static int mhi_dev_recover(struct mhi_dev *mhi) 
{

	int rc = 0;

	uint32_t syserr, max_cnt = 0, bhi_intvec = 0;

	bool mhi_reset;

	u32 mhi_reset;

	enum mhi_dev_state state;



	/* Check if MHI is in syserr */
@@ -2381,6 +2381,16 @@ static int mhi_dev_recover(struct mhi_dev *mhi) 


	mhi_log(MHI_MSG_VERBOSE, "mhi_syserr = 0x%X\n", syserr);

	if (syserr) {

		/* Poll for the host to set the reset bit */

		rc = mhi_dev_mmio_get_mhi_state(mhi, &state, &mhi_reset);

		if (rc) {

			pr_err("%s: get mhi state failed\n", __func__);

			return rc;

		}



		mhi_log(MHI_MSG_VERBOSE, "mhi_state = 0x%X, reset = %d\n",

				state, mhi_reset);



		rc = mhi_dev_mmio_read(mhi, BHI_INTVEC, &bhi_intvec);

		if (rc)

			return rc;
@@ -2400,7 +2410,11 @@ static int mhi_dev_recover(struct mhi_dev *mhi) 
			pr_err("%s: get mhi state failed\n", __func__);

			return rc;

		}

		while (mhi_reset != true && max_cnt < MHI_SUSPEND_TIMEOUT) {



		mhi_log(MHI_MSG_VERBOSE, "mhi_state = 0x%X, reset = %d\n",

				state, mhi_reset);



		while (mhi_reset != 0x1 && max_cnt < MHI_SUSPEND_TIMEOUT) {

			/* Wait for Host to set the reset */

			msleep(MHI_SUSPEND_MIN);

			rc = mhi_dev_mmio_get_mhi_state(mhi, &state,
@@ -2431,7 +2445,7 @@ static void mhi_dev_enable(struct work_struct *work) 
	struct ep_pcie_msi_config msi_cfg;

	struct mhi_dev *mhi = container_of(work,

				struct mhi_dev, ring_init_cb_work);

	bool mhi_reset;

	u32 mhi_reset;

	enum mhi_dev_state state;

	uint32_t max_cnt = 0, bhi_intvec = 0;

drivers/platform/msm/mhi_dev/mhi.h

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ int mhi_dev_get_mhi_addr(struct mhi_dev *dev); 
 * @mhi_reset:	MHI device reset from host.

 */

int mhi_dev_mmio_get_mhi_state(struct mhi_dev *dev, enum mhi_dev_state *state,

						bool *mhi_reset);

						u32 *mhi_reset);



/**

 * mhi_dev_mmio_init() - Initializes the MMIO and reads the Number of event

drivers/platform/msm/mhi_dev/mhi_mmio.c

+6 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ int mhi_dev_mmio_disable_erdb_a7(struct mhi_dev *dev, uint32_t erdb_id) 
EXPORT_SYMBOL(mhi_dev_mmio_disable_erdb_a7);



int mhi_dev_mmio_get_mhi_state(struct mhi_dev *dev, enum mhi_dev_state *state,

						bool *mhi_reset)

						u32 *mhi_reset)

{

	uint32_t reg_value = 0;

	int rc = 0;
@@ -279,9 +279,12 @@ int mhi_dev_mmio_get_mhi_state(struct mhi_dev *dev, enum mhi_dev_state *state, 
		return rc;



	if (reg_value & MHICTRL_RESET_MASK)

		*mhi_reset = true;

		*mhi_reset = 1;

	else

		*mhi_reset = 0;



	pr_debug("MHICTRL is 0x%x\n", reg_value);

	mhi_log(MHI_MSG_VERBOSE, "MHICTRL is 0x%x, reset:%d\n",

			reg_value, *mhi_reset);



	return 0;

}