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

Commit f452cc65 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mhi: core: Finish pending reg writes before entering suspend"

parents e77d5c06 d7b94ef0

drivers/bus/mhi/core/mhi_pm.c

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

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

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



#include <linux/debugfs.h>

#include <linux/delay.h>
@@ -1171,6 +1171,9 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl) 
	write_unlock_irq(&mhi_cntrl->pm_lock);

	MHI_LOG("Wait for M3 completion\n");



	/* finish reg writes before D3 cold */

	mhi_force_reg_write(mhi_cntrl);



	ret = wait_event_timeout(mhi_cntrl->state_event,

				 mhi_cntrl->dev_state == MHI_STATE_M3 ||

				 MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state),
@@ -1285,6 +1288,9 @@ int mhi_pm_fast_suspend(struct mhi_controller *mhi_cntrl, bool notify_client) 
	mhi_cntrl->M3_FAST++;

	write_unlock_irq(&mhi_cntrl->pm_lock);



	/* finish reg writes before DRV hand-off to avoid noc err */

	mhi_force_reg_write(mhi_cntrl);



	/* now safe to check ctrl event ring */

	tasklet_enable(&mhi_cntrl->mhi_event->task);

	mhi_msi_handlr(0, mhi_cntrl->mhi_event);