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

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

soc: qcom: rpmh: Update dirty flag only when data changes 



commit bb7000677a1b287206c8d4327c62442fa3050a8f upstream.

Currently rpmh ctrlr dirty flag is set for all cases regardless of data
is really changed or not. Add changes to update dirty flag when data is
changed to newer values. Update dirty flag everytime when data in batch
cache is updated since rpmh_flush() may get invoked from any CPU instead
of only last CPU going to low power mode.

Also move dirty flag updates to happen from within cache_lock and remove
unnecessary INIT_LIST_HEAD() call and a default case from switch.

Fixes: 600513df ("drivers: qcom: rpmh: cache sleep/wake state requests")
Signed-off-by: default avatarMaulik Shah <mkshah@codeaurora.org>
Reviewed-by: default avatarSrinivas Rao L <lsrao@codeaurora.org>
Reviewed-by: default avatarEvan Green <evgreen@chromium.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-3-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 033f56f7

drivers/soc/qcom/rpmh.c

+11 −8
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr, 
{

	struct cache_req *req;

	unsigned long flags;

	u32 old_sleep_val, old_wake_val;



	spin_lock_irqsave(&ctrlr->cache_lock, flags);

	req = __find_req(ctrlr, cmd->addr);
@@ -133,26 +134,27 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr, 


	req->addr = cmd->addr;

	req->sleep_val = req->wake_val = UINT_MAX;

	INIT_LIST_HEAD(&req->list);

	list_add_tail(&req->list, &ctrlr->cache);



existing:

	old_sleep_val = req->sleep_val;

	old_wake_val = req->wake_val;



	switch (state) {

	case RPMH_ACTIVE_ONLY_STATE:

		if (req->sleep_val != UINT_MAX)

			req->wake_val = cmd->data;

		break;

	case RPMH_WAKE_ONLY_STATE:

		req->wake_val = cmd->data;

		break;

	case RPMH_SLEEP_STATE:

		req->sleep_val = cmd->data;

		break;

	default:

		break;

	}



	ctrlr->dirty = true;

	ctrlr->dirty = (req->sleep_val != old_sleep_val ||

			req->wake_val != old_wake_val) &&

			req->sleep_val != UINT_MAX &&

			req->wake_val != UINT_MAX;



unlock:

	spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
@@ -287,6 +289,7 @@ static void cache_batch(struct rpmh_ctrlr *ctrlr, struct batch_cache_req *req) 


	spin_lock_irqsave(&ctrlr->cache_lock, flags);

	list_add_tail(&req->list, &ctrlr->batch_cache);

	ctrlr->dirty = true;

	spin_unlock_irqrestore(&ctrlr->cache_lock, flags);

}
@@ -323,6 +326,7 @@ static void invalidate_batch(struct rpmh_ctrlr *ctrlr) 
	list_for_each_entry_safe(req, tmp, &ctrlr->batch_cache, list)

		kfree(req);

	INIT_LIST_HEAD(&ctrlr->batch_cache);

	ctrlr->dirty = true;

	spin_unlock_irqrestore(&ctrlr->cache_lock, flags);

}
@@ -509,7 +513,6 @@ int rpmh_invalidate(const struct device *dev) 
	int ret;



	invalidate_batch(ctrlr);

	ctrlr->dirty = true;



	do {

		ret = rpmh_rsc_invalidate(ctrlr_to_drv(ctrlr));