From: "Christ, Austin" <austinwc@codeaurora.org>
To: Abhishek Sahu <absahu@codeaurora.org>,
Andy Gross <andy.gross@linaro.org>,
Wolfram Sang <wsa@the-dreams.de>
Cc: David Brown <david.brown@linaro.org>,
Sricharan R <sricharan@codeaurora.org>,
linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 03/12] i2c: qup: remove redundant variables for BAM SG count
Date: Tue, 27 Feb 2018 14:51:12 -0700 [thread overview]
Message-ID: <80caf699-0680-7dbc-ef63-0cacd21ee607@codeaurora.org> (raw)
In-Reply-To: <1517644697-30806-4-git-send-email-absahu@codeaurora.org>
I agree with Sricharan's comments about naming, otherwise looks good.
Tested on Centriq 2400
Reviewed-by: Austin Christ <austinwc@codeaurora.org>
On 2/3/2018 12:58 AM, Abhishek Sahu wrote:
> The rx_nents and tx_nents are redundant. rx_buf and tx_buf can
> be used for total number of SG entries.
>
> Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
> ---
> drivers/i2c/busses/i2c-qup.c | 26 ++++++++++----------------
> 1 file changed, 10 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
> index c68f433..bb83a2967 100644
> --- a/drivers/i2c/busses/i2c-qup.c
> +++ b/drivers/i2c/busses/i2c-qup.c
> @@ -692,7 +692,7 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
> struct dma_async_tx_descriptor *txd, *rxd = NULL;
> int ret = 0, idx = 0, limit = QUP_READ_LIMIT;
> dma_cookie_t cookie_rx, cookie_tx;
> - u32 rx_nents = 0, tx_nents = 0, len, blocks, rem;
> + u32 len, blocks, rem;
> u32 i, tlen, tx_len, tx_buf = 0, rx_buf = 0, off = 0;
> u8 *tags;
>
> @@ -707,9 +707,6 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
> rem = msg->len - (blocks - 1) * limit;
>
> if (msg->flags & I2C_M_RD) {
> - rx_nents += (blocks * 2) + 1;
> - tx_nents += 1;
> -
> while (qup->blk.pos < blocks) {
> tlen = (i == (blocks - 1)) ? rem : limit;
> tags = &qup->start_tag.start[off + len];
> @@ -748,8 +745,6 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
> if (ret)
> return ret;
> } else {
> - tx_nents += (blocks * 2);
> -
> while (qup->blk.pos < blocks) {
> tlen = (i == (blocks - 1)) ? rem : limit;
> tags = &qup->start_tag.start[off + tx_len];
> @@ -775,7 +770,7 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
>
> if (idx == (num - 1)) {
> len = 1;
> - if (rx_nents) {
> + if (rx_buf) {
> qup->btx.tag.start[0] =
> QUP_BAM_INPUT_EOT;
> len++;
> @@ -787,14 +782,13 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
> len, qup, DMA_TO_DEVICE);
> if (ret)
> return ret;
> - tx_nents += 1;
> }
> }
> idx++;
> msg++;
> }
>
> - txd = dmaengine_prep_slave_sg(qup->btx.dma, qup->btx.sg, tx_nents,
> + txd = dmaengine_prep_slave_sg(qup->btx.dma, qup->btx.sg, tx_buf,
> DMA_MEM_TO_DEV,
> DMA_PREP_INTERRUPT | DMA_PREP_FENCE);
> if (!txd) {
> @@ -803,7 +797,7 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
> goto desc_err;
> }
>
> - if (!rx_nents) {
> + if (!rx_buf) {
> txd->callback = qup_i2c_bam_cb;
> txd->callback_param = qup;
> }
> @@ -816,9 +810,9 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
>
> dma_async_issue_pending(qup->btx.dma);
>
> - if (rx_nents) {
> + if (rx_buf) {
> rxd = dmaengine_prep_slave_sg(qup->brx.dma, qup->brx.sg,
> - rx_nents, DMA_DEV_TO_MEM,
> + rx_buf, DMA_DEV_TO_MEM,
> DMA_PREP_INTERRUPT);
> if (!rxd) {
> dev_err(qup->dev, "failed to get rx desc\n");
> @@ -853,7 +847,7 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
> goto desc_err;
> }
>
> - if (rx_nents)
> + if (rx_buf)
> writel(QUP_BAM_INPUT_EOT,
> qup->base + QUP_OUT_FIFO_BASE);
>
> @@ -871,10 +865,10 @@ static int qup_i2c_bam_do_xfer(struct qup_i2c_dev *qup, struct i2c_msg *msg,
> }
>
> desc_err:
> - dma_unmap_sg(qup->dev, qup->btx.sg, tx_nents, DMA_TO_DEVICE);
> + dma_unmap_sg(qup->dev, qup->btx.sg, tx_buf, DMA_TO_DEVICE);
>
> - if (rx_nents)
> - dma_unmap_sg(qup->dev, qup->brx.sg, rx_nents,
> + if (rx_buf)
> + dma_unmap_sg(qup->dev, qup->brx.sg, rx_buf,
> DMA_FROM_DEVICE);
>
> return ret;
>
--
Qualcomm Datacenter Technologies as an affiliate of Qualcomm
Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
next prev parent reply other threads:[~2018-02-27 21:51 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-03 7:58 [PATCH 00/12] Major code reorganization to make all i2c transfers working Abhishek Sahu
2018-02-03 7:58 ` [PATCH 01/12] i2c: qup: fixed releasing dma without flush operation completion Abhishek Sahu
2018-02-08 14:03 ` Sricharan R
2018-02-19 10:24 ` Abhishek Sahu
2018-02-27 21:46 ` Christ, Austin
2018-02-27 22:24 ` Andy Gross
2018-02-03 7:58 ` [PATCH 02/12] i2c: qup: minor code reorganization for use_dma Abhishek Sahu
2018-02-27 21:48 ` Christ, Austin
2018-02-27 22:26 ` Andy Gross
2018-02-03 7:58 ` [PATCH 03/12] i2c: qup: remove redundant variables for BAM SG count Abhishek Sahu
2018-02-09 2:16 ` Sricharan R
2018-02-19 10:26 ` Abhishek Sahu
2018-02-27 21:51 ` Christ, Austin [this message]
2018-02-27 22:28 ` Andy Gross
2018-02-03 7:58 ` [PATCH 04/12] i2c: qup: schedule EOT and FLUSH tags at the end of transfer Abhishek Sahu
2018-02-15 14:31 ` Sricharan R
2018-02-19 10:34 ` Abhishek Sahu
2018-02-27 22:36 ` Andy Gross
2018-03-08 13:40 ` Abhishek Sahu
2018-02-03 7:58 ` [PATCH 05/12] i2c: qup: fix the transfer length for BAM rx EOT FLUSH tags Abhishek Sahu
2018-02-27 22:38 ` Andy Gross
2018-02-03 7:58 ` [PATCH 06/12] i2c: qup: proper error handling for i2c error in BAM mode Abhishek Sahu
2018-02-16 4:33 ` Sricharan R
2018-02-27 22:00 ` Christ, Austin
2018-02-27 22:58 ` Andy Gross
2018-03-12 12:34 ` Abhishek Sahu
2018-02-03 7:58 ` [PATCH 07/12] i2c: qup: use the complete transfer length to choose DMA mode Abhishek Sahu
2018-02-16 4:35 ` Sricharan R
2018-02-19 10:49 ` Abhishek Sahu
2018-02-27 22:01 ` Christ, Austin
2018-02-27 22:59 ` Andy Gross
2018-02-03 7:58 ` [PATCH 08/12] i2c: qup: change completion timeout according to transfer length Abhishek Sahu
2018-02-16 4:48 ` Sricharan R
2018-02-19 10:56 ` Abhishek Sahu
2018-02-27 23:05 ` Andy Gross
2018-02-03 7:58 ` [PATCH 09/12] i2c: qup: fix buffer overflow for multiple msg of maximum xfer len Abhishek Sahu
2018-02-16 5:21 ` Sricharan R
2018-02-19 11:24 ` Abhishek Sahu
2018-02-27 22:06 ` Christ, Austin
2018-03-12 13:55 ` Abhishek Sahu
2018-02-27 23:15 ` Andy Gross
2018-03-12 12:28 ` Abhishek Sahu
2018-02-03 7:58 ` [PATCH 10/12] i2c: qup: send NACK for last read sub transfers Abhishek Sahu
2018-02-16 5:39 ` Sricharan R
2018-02-27 22:07 ` Christ, Austin
2018-02-27 23:17 ` Andy Gross
2018-02-03 7:58 ` [PATCH 11/12] i2c: qup: reorganization of driver code to remove polling for qup v1 Abhishek Sahu
2018-02-05 23:03 ` kbuild test robot
2018-02-16 7:44 ` Sricharan R
2018-02-19 13:21 ` Abhishek Sahu
2018-02-20 4:32 ` Sricharan R
2018-02-03 7:58 ` [PATCH 12/12] i2c: qup: reorganization of driver code to remove polling for qup v2 Abhishek Sahu
2018-02-16 11:23 ` Sricharan R
2018-02-19 14:08 ` Abhishek Sahu
2018-02-27 23:24 ` Christ, Austin
2018-03-12 13:58 ` Abhishek Sahu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=80caf699-0680-7dbc-ef63-0cacd21ee607@codeaurora.org \
--to=austinwc@codeaurora.org \
--cc=absahu@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=david.brown@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=sricharan@codeaurora.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome