leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc: qcom: rpmh-rsc: Clean code reading/writing TCS regs/cmds

Browse Source 
This patch makes two changes, both of which should be no-ops:

1. Make read_tcs_reg() / read_tcs_cmd() symmetric to write_tcs_reg() /
   write_tcs_cmd().

2. Change the order of operations in the above functions to make it
   more obvious to me what the math is doing.  Specifically first you
   want to find the right TCS, then the right register, and then
   multiply by the command ID if necessary.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Maulik Shah <mkshah@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Tested-by: Maulik Shah <mkshah@codeaurora.org>
Link: https://lore.kernel.org/r/20200413100321.v4.1.I1b754137e8089e46cf33fc2ea270734ec3847ec4@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Douglas Anderson 2020-04-13 10:04:06 -07:00 committed by Bjorn Andersson
parent 38427e5a47
commit 3b5e3d50f8
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/soc/qcom/rpmh-rsc.c
View File

@ -67,28 +67,33 @@
#define CMD_STATUS_ISSUED BIT(8) #define CMD_STATUS_ISSUED BIT(8)
#define CMD_STATUS_COMPL BIT(16) #define CMD_STATUS_COMPL BIT(16)
static u32 read_tcs_reg(struct rsc_drv *drv, int reg, int tcs_id, int cmd_id) static u32 read_tcs_cmd(struct rsc_drv *drv, int reg, int tcs_id, int cmd_id)
{ {
return readl_relaxed(drv->tcs_base + reg + RSC_DRV_TCS_OFFSET * tcs_id + return readl_relaxed(drv->tcs_base + RSC_DRV_TCS_OFFSET * tcs_id + reg +
RSC_DRV_CMD_OFFSET * cmd_id); RSC_DRV_CMD_OFFSET * cmd_id);
} }
static u32 read_tcs_reg(struct rsc_drv *drv, int reg, int tcs_id)
{
return readl_relaxed(drv->tcs_base + RSC_DRV_TCS_OFFSET * tcs_id + reg);
}
static void write_tcs_cmd(struct rsc_drv *drv, int reg, int tcs_id, int cmd_id, static void write_tcs_cmd(struct rsc_drv *drv, int reg, int tcs_id, int cmd_id,
u32 data) u32 data)
{ {
writel_relaxed(data, drv->tcs_base + reg + RSC_DRV_TCS_OFFSET * tcs_id + writel_relaxed(data, drv->tcs_base + RSC_DRV_TCS_OFFSET * tcs_id + reg +
RSC_DRV_CMD_OFFSET * cmd_id); RSC_DRV_CMD_OFFSET * cmd_id);
} }
static void write_tcs_reg(struct rsc_drv *drv, int reg, int tcs_id, u32 data) static void write_tcs_reg(struct rsc_drv *drv, int reg, int tcs_id, u32 data)
{ {
writel_relaxed(data, drv->tcs_base + reg + RSC_DRV_TCS_OFFSET * tcs_id); writel_relaxed(data, drv->tcs_base + RSC_DRV_TCS_OFFSET * tcs_id + reg);
} }
static void write_tcs_reg_sync(struct rsc_drv *drv, int reg, int tcs_id, static void write_tcs_reg_sync(struct rsc_drv *drv, int reg, int tcs_id,
u32 data) u32 data)
{ {
writel(data, drv->tcs_base + reg + RSC_DRV_TCS_OFFSET * tcs_id); writel(data, drv->tcs_base + RSC_DRV_TCS_OFFSET * tcs_id + reg);
for (;;) { for (;;) {
if (data == readl(drv->tcs_base + reg + if (data == readl(drv->tcs_base + reg +
RSC_DRV_TCS_OFFSET * tcs_id)) RSC_DRV_TCS_OFFSET * tcs_id))
@ -100,7 +105,7 @@ static void write_tcs_reg_sync(struct rsc_drv *drv, int reg, int tcs_id,
static bool tcs_is_free(struct rsc_drv *drv, int tcs_id) static bool tcs_is_free(struct rsc_drv *drv, int tcs_id)
{ {
return !test_bit(tcs_id, drv->tcs_in_use) && return !test_bit(tcs_id, drv->tcs_in_use) &&
read_tcs_reg(drv, RSC_DRV_STATUS, tcs_id, 0); read_tcs_reg(drv, RSC_DRV_STATUS, tcs_id);
} }
static struct tcs_group *get_tcs_of_type(struct rsc_drv *drv, int type) static struct tcs_group *get_tcs_of_type(struct rsc_drv *drv, int type)
@ -207,7 +212,7 @@ static void __tcs_set_trigger(struct rsc_drv *drv, int tcs_id, bool trigger)
* While clearing ensure that the AMC mode trigger is cleared * While clearing ensure that the AMC mode trigger is cleared
* and then the mode enable is cleared. * and then the mode enable is cleared.
*/ */
enable = read_tcs_reg(drv, RSC_DRV_CONTROL, tcs_id, 0); enable = read_tcs_reg(drv, RSC_DRV_CONTROL, tcs_id);
enable &= ~TCS_AMC_MODE_TRIGGER; enable &= ~TCS_AMC_MODE_TRIGGER;
write_tcs_reg_sync(drv, RSC_DRV_CONTROL, tcs_id, enable); write_tcs_reg_sync(drv, RSC_DRV_CONTROL, tcs_id, enable);
enable &= ~TCS_AMC_MODE_ENABLE; enable &= ~TCS_AMC_MODE_ENABLE;
@ -226,7 +231,7 @@ static void enable_tcs_irq(struct rsc_drv *drv, int tcs_id, bool enable)
{ {
u32 data; u32 data;
data = read_tcs_reg(drv, RSC_DRV_IRQ_ENABLE, 0, 0); data = read_tcs_reg(drv, RSC_DRV_IRQ_ENABLE, 0);
if (enable) if (enable)
data |= BIT(tcs_id); data |= BIT(tcs_id);
else else
@ -245,7 +250,7 @@ static irqreturn_t tcs_tx_done(int irq, void *p)
const struct tcs_request *req; const struct tcs_request *req;
struct tcs_cmd *cmd; struct tcs_cmd *cmd;
irq_status = read_tcs_reg(drv, RSC_DRV_IRQ_STATUS, 0, 0); irq_status = read_tcs_reg(drv, RSC_DRV_IRQ_STATUS, 0);
for_each_set_bit(i, &irq_status, BITS_PER_LONG) { for_each_set_bit(i, &irq_status, BITS_PER_LONG) {
req = get_req_from_tcs(drv, i); req = get_req_from_tcs(drv, i);
@ -259,7 +264,7 @@ static irqreturn_t tcs_tx_done(int irq, void *p)
u32 sts; u32 sts;
cmd = &req->cmds[j]; cmd = &req->cmds[j];
sts = read_tcs_reg(drv, RSC_DRV_CMD_STATUS, i, j); sts = read_tcs_cmd(drv, RSC_DRV_CMD_STATUS, i, j);
if (!(sts & CMD_STATUS_ISSUED) || if (!(sts & CMD_STATUS_ISSUED) ||
((req->wait_for_compl || cmd->wait) && ((req->wait_for_compl || cmd->wait) &&
!(sts & CMD_STATUS_COMPL))) { !(sts & CMD_STATUS_COMPL))) {
@ -313,7 +318,7 @@ static void __tcs_buffer_write(struct rsc_drv *drv, int tcs_id, int cmd_id,
cmd_msgid |= msg->wait_for_compl ? CMD_MSGID_RESP_REQ : 0; cmd_msgid |= msg->wait_for_compl ? CMD_MSGID_RESP_REQ : 0;
cmd_msgid |= CMD_MSGID_WRITE; cmd_msgid |= CMD_MSGID_WRITE;
cmd_complete = read_tcs_reg(drv, RSC_DRV_CMD_WAIT_FOR_CMPL, tcs_id, 0); cmd_complete = read_tcs_reg(drv, RSC_DRV_CMD_WAIT_FOR_CMPL, tcs_id);
for (i = 0, j = cmd_id; i < msg->num_cmds; i++, j++) { for (i = 0, j = cmd_id; i < msg->num_cmds; i++, j++) {
cmd = &msg->cmds[i]; cmd = &msg->cmds[i];
@ -329,7 +334,7 @@ static void __tcs_buffer_write(struct rsc_drv *drv, int tcs_id, int cmd_id,
} }
write_tcs_reg(drv, RSC_DRV_CMD_WAIT_FOR_CMPL, tcs_id, cmd_complete); write_tcs_reg(drv, RSC_DRV_CMD_WAIT_FOR_CMPL, tcs_id, cmd_complete);
cmd_enable |= read_tcs_reg(drv, RSC_DRV_CMD_ENABLE, tcs_id, 0); cmd_enable |= read_tcs_reg(drv, RSC_DRV_CMD_ENABLE, tcs_id);
write_tcs_reg(drv, RSC_DRV_CMD_ENABLE, tcs_id, cmd_enable); write_tcs_reg(drv, RSC_DRV_CMD_ENABLE, tcs_id, cmd_enable);
} }
@ -345,10 +350,10 @@ static int check_for_req_inflight(struct rsc_drv *drv, struct tcs_group *tcs,
if (tcs_is_free(drv, tcs_id)) if (tcs_is_free(drv, tcs_id))
continue; continue;
curr_enabled = read_tcs_reg(drv, RSC_DRV_CMD_ENABLE, tcs_id, 0); curr_enabled = read_tcs_reg(drv, RSC_DRV_CMD_ENABLE, tcs_id);
for_each_set_bit(j, &curr_enabled, MAX_CMDS_PER_TCS) { for_each_set_bit(j, &curr_enabled, MAX_CMDS_PER_TCS) {
addr = read_tcs_reg(drv, RSC_DRV_CMD_ADDR, tcs_id, j); addr = read_tcs_cmd(drv, RSC_DRV_CMD_ADDR, tcs_id, j);
for (k = 0; k < msg->num_cmds; k++) { for (k = 0; k < msg->num_cmds; k++) {
if (addr == msg->cmds[k].addr) if (addr == msg->cmds[k].addr)
return -EBUSY; return -EBUSY;