From patchwork Mon Jul 9 03:19:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 141360 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2166790ljj; Sun, 8 Jul 2018 20:21:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe24fJ/+9FGr7HqKWXIVtINlrQb5AsAHVAX/tCbERfsoV/6JfCLEpf9VOuNRhXlvR/3PWS+ X-Received: by 2002:a63:8c0b:: with SMTP id m11-v6mr17534999pgd.372.1531106489040; Sun, 08 Jul 2018 20:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531106489; cv=none; d=google.com; s=arc-20160816; b=JCy0hlsaAz3/m9bjR2Ts6LeQFj/05ITHZ8fBi8pwYpQ9yJG90MFxbrwPlv7LVNlE4i RInGEkqxlTTgQEvoGYIv+2eaGc5668AgR1TtS8pD0SH8o6NebziAOZXD5gO/Qhb6HwPv Z29whCxYPpm7dkstmMwMOY6la7Hq6BNERT+BrfZh0osyvc3GtzhfROv9aB5n6Zow4vh7 koU0H9s9AhKt+J7/mMItuueww8eXoFOFg+MnGMPPyK4X11ODE2LrQEz5K8EgQz0pG9EG Ka47siu0st83K+yGxMT0twZ3888u9eAMsZ+D80NwTvedNc+agekA6V4lrdUGWVunjmeY uNEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=q2qnE+d0psJIKurjAu2lfNrbqvVLnoTtcmJ8tnItulU=; b=ZSgHsp1YUmcucw8xrCzw51s75tlSNYb5vxaloG4n/D+H5+zKBQMNrxdxw0SYont5PY Z/iJ+OZrCO0vb8z++VKpTxX2MVFei/NR4t7t3gLgQRK6Y+sPwyVqyVh2Dr97dlqO9Ls7 oL6Ri1zn3Rr0x2oBZOpoJQzMxBImxE4eI+D15gWZ006XHARRS4SL3dxxeY9DO5Dl9POd auOrMTtoMdU8xCk2iXBDXL4quj2QdqzxpKsIfECTrSTwAcbXiBg6qphF1dMxgufMXyNn 94gBjzmxb/GliuphQmjbnFaXkTL5T8uxR3fRX3bN+zyirwoyShjD3+b/ER05R9jtEMa3 J8kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NCwRjkju; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d16-v6si14485506pfe.267.2018.07.08.20.21.28; Sun, 08 Jul 2018 20:21:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NCwRjkju; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933275AbeGIDV1 (ORCPT + 6 others); Sun, 8 Jul 2018 23:21:27 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40501 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933040AbeGIDVZ (ORCPT ); Sun, 8 Jul 2018 23:21:25 -0400 Received: by mail-pl0-f65.google.com with SMTP id t6-v6so5346050plo.7 for ; Sun, 08 Jul 2018 20:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U2m4J5ZcFgcmYhx2M7R/05FBJ9kdju3nRv1lZnT2H/c=; b=NCwRjkjuDvXljol15IfJUAYGd5eP9IJLE6Xn4+R69HtiXMl/QbUfPKwKM8VIwBIU1c +fsRR91DTxuWi6ibW2lki58VeGggjf6JFsg7s8F1EauwYSlc1DPLYjyhjDQBZDFEM04G jnZ5IcWqgPgQhvZ9KGyi6pVsmhnkAoH/cXKD8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U2m4J5ZcFgcmYhx2M7R/05FBJ9kdju3nRv1lZnT2H/c=; b=gM1IlNaeT1LSPsYjHiM3a5EAabRiaI85H3aA4aJOAGLc7D8GwiYH6vwCD0Tdp+YZHk fbcPb9nEo4iHBBS2ZMs0pUthHdyAqMWwEZyXxH+gJ9tqT6ZmnvYFri/xNPWwUbzZxy1A IcG3ar7CcxVBbqMcBPDBJWFegFRxvYs4vnes+4L1EvKz8mhH7mGOFWVL4vJNkF7Sl7aI kNKwjr5XaTuRz3PMJh04/3w7HMJk//R/znUpJlaGIErQ5svtKq4KvoGHjbVN3S+nleQT GCcT4aMiSb5aYbi4WHPxMwnec7FLmJhX2tmYvS27w/HJ5ZjTN2beZI8N9jz2i5SJscXl 9zZg== X-Gm-Message-State: APt69E2l3K10N9z7vydLzPhALPWkN+rwa/+jwy56E1/rt9CQMrPlmjSS LXvmVi32j2Wxv7aGJxErce3qmQ== X-Received: by 2002:a17:902:7782:: with SMTP id o2-v6mr18925446pll.93.1531106485077; Sun, 08 Jul 2018 20:21:25 -0700 (PDT) Received: from ubt.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id e82-v6sm41458950pfk.87.2018.07.08.20.21.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Jul 2018 20:21:24 -0700 (PDT) From: Chunyan Zhang To: Ulf Hansson , Adrian Hunter Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Orson Zhai , Baolin Wang , Billows Wu , zhang.lyra@gmail.com Subject: [PATCH V3 2/7] mmc: sdhci: made changes for System Address register of SDMA Date: Mon, 9 Jul 2018 11:19:53 +0800 Message-Id: <1531106398-14062-3-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531106398-14062-1-git-send-email-zhang.chunyan@linaro.org> References: <1531106398-14062-1-git-send-email-zhang.chunyan@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org According to the SD host controller specification version 4.10, when Host Version 4 is enabled, SDMA uses ADMA System Address register (05Fh-058h) instead of using SDMA System Address register to support both 32-bit and 64-bit addressing. Signed-off-by: Chunyan Zhang --- drivers/mmc/host/sdhci.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 525862f..c7de6a5 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -701,7 +701,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host, } } -static u32 sdhci_sdma_address(struct sdhci_host *host) +static dma_addr_t sdhci_sdma_address(struct sdhci_host *host) { if (host->bounce_buffer) return host->bounce_addr; @@ -709,6 +709,18 @@ static u32 sdhci_sdma_address(struct sdhci_host *host) return sg_dma_address(host->data->sg); } +static void sdhci_set_sdma_addr(struct sdhci_host *host, dma_addr_t addr) +{ + if (host->v4_mode) { + sdhci_writel(host, addr, SDHCI_ADMA_ADDRESS); + if (host->flags & SDHCI_USE_64_BIT_DMA) + sdhci_writel(host, (u64)addr >> 32, SDHCI_ADMA_ADDRESS_HI); + } else { + sdhci_writel(host, addr, SDHCI_DMA_ADDRESS); + } + +} + static unsigned int sdhci_target_timeout(struct sdhci_host *host, struct mmc_command *cmd, struct mmc_data *data) @@ -968,8 +980,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) SDHCI_ADMA_ADDRESS_HI); } else { WARN_ON(sg_cnt != 1); - sdhci_writel(host, sdhci_sdma_address(host), - SDHCI_DMA_ADDRESS); + sdhci_set_sdma_addr(host, sdhci_sdma_address(host)); } } @@ -2796,7 +2807,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) * some controllers are faulty, don't trust them. */ if (intmask & SDHCI_INT_DMA_END) { - u32 dmastart, dmanow; + dma_addr_t dmastart, dmanow; dmastart = sdhci_sdma_address(host); dmanow = dmastart + host->data->bytes_xfered; @@ -2807,9 +2818,9 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) ~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1)) + SDHCI_DEFAULT_BOUNDARY_SIZE; host->data->bytes_xfered = dmanow - dmastart; - DBG("DMA base 0x%08x, transferred 0x%06x bytes, next 0x%08x\n", - dmastart, host->data->bytes_xfered, dmanow); - sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); + DBG("DMA base 0x%016llx, transferred 0x%06x bytes, next 0x%016llx\n", + (u64)dmastart, host->data->bytes_xfered, (u64)dmanow); + sdhci_set_sdma_addr(host, dmanow); } if (intmask & SDHCI_INT_DATA_END) {