mfd: qcom_rpm: Parametrize also ack selector size

commit f37be01e6dc606f2fcc5e95c9933d948ce19bd35 upstream.

The RPM has two sets of selectors (IPC bit fields): request and
acknowledge. Apparently, some models use 4*32 bit words for select
and some use 7*32 bit words for request, but all use 7*32 words
for acknowledge bits.

So apparently you can on the models with requests of 4*32 select
bits send 4*32 messages and get 7*32 different replies, so on ACK
interrupt, 7*32 bit words need to be read. This is how the vendor
code apparently works.

Reported-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c
index 66f00c6427d3bde09ba1cb97e27fba65601dc8bc..a867cc91657ef3c45a47bf3caf96dde68aff4e9a 100644 (file)
--- a/drivers/mfd/qcom_rpm.c
+++ b/drivers/mfd/qcom_rpm.c
@@ -39,7 +39,8 @@ struct qcom_rpm_data {
        unsigned int req_sel_off;
        unsigned int ack_ctx_off;
        unsigned int ack_sel_off;
-       unsigned int sel_size;
+       unsigned int req_sel_size;
+       unsigned int ack_sel_size;
 };
 
 struct qcom_rpm {
@@ -162,7 +163,8 @@ static const struct qcom_rpm_data apq8064_template = {
        .req_sel_off = 11,
        .ack_ctx_off = 15,
        .ack_sel_off = 23,
-       .sel_size = 4,
+       .req_sel_size = 4,
+       .ack_sel_size = 7,
 };
 
 static const struct qcom_rpm_resource msm8660_rpm_resource_table[] = {
@@ -250,7 +252,8 @@ static const struct qcom_rpm_data msm8660_template = {
        .req_sel_off = 11,
        .ack_ctx_off = 19,
        .ack_sel_off = 27,
-       .sel_size = 7,
+       .req_sel_size = 7,
+       .ack_sel_size = 7,
 };
 
 static const struct qcom_rpm_resource msm8960_rpm_resource_table[] = {
@@ -337,7 +340,8 @@ static const struct qcom_rpm_data msm8960_template = {
        .req_sel_off = 11,
        .ack_ctx_off = 15,
        .ack_sel_off = 23,
-       .sel_size = 4,
+       .req_sel_size = 4,
+       .ack_sel_size = 7,
 };
 
 static const struct qcom_rpm_resource ipq806x_rpm_resource_table[] = {
@@ -382,7 +386,8 @@ static const struct qcom_rpm_data ipq806x_template = {
        .req_sel_off = 11,
        .ack_ctx_off = 15,
        .ack_sel_off = 23,
-       .sel_size = 4,
+       .req_sel_size = 4,
+       .ack_sel_size = 7,
 };
 
 static const struct of_device_id qcom_rpm_of_match[] = {
@@ -419,7 +424,7 @@ int qcom_rpm_write(struct qcom_rpm *rpm,
                writel_relaxed(buf[i], RPM_REQ_REG(rpm, res->target_id + i));
 
        bitmap_set((unsigned long *)sel_mask, res->select_id, 1);
-       for (i = 0; i < rpm->data->sel_size; i++) {
+       for (i = 0; i < rpm->data->req_sel_size; i++) {
                writel_relaxed(sel_mask[i],
                               RPM_CTRL_REG(rpm, rpm->data->req_sel_off + i));
        }
@@ -448,7 +453,7 @@ static irqreturn_t qcom_rpm_ack_interrupt(int irq, void *dev)
        int i;
 
        ack = readl_relaxed(RPM_CTRL_REG(rpm, rpm->data->ack_ctx_off));
-       for (i = 0; i < rpm->data->sel_size; i++)
+       for (i = 0; i < rpm->data->ack_sel_size; i++)
                writel_relaxed(0,
                        RPM_CTRL_REG(rpm, rpm->data->ack_sel_off + i));
        writel(0, RPM_CTRL_REG(rpm, rpm->data->ack_ctx_off));