mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jaehoon Chung <jh80.chung@samsung.com>
To: linux-mmc@vger.kernel.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org,
	linux-rockchip@lists.infradead.org, ulf.hansson@linaro.org,
	robh+dt@kernel.org, krzk@kernel.org, heiko@sntech.de,
	shawn.lin@rock-chips.com, Jaehoon Chung <jh80.chung@samsung.com>
Subject: [PATCH 07/13] mmc: dw_mmc: use the cookie's enum values for post/pre_req()
Date: Thu, 03 Nov 2016 15:21:29 +0900	[thread overview]
Message-ID: <20161103062135.10697-8-jh80.chung@samsung.com> (raw)
In-Reply-To: <20161103062135.10697-1-jh80.chung@samsung.com>

This patch removed the meaningless value. Instead, use the cookie's enum
values for executing correctly.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
---
 drivers/mmc/host/dw_mmc.c | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 16df93b..df151c8 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -414,12 +414,13 @@ static void dw_mci_dma_cleanup(struct dw_mci *host)
 {
 	struct mmc_data *data = host->data;
 
-	if (data)
-		if (!data->host_cookie)
-			dma_unmap_sg(host->dev,
-				     data->sg,
-				     data->sg_len,
-				     dw_mci_get_dma_dir(data));
+	if (data && data->host_cookie == COOKIE_MAPPED) {
+		dma_unmap_sg(host->dev,
+			     data->sg,
+			     data->sg_len,
+			     dw_mci_get_dma_dir(data));
+		data->host_cookie = COOKIE_UNMAPPED;
+	}
 }
 
 static void dw_mci_idmac_reset(struct dw_mci *host)
@@ -850,13 +851,13 @@ static const struct dw_mci_dma_ops dw_mci_edmac_ops = {
 
 static int dw_mci_pre_dma_transfer(struct dw_mci *host,
 				   struct mmc_data *data,
-				   bool next)
+				   int cookie)
 {
 	struct scatterlist *sg;
 	unsigned int i, sg_len;
 
-	if (!next && data->host_cookie)
-		return data->host_cookie;
+	if (data->host_cookie == COOKIE_PRE_MAPPED)
+		return data->sg_len;
 
 	/*
 	 * We don't do DMA on "complex" transfers, i.e. with
@@ -881,8 +882,7 @@ static int dw_mci_pre_dma_transfer(struct dw_mci *host,
 	if (sg_len == 0)
 		return -EINVAL;
 
-	if (next)
-		data->host_cookie = sg_len;
+	data->host_cookie = cookie;
 
 	return sg_len;
 }
@@ -897,13 +897,12 @@ static void dw_mci_pre_req(struct mmc_host *mmc,
 	if (!slot->host->use_dma || !data)
 		return;
 
-	if (data->host_cookie) {
-		data->host_cookie = 0;
-		return;
-	}
+	/* This data might be unmapped at this time */
+	data->host_cookie = COOKIE_UNMAPPED;
 
-	if (dw_mci_pre_dma_transfer(slot->host, mrq->data, 1) < 0)
-		data->host_cookie = 0;
+	if (dw_mci_pre_dma_transfer(slot->host, mrq->data,
+				COOKIE_PRE_MAPPED) < 0)
+		data->host_cookie = COOKIE_UNMAPPED;
 }
 
 static void dw_mci_post_req(struct mmc_host *mmc,
@@ -916,12 +915,12 @@ static void dw_mci_post_req(struct mmc_host *mmc,
 	if (!slot->host->use_dma || !data)
 		return;
 
-	if (data->host_cookie)
+	if (data->host_cookie != COOKIE_UNMAPPED)
 		dma_unmap_sg(slot->host->dev,
 			     data->sg,
 			     data->sg_len,
 			     dw_mci_get_dma_dir(data));
-	data->host_cookie = 0;
+	data->host_cookie = COOKIE_UNMAPPED;
 }
 
 static void dw_mci_adjust_fifoth(struct dw_mci *host, struct mmc_data *data)
@@ -1027,7 +1026,7 @@ static int dw_mci_submit_data_dma(struct dw_mci *host, struct mmc_data *data)
 	if (!host->use_dma)
 		return -ENODEV;
 
-	sg_len = dw_mci_pre_dma_transfer(host, data, 0);
+	sg_len = dw_mci_pre_dma_transfer(host, data, COOKIE_MAPPED);
 	if (sg_len < 0) {
 		host->dma_ops->stop(host);
 		return sg_len;
-- 
2.10.1

  parent reply	other threads:[~2016-11-03  6:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-03  6:21 [PATCH 00/13] mmc: dw_mmc: cleans the codes for dwmmc controller Jaehoon Chung
2016-11-03  6:21 ` [PATCH 01/13] mmc: dw_mmc: display the real register value on debugfs Jaehoon Chung
2016-11-03  6:21 ` [PATCH 02/13] mmc: dw_mmc: fix the debug message for checking card's present Jaehoon Chung
2016-11-03  6:21 ` [PATCH 03/13] mmc: dw_mmc: change the DW_MCI_FREQ_MIN from 400K to 100K Jaehoon Chung
2016-11-03  6:21 ` [PATCH 04/13] mmc: dw_mmc: use the hold register when send stop command Jaehoon Chung
2016-11-03  6:21 ` [PATCH 05/13] mmc: dw_mmc: call the dw_mci_prep_stop_abort() by default Jaehoon Chung
2016-11-03  6:21 ` [PATCH 06/13] mmc: core: move the cookie's enum values from sdhci.h to mmc.h Jaehoon Chung
2016-11-03  6:21 ` Jaehoon Chung [this message]
2016-11-03  6:21 ` [PATCH 08/13] mmc: dw_mmc: remove the unnecessary mmc_data structure Jaehoon Chung
2016-11-03  6:21 ` [PATCH 09/13] mmc: dw_mmc: remove the "clock-freq-min-max" property Jaehoon Chung
2016-11-03  8:20   ` Heiko Stübner
2016-11-03  8:42     ` Jaehoon Chung
2016-11-03  6:21 ` [PATCH 10/13] ARM: dts: exynos: replace to "max-frequecy" instead of "clock-freq-min-max" Jaehoon Chung
2016-11-03 18:41   ` Krzysztof Kozlowski
2016-11-04 10:21     ` Jaehoon Chung
2016-11-04 11:19       ` Heiko Stuebner
2016-11-04 15:04         ` Krzysztof Kozlowski
2016-11-07  0:38           ` Jaehoon Chung
2016-11-09 20:10             ` Krzysztof Kozlowski
2016-11-03  6:21 ` [PATCH 11/13] ARM: dts: rockchip: replace to "max-frequency" " Jaehoon Chung
2016-11-09 14:05   ` Heiko Stuebner
2016-11-03  6:21 ` [PATCH 12/13] ARM64: " Jaehoon Chung
2016-11-09 14:37   ` Heiko Stuebner
2016-11-03  6:21 ` [PATCH 13/13] Documentation: synopsys-dw-mshc: remove the unused properties Jaehoon Chung
2016-11-10 18:47   ` Rob Herring
2016-11-09 18:55 ` [PATCH 00/13] mmc: dw_mmc: cleans the codes for dwmmc controller Heiko Stuebner

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=20161103062135.10697-8-jh80.chung@samsung.com \
    --to=jh80.chung@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=heiko@sntech.de \
    --cc=krzk@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=shawn.lin@rock-chips.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®