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: 5092821 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C7646C11AC for ; Thu, 16 Oct 2014 16:58:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00B92201CD for ; Thu, 16 Oct 2014 16:58:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD84920154 for ; Thu, 16 Oct 2014 16:58:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751887AbaJPQ6M (ORCPT ); Thu, 16 Oct 2014 12:58:12 -0400 Received: from mail-oi0-f73.google.com ([209.85.218.73]:50690 "EHLO mail-oi0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbaJPQ6L (ORCPT ); Thu, 16 Oct 2014 12:58:11 -0400 Received: by mail-oi0-f73.google.com with SMTP id u20so565654oif.0 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=RZuInz8F+erubmkNgsySoMy5QNzqaESMhkVcDtGLPkSq5kHzx/ptq+keSyxu3hofhd UCICwIZP3duYj1i4Waj3AafK/z1hseL9KTnCflvB6OVa0gi6oZX6uec01AERU3LHbk+3 UCQfKoGOcg/S3zjxtBfqHxuDfdsD2I1xSlZ8dmqi1q0WKAO+u+e2526600dkfXwJCOSn tt2wsdUpAEUEnDAabLL0LHRhL4K6ZBhFn2/FtIjdStoopW9OSqKOKGX+QgPO/2MrPz/C Br3nna84wsSKTJT90aL+fOTwFq/CRCnoVkvkmUcZoOUEdXOYcXnvypdeRDNsLksscA77 xHXA== X-Gm-Message-State: ALoCoQlyCR+usAQ7LpQOeYOl/NU08TEol1UPcky4vbWJ4tTeE1AeabzAAARRKt18lMlhCOrUI5Fd 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 Cc: Heiko Stuebner , Seungwon Jeon , Jaehoon Chung , Ulf Hansson , dianders@chromium.org, eddie.cai@rock-chips.com, addy.ke@rock-chips.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sonny Rao 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 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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;