From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752514AbcF1Pes (ORCPT ); Tue, 28 Jun 2016 11:34:48 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:35271 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752414AbcF1Peq (ORCPT ); Tue, 28 Jun 2016 11:34:46 -0400 Date: Tue, 28 Jun 2016 16:35:36 +0100 From: Lee Jones To: Linus Walleij Cc: linux-kernel@vger.kernel.org, Bjorn Andersson , Stephen Boyd , Neil Armstrong , stable@vger.kernel.org Subject: Re: [PATCH] mfd: qcom_rpm: parametrize also ack selector size Message-ID: <20160628153536.GE29166@dell> References: <1466576837-21995-1-git-send-email-linus.walleij@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1466576837-21995-1-git-send-email-linus.walleij@linaro.org> User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 22 Jun 2016, Linus Walleij wrote: > 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. > > Cc: stable@vger.kernel.org > Cc: Stephen Boyd > Cc: Björn Andersson > Reported-by: Stephen Boyd > Signed-off-by: Linus Walleij > --- > Lee: this patch goes on top of the previous patch I sent: > "mfd: qcom_rpm: fix offset error for msm8660" > You can also squash them, if you prefer. > --- > drivers/mfd/qcom_rpm.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/qcom_rpm.c b/drivers/mfd/qcom_rpm.c > index 9364f88264e5..880d4699bcb0 100644 > --- 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)); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog