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

Commit a91f874f authored by Maulik Shah's avatar Maulik Shah Committed by Greg Kroah-Hartman
Browse files

soc: qcom: rpmh-rsc: Allow using free WAKE TCS for active request 



commit 38427e5a47bf83299da930bd474c6cb2632ad810 upstream.

When there are more than one WAKE TCS available and there is no dedicated
ACTIVE TCS available, invalidating all WAKE TCSes and waiting for current
transfer to complete in first WAKE TCS blocks using another free WAKE TCS
to complete current request.

Remove rpmh_rsc_invalidate() to happen from tcs_write() when WAKE TCSes
is re-purposed to be used for Active mode. Clear only currently used
WAKE TCS's register configuration.

Fixes: 2de4b8d3 (drivers: qcom: rpmh-rsc: allow active requests from wake TCS)
Signed-off-by: default avatarMaulik Shah <mkshah@codeaurora.org>
Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/1586703004-13674-7-git-send-email-mkshah@codeaurora.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c15a40c9

drivers/soc/qcom/rpmh-rsc.c

+11 −12
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ int rpmh_rsc_invalidate(struct rsc_drv *drv) 
static struct tcs_group *get_tcs_for_msg(struct rsc_drv *drv,

					 const struct tcs_request *msg)

{

	int type, ret;

	int type;

	struct tcs_group *tcs;



	switch (msg->state) {
@@ -169,19 +169,10 @@ static struct tcs_group *get_tcs_for_msg(struct rsc_drv *drv, 
	 * If we are making an active request on a RSC that does not have a

	 * dedicated TCS for active state use, then re-purpose a wake TCS to

	 * send active votes.

	 * NOTE: The driver must be aware that this RSC does not have a

	 * dedicated AMC, and therefore would invalidate the sleep and wake

	 * TCSes before making an active state request.

	 */

	tcs = get_tcs_of_type(drv, type);

	if (msg->state == RPMH_ACTIVE_ONLY_STATE && !tcs->num_tcs) {

	if (msg->state == RPMH_ACTIVE_ONLY_STATE && !tcs->num_tcs)

		tcs = get_tcs_of_type(drv, WAKE_TCS);

		if (tcs->num_tcs) {

			ret = rpmh_rsc_invalidate(drv);

			if (ret)

				return ERR_PTR(ret);

		}

	}



	return tcs;

}
@@ -406,8 +397,16 @@ static int tcs_write(struct rsc_drv *drv, const struct tcs_request *msg) 


	tcs->req[tcs_id - tcs->offset] = msg;

	set_bit(tcs_id, drv->tcs_in_use);

	if (msg->state == RPMH_ACTIVE_ONLY_STATE && tcs->type != ACTIVE_TCS)

	if (msg->state == RPMH_ACTIVE_ONLY_STATE && tcs->type != ACTIVE_TCS) {

		/*

		 * Clear previously programmed WAKE commands in selected

		 * repurposed TCS to avoid triggering them. tcs->slots will be

		 * cleaned from rpmh_flush() by invoking rpmh_rsc_invalidate()

		 */

		write_tcs_reg_sync(drv, RSC_DRV_CMD_ENABLE, tcs_id, 0);

		write_tcs_reg_sync(drv, RSC_DRV_CMD_WAIT_FOR_CMPL, tcs_id, 0);

		enable_tcs_irq(drv, tcs_id, true);

	}

	spin_unlock(&drv->lock);



	__tcs_buffer_write(drv, tcs_id, 0, msg);