| Message ID | 1585660782-23416-8-git-send-email-mkshah@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Invoke rpmh_flush for non OSI targets | expand |
Hi, On Tue, Mar 31, 2020 at 6:21 AM Maulik Shah <mkshah@codeaurora.org> wrote: > > 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. > > Mark the caches as dirty so next time when rpmh_flush() is invoked it > can invalidate and program cached sleep and wake sets again. Comment above is no longer right now that you've removed the place that marks caches as dirty. > Fixes: 2de4b8d33eab (drivers: qcom: rpmh-rsc: allow active requests from wake TCS) > Signed-off-by: Maulik Shah <mkshah@codeaurora.org> > --- > drivers/soc/qcom/rpmh-rsc.c | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) Other than the comment nit: Reviewed-by: Douglas Anderson <dianders@chromium.org>
Hi, On 4/3/2020 1:43 AM, Doug Anderson wrote: > Hi, > > On Tue, Mar 31, 2020 at 6:21 AM Maulik Shah <mkshah@codeaurora.org> wrote: >> 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. >> >> Mark the caches as dirty so next time when rpmh_flush() is invoked it >> can invalidate and program cached sleep and wake sets again. > Comment above is no longer right now that you've removed the place > that marks caches as dirty. > > >> Fixes: 2de4b8d33eab (drivers: qcom: rpmh-rsc: allow active requests from wake TCS) >> Signed-off-by: Maulik Shah <mkshah@codeaurora.org> >> --- >> drivers/soc/qcom/rpmh-rsc.c | 23 +++++++++++------------ >> 1 file changed, 11 insertions(+), 12 deletions(-) > Other than the comment nit: > > Reviewed-by: Douglas Anderson <dianders@chromium.org> Thanks Doug for the review. I will remove last paragraph from commit message. Thanks, Maulik
diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index d5b6dff..0fb0b9a 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -154,7 +154,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) { @@ -175,19 +175,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; } @@ -412,8 +403,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);
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. Mark the caches as dirty so next time when rpmh_flush() is invoked it can invalidate and program cached sleep and wake sets again. Fixes: 2de4b8d33eab (drivers: qcom: rpmh-rsc: allow active requests from wake TCS) Signed-off-by: Maulik Shah <mkshah@codeaurora.org> --- drivers/soc/qcom/rpmh-rsc.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)