From patchwork Thu Oct 16 16:58:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sonny Rao X-Patchwork-Id: 5092841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9803A9F3ED for ; Thu, 16 Oct 2014 17:00:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9212201CD for ; Thu, 16 Oct 2014 17:00:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E703320154 for ; Thu, 16 Oct 2014 17:00:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeoNo-0000JJ-3R; Thu, 16 Oct 2014 16:58:36 +0000 Received: from mail-oi0-f73.google.com ([209.85.218.73]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XeoNk-0000GV-Gu for linux-arm-kernel@lists.infradead.org; Thu, 16 Oct 2014 16:58:32 +0000 Received: by mail-oi0-f73.google.com with SMTP id u20so564822oif.2 for ; Thu, 16 Oct 2014 09:58:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jvHOZGxLarKZKxPX940LVzIrqkHja3XUP+xyTJaLOTE=; b=NQFPCxrz7GEpwEqfBthYrhatcFBey2JwYuwLv0XFK6CrhVONBCkKbqXGxtgcriCnzx dbj154Y34zJLHFr4OuWdvmgZLoc5Rerpvff0qrqBecrkBcIyoZnRD3G/UXzkxJYR4rvz Svgg5FqnyojnRiXr0W++6FUbIyKTarjoNXnnnrRfZasmRwGCgF1Tkf0A2sRa3Kru4z8m fSDrsjcutSHfUQGrd5eFAuZ64B01Skd6ECdilJZRFnLP5UgrJKLsoZFqv7+EMO+q/4D5 Ufc0B2XjnmcHuK2Fn1kMu5YIYwIQO03KB+ES4lfzjR6HJuTuhc/7Iet1IEOHl+M3FIgp pZ0A== X-Gm-Message-State: ALoCoQmf2/zQv8mK1AreFZZj9/LZfWDHl7UT2Y4INUKuaSAGY89iZlYXN9aOmrUNPSIFBxmuIBoh X-Received: by 10.50.141.135 with SMTP id ro7mr4254411igb.7.1413478690551; Thu, 16 Oct 2014 09:58:10 -0700 (PDT) Received: from corpmail-nozzle1-2.hot.corp.google.com ([100.108.1.103]) by gmr-mx.google.com with ESMTPS id n22si1114060yhd.1.2014.10.16.09.58.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Oct 2014 09:58:10 -0700 (PDT) Received: from sonnyrao.mtv.corp.google.com ([172.22.162.1]) by corpmail-nozzle1-2.hot.corp.google.com with ESMTP id ZpaE8u9x.1; Thu, 16 Oct 2014 09:58:10 -0700 Received: by sonnyrao.mtv.corp.google.com (Postfix, from userid 129445) id 3BDA9A0913; Thu, 16 Oct 2014 09:58:09 -0700 (PDT) From: Sonny Rao To: Alim Akhtar , linux-mmc@vger.kernel.org Subject: [PATCH v2] mmc: dw_mmc: Reset DMA before enabling IDMAC Date: Thu, 16 Oct 2014 09:58:05 -0700 Message-Id: <1413478686-6857-1-git-send-email-sonnyrao@chromium.org> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141016_095832_603643_9FF09240 X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -0.7 (/) Cc: Ulf Hansson , Heiko Stuebner , addy.ke@rock-chips.com, Seungwon Jeon , dianders@chromium.org, linux-kernel@vger.kernel.org, Jaehoon Chung , eddie.cai@rock-chips.com, Sonny Rao , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We've already got a reset of DMA after it's done. Add one before we start DMA too. This fixes a data corruption on Rockchip SoCs which will get bad data when doing a DMA transfer after doing a PIO transfer. We tested this on an Exynos 5800 with HS200 and didn't notice any difference in sequential read throughput. Signed-off-by: Sonny Rao Signed-off-by: Doug Anderson Tested-by: Doug Anderson Acked-by: Jaehoon Chung Tested-by: Jaehoon Chung Reviewed-by: Alim Akhtar --- drivers/mmc/host/dw_mmc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 69f0cc6..ca67f69 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -83,6 +83,7 @@ struct idmac_desc { #endif /* CONFIG_MMC_DW_IDMAC */ static bool dw_mci_reset(struct dw_mci *host); +static bool dw_mci_ctrl_reset(struct dw_mci *host, u32 reset); #if defined(CONFIG_DEBUG_FS) static int dw_mci_req_show(struct seq_file *s, void *v) @@ -448,6 +449,10 @@ static void dw_mci_idmac_start_dma(struct dw_mci *host, unsigned int sg_len) dw_mci_translate_sglist(host, host->data, sg_len); + /* Make sure to reset DMA in case we did PIO before this */ + dw_mci_ctrl_reset(host, SDMMC_CTRL_DMA_RESET); + dw_mci_idmac_reset(host); + /* Select IDMAC interface */ temp = mci_readl(host, CTRL); temp |= SDMMC_CTRL_USE_IDMAC;