From: per.forlin@linaro.org (Per Forlin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 02/12] omap_hsmmc: use original sg_len for dma_unmap_sg
Date: Fri, 17 Jun 2011 12:58:20 +0200 [thread overview]
Message-ID: <BANLkTikb=gXBpxSvgdg4Ni1sXj99m7zj2g@mail.gmail.com> (raw)
In-Reply-To: <BANLkTinWzJ22NrVGofSNvgOcQePD1BKAuA@mail.gmail.com>
On 16 June 2011 15:16, S, Venkatraman <svenkatr@ti.com> wrote:
> On Thu, May 26, 2011 at 3:27 AM, Per Forlin <per.forlin@linaro.org> wrote:
>> Don't use the returned sg_len from dma_map_sg() as inparameter
>> to dma_unmap_sg(). Use the original sg_len for both dma_map_sg
>> and dma_unmap_sg.
>>
>> Signed-off-by: Per Forlin <per.forlin@linaro.org>
>> ---
>> ?drivers/mmc/host/omap_hsmmc.c | ? ?5 +++--
>> ?1 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
>> index 259ece0..ad3731a 100644
>> --- a/drivers/mmc/host/omap_hsmmc.c
>> +++ b/drivers/mmc/host/omap_hsmmc.c
>> @@ -959,7 +959,8 @@ static void omap_hsmmc_dma_cleanup(struct omap_hsmmc_host *host, int errno)
>> ? ? ? ?spin_unlock(&host->irq_lock);
>>
>> ? ? ? ?if (host->use_dma && dma_ch != -1) {
>> - ? ? ? ? ? ? ? dma_unmap_sg(mmc_dev(host->mmc), host->data->sg, host->dma_len,
>> + ? ? ? ? ? ? ? dma_unmap_sg(mmc_dev(host->mmc), host->data->sg,
>> + ? ? ? ? ? ? ? ? ? ? ? host->data->sg_len,
>> ? ? ? ? ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, host->data));
>> ? ? ? ? ? ? ? ?omap_free_dma(dma_ch);
>> ? ? ? ?}
>> @@ -1343,7 +1344,7 @@ static void omap_hsmmc_dma_cb(int lch, u16 ch_status, void *cb_data)
>> ? ? ? ? ? ? ? ?return;
>> ? ? ? ?}
>>
>> - ? ? ? dma_unmap_sg(mmc_dev(host->mmc), data->sg, host->dma_len,
>> + ? ? ? dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
>> ? ? ? ? ? ? ? ?omap_hsmmc_get_dma_dir(host, data));
>>
>> ? ? ? ?req_in_progress = host->req_in_progress;
>> --
>> 1.7.4.1
>>
>
> Reviewed-by: Venkatraman S <svenkatr@ti.com>
>
> Perhaps this doesn't belong to $FEATURE and can be posted as a separate patch ?
Yes, I will resend it as a separate patch.
Thanks,
Per
next prev parent reply other threads:[~2011-06-17 10:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 21:57 [PATCH v4 00/12] mmc: use nonblock mmc requests to minimize latency Per Forlin
2011-05-25 21:57 ` [PATCH v4 01/12] mmc: add none blocking mmc request function Per Forlin
2011-05-25 21:57 ` [PATCH v4 02/12] omap_hsmmc: use original sg_len for dma_unmap_sg Per Forlin
2011-06-16 13:16 ` S, Venkatraman
2011-06-17 10:58 ` Per Forlin [this message]
2011-05-25 21:57 ` [PATCH v4 03/12] omap_hsmmc: add support for pre_req and post_req Per Forlin
2011-06-16 13:14 ` S, Venkatraman
2011-06-17 10:15 ` Per Forlin
2011-05-25 21:57 ` [PATCH v4 04/12] mmci: implement pre_req() and post_req() Per Forlin
2011-05-25 21:57 ` [PATCH v4 05/12] mmc: mmc_test: add debugfs file to list all tests Per Forlin
2011-05-25 21:57 ` [PATCH v4 06/12] mmc: mmc_test: add test for none blocking transfers Per Forlin
2011-05-25 21:57 ` [PATCH v4 07/12] mmc: add member in mmc queue struct to hold request data Per Forlin
2011-05-25 21:57 ` [PATCH v4 08/12] mmc: add a block request prepare function Per Forlin
2011-05-25 21:57 ` [PATCH v4 09/12] mmc: move error code in mmc_block_issue_rw_rq to a separate function Per Forlin
2011-05-25 21:57 ` [PATCH v4 10/12] mmc: add a second mmc queue request member Per Forlin
2011-05-25 21:57 ` [PATCH v4 11/12] mmc: test: add random fault injection in core.c Per Forlin
2011-05-25 21:57 ` [PATCH v4 12/12] mmc: add handling for two parallel block requests in issue_rw_rq Per Forlin
2011-06-16 13:39 ` [PATCH v4 00/12] mmc: use nonblock mmc requests to minimize latency S, Venkatraman
2011-06-17 11:02 ` Per Forlin
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='BANLkTikb=gXBpxSvgdg4Ni1sXj99m7zj2g@mail.gmail.com' \
--to=per.forlin@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).