All of lore.kernel.org
 help / color / mirror / Atom feed
From: Russell King <rmk+kernel@arm.linux.org.uk>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Marcin Wojtas <mw@semihalf.com>,
	Gregory CLEMENT <gregory.clement@free-electrons.com>,
	Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <kernel@pengutronix.de>,
	linux-mmc@vger.kernel.org
Subject: [PATCH 14/17] mmc: sdhci: always unmap a mapped data transfer in sdhci_post_req()
Date: Sat, 19 Dec 2015 20:31:15 +0000	[thread overview]
Message-ID: <E1aAO9r-0007zO-Mn@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20151219202851.GS8644@n2100.arm.linux.org.uk>

If the host cookie indicates that the data buffers of a request are
mapped at sdhci_post_req() time, always unmap the data buffers.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 drivers/mmc/host/sdhci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 46cffb7f6841..264248ac439e 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2077,8 +2077,7 @@ static void sdhci_post_req(struct mmc_host *mmc, struct mmc_request *mrq,
 	struct mmc_data *data = mrq->data;
 
 	if (host->flags & SDHCI_REQ_USE_DMA) {
-		if (data->host_cookie == COOKIE_GIVEN ||
-				data->host_cookie == COOKIE_MAPPED)
+		if (data->host_cookie != COOKIE_UNMAPPED)
 			dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
 					 data->flags & MMC_DATA_WRITE ?
 					 DMA_TO_DEVICE : DMA_FROM_DEVICE);
-- 
2.1.0


  parent reply	other threads:[~2015-12-19 20:31 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-19 20:28 [PATCH 00/17] MMC/SDHCI fixes Russell King - ARM Linux
2015-12-19 20:29 ` [PATCH 01/17] mmc: core: shut up "voltage-ranges unspecified" pr_info() Russell King
2015-12-21 10:18   ` Ulf Hansson
2015-12-21 10:24     ` Russell King - ARM Linux
2015-12-19 20:30 ` Russell King
2015-12-19 20:30 ` [PATCH 02/17] mmc: block: shut up "retrying because a re-tune was needed" message Russell King
2015-12-19 20:30 ` [PATCH 03/17] mmc: core: report tuning command execution failure reason Russell King
2015-12-19 20:30 ` [PATCH 04/17] mmc: sdhci: move initialisation of command error member Russell King
2015-12-19 20:30 ` [PATCH 05/17] mmc: sdhci: clean up command error handling Russell King
2015-12-19 20:30 ` [PATCH 06/17] mmc: sdhci: command response CRC " Russell King
2015-12-19 20:30 ` [PATCH 07/17] mmc: sdhci: avoid unnecessary mapping/unmapping of align buffer Russell King
2015-12-21 10:28   ` Ulf Hansson
2015-12-21 10:53     ` Russell King - ARM Linux
2015-12-19 20:30 ` [PATCH 08/17] mmc: sdhci: clean up coding style in sdhci_adma_table_pre() Russell King
2015-12-19 20:30 ` [PATCH 09/17] mmc: sdhci: avoid walking SG list for writes Russell King
2015-12-19 20:30 ` [PATCH 10/17] mmc: sdhci: factor out common DMA cleanup in sdhci_finish_data() Russell King
2015-12-19 20:30 ` [PATCH 11/17] mmc: sdhci: move sdhci_pre_dma_transfer() Russell King
2015-12-19 20:31 ` [PATCH 12/17] mmc: sdhci: factor out sdhci_pre_dma_transfer() from sdhci_adma_table_pre() Russell King
2015-12-19 20:31 ` [PATCH 13/17] mmc: sdhci: pass the cookie into sdhci_pre_dma_transfer() Russell King
2015-12-19 20:31 ` Russell King [this message]
2015-12-19 20:31 ` [PATCH 15/17] mmc: sdhci: clean up host cookie handling Russell King
2015-12-19 20:31 ` [PATCH 16/17] mmc: sdhci: plug DMA mapping leak on error Russell King
2015-12-19 20:31 ` [PATCH 17/17] mmc: sdhci-pxav3: fix higher speed mode capabilities Russell King
2015-12-19 21:42 ` [PATCH 18/17] mmc: sdhci: further fix for DMA unmapping in sdhci_post_req() Russell King
2015-12-20  8:27 ` [PATCH 19/17] mmc: sdhci: fix data timeout (part 1) Russell King
2015-12-20  8:27 ` [PATCH 20/17] mmc: sdhci: fix data timeout (part 2) Russell King
2015-12-21 10:46 ` [PATCH 00/17] MMC/SDHCI fixes Ulf Hansson
2015-12-21 11:04   ` Russell King - ARM Linux

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=E1aAO9r-0007zO-Mn@rmk-PC.arm.linux.org.uk \
    --to=rmk+kernel@arm.linux.org.uk \
    --cc=gregory.clement@free-electrons.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-mmc@vger.kernel.org \
    --cc=mw@semihalf.com \
    --cc=shawnguo@kernel.org \
    --cc=ulf.hansson@linaro.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.