From patchwork Mon Jul 23 10:08:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 142559 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5862458ljj; Mon, 23 Jul 2018 03:09:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfFoTcELEWoPrRpoRWoa+alrmjHQi7sxL9K/kjUfLfNXf7XHQAwujhUNxSbHBNIwAsDQvV0 X-Received: by 2002:a17:902:bf06:: with SMTP id bi6-v6mr6480460plb.76.1532340560854; Mon, 23 Jul 2018 03:09:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532340560; cv=none; d=google.com; s=arc-20160816; b=BvfcN+KXsw9FlmiyEkwIQ/Pg37Kl3f3RcQz7WtQd307vBfZ5mSZlyblcgB/1XUCoIU gjkugnJZOGiO0Xsc6yW7IN4++H0NaeofDHP8ITJAcab0w8abdBWUaPXBl0p+He2pfgF6 5m6ffCHkj6LDeo8aO0F1i2t9LBBg2uO2xubwqQy2E97GmGErCaNLFdmylURVvz3cjwjO 7BaFPOj6NhSpfwXI5K41kGXOAr7UnTt1S3rXCNiTA+dhQUzCtLE4atSlh18zbnGM7jbL bhSAyjK/6J2o4chfltY+oAo5Y9fAuBZuaocU3KWIDejjuBwnPtkoJmOAKD1H2nJ1H+Bt jd+Q== 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=r3bq5nEKMFMRh5i3hUlIDjJKG4aq/jFWMjz+PBnglkk=; b=jnebdk2TXV5RD+tXrNlRGrso5eo0qNa965jt/iL6zYdh8Xln2UI6vT9rPAMVeH+uY0 15v7/T69C0GkVpvGSa5tmcQoatQsyMONL70x1o1JNk3tCmdIy6oWsV3bE/2QBx9+e5k/ F6T4U7MZZcvLxYTPj8N59jablYqSsGLvt/+hjzXqxfhWxxenSdI/COf5cc2BpaURPtkV hyaUwcaQutZobYJemXvldyIo1ohPLdlIYWv2YixbS8ERLzt+0Og1buq1il9t0ZHxf/60 heMTCTMc6V5gUDtaO+/AFVaBh1NMfXJr28tlkqTmvVrCdkDH1wC5X75Ac6t5o8QYpVJJ Z0nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DFJDOtVX; 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 1-v6si7722547plj.411.2018.07.23.03.09.20; Mon, 23 Jul 2018 03:09:20 -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=DFJDOtVX; 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 S2388358AbeGWLJq (ORCPT + 5 others); Mon, 23 Jul 2018 07:09:46 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:41939 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388357AbeGWLJp (ORCPT ); Mon, 23 Jul 2018 07:09:45 -0400 Received: by mail-pg1-f195.google.com with SMTP id z8-v6so44720pgu.8 for ; Mon, 23 Jul 2018 03:09:19 -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=6U0oFcYatVgQm3/eP8KlsQEUgCN13nFxxwM/5+0rxN4=; b=DFJDOtVXyhlEZdjc+WhJtSMgDZYQ+etpTgSIkgvz7Iy9gCFUxFT8ZKbLv6yWnnVG7g OwO7zp+PVVwv6iiP/m+2f7U3U4b2tYQEEp2VsYDueahuhtBjiSwjXCOy21Sp3ONGtc4X Dgd/8sOiW4a3S+9338g3StHq1WZ87dvBhzrJM= 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=6U0oFcYatVgQm3/eP8KlsQEUgCN13nFxxwM/5+0rxN4=; b=sExjvZC+sEa9q6/DoHzLaqivh6Uqv0iIKvMY4/Zd0EI03cboUWUKra+Gs0zLYPpXyD 7BMSVkTq1xW0njpVvIlz6TQRL88qULbadFvXl5cWQx0YTzn+xm0ezYfXg3SgX1NLQrn/ NBOi2IihPkR8I6p0pY9i44ZulEul3m1NpmjUhOkm1jWIeXnsD9g9AWpEhnt7fzLIBkhb S0mJVZfiU4weQKygJ78bvLKXvJyayH1eY8APIj8zGijMSjupon0jFwBFr6bcyOWmvI/M hAB9lTbUl9aGefQbBdStpd90cD2mzELAcd53CTFFV+TVC/IjMa6ND4SFscWello5M08m CH3Q== X-Gm-Message-State: AOUpUlEgRUEFAzD6yWtntk9in/9BPfFRRQBQA4BVwSK2d+mYzeURssox N1p5SGMIlnYkUsG6ZjyBGL7LFg== X-Received: by 2002:a63:5350:: with SMTP id t16-v6mr11450113pgl.196.1532340558854; Mon, 23 Jul 2018 03:09:18 -0700 (PDT) Received: from ubt.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id e82-v6sm13470698pfk.87.2018.07.23.03.09.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jul 2018 03:09:18 -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 , Jason Wu , zhang.lyra@gmail.com Subject: [PATCH V4 2/7] mmc: sdhci: Change SDMA address register for v4 mode Date: Mon, 23 Jul 2018 18:08:23 +0800 Message-Id: <1532340508-8749-3-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1532340508-8749-1-git-send-email-zhang.chunyan@linaro.org> References: <1532340508-8749-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 | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 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 cab5350..9cb17c0 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -729,7 +729,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; @@ -737,6 +737,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) @@ -996,8 +1008,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)); } } @@ -2824,7 +2835,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; @@ -2832,12 +2843,12 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) * Force update to the next DMA block boundary. */ dmanow = (dmanow & - ~(SDHCI_DEFAULT_BOUNDARY_SIZE - 1)) + + ~((dma_addr_t)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", + DBG("DMA base %pad, transferred 0x%06x bytes, next %pad\n", dmastart, host->data->bytes_xfered, dmanow); - sdhci_writel(host, dmanow, SDHCI_DMA_ADDRESS); + sdhci_set_sdma_addr(host, dmanow); } if (intmask & SDHCI_INT_DATA_END) { @@ -3581,8 +3592,8 @@ int sdhci_setup_host(struct sdhci_host *host) } } - /* SDMA does not support 64-bit DMA */ - if (host->flags & SDHCI_USE_64_BIT_DMA) + /* SDMA does not support 64-bit DMA if v4 mode not set */ + if ((host->flags & SDHCI_USE_64_BIT_DMA) && !host->v4_mode) host->flags &= ~SDHCI_USE_SDMA; if (host->flags & SDHCI_USE_ADMA) {