From patchwork Fri Jun 8 08:18:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 137937 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp580151lji; Fri, 8 Jun 2018 01:19:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI0qvlxOgEQg0coA3QLx++PMBXIajFz279FlUcDtHtoX0H6yaMdPWsD6JJ8ygZgHdqumHJ4 X-Received: by 2002:a63:740c:: with SMTP id p12-v6mr4384577pgc.259.1528445955512; Fri, 08 Jun 2018 01:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528445955; cv=none; d=google.com; s=arc-20160816; b=lBtZEeackCcngLoZzo0Pah06zEOpPVvL/nesZv67CSaRazvUgFaItpGeNl2PohXDvj KY0TrzoK7ASfPLTyaEgSn/74t9k8xLdeNVORTR8Tut4eWqp94DW1E2g2Loy9gjwa9hx+ RjWwQdskPObXHHFvfDzroBeZIKdS+J0+5JMtwORp3GTkfcPHRfqU7AlZdcV36GdVOxJZ WujF6Ny8bqCA9pKk9OyOlRLpt3V6vHZVBFFDgAFyDTGE9O2AjR+PjSmWLeegEsVgFqPG faPlCVN2W1QbAaGdEh4+uFgRsAOI0a5wp9SYUXPyXWqcvQmTCZUbYdvZlcswMVcUxjL9 hLmA== 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=HweywlkV3W7hX6j4jAziXnB8202QrrYYO0FfXOW5ydM=; b=nDRr6/jOY3K5UiAjsjauMrKWco8FhwOBDlLxfz+nBGCQjhLCkvTQl0HBxQNIyC+t3D 1YknAqDXd0yuGd3nKs+DfMwVBvB4EuM+C9EcUoXdCri3870qOqwCvX8Yuk5nX9T/A3JF i1wljxW5yfpx1Ca6gx2KlC5oISVzeaM8CN5XTUnONuumW4qj4DBS0r+nU7VGFI0fKZ+2 lelo45ArHXD1sUY0Dr839K86HsZu9rvfW6coCQpDbTw9G/O8Y3B2Ub6xWTl/+ABcdwwx 69AtmjfaY6dgJH+NF/MhIk+NGfNHA1TtF3in0hsrMgxix9x6HsoSP6xxIM2XxbP/x3gt HhKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jpYah+g6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (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 b10-v6si57043725pla.282.2018.06.08.01.19.15; Fri, 08 Jun 2018 01:19:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jpYah+g6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752896AbeFHITN (ORCPT + 30 others); Fri, 8 Jun 2018 04:19:13 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:40511 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752326AbeFHITI (ORCPT ); Fri, 8 Jun 2018 04:19:08 -0400 Received: by mail-pf0-f193.google.com with SMTP id z24-v6so6259557pfe.7 for ; Fri, 08 Jun 2018 01:19:08 -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=HweywlkV3W7hX6j4jAziXnB8202QrrYYO0FfXOW5ydM=; b=jpYah+g6bV7iiyUJ0nYKHVkiO4s11rtRN+TAWmZTzk2YGsyugFV8fqtax2Fgkg6wsw kOKCCg4mKNdC0gmZeD+igEMjcmEKJqt2eKn9OCxysFMOl5zZxTVoGp4r03/q/uImtGRO 2VxdFL2wnOwn66W3nOPx15Xb0q+GWFqXYg9X4= 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=HweywlkV3W7hX6j4jAziXnB8202QrrYYO0FfXOW5ydM=; b=h41OZY2fGnn0HKCRbaKB9gVAMR/sK10TOtpb64cJRbccwz04Uwnxtlspumfi5SN4ur 2XGqWP5BtbwypITenTkhnJ8rGMyV/Zbgk2DVWlpk4dziV9uc9n15ylXLk6pqVSg5vaN4 IV7+jmznowVIdem3KxR8k3Ib76sMi1b2Yhn+6EeLeh59125CeydQddZIrh2+XN5xilQW MEYmTQ6tZ3HmSCIFPUs5ZeS9HWM+u/z+iEl1ilWfesJZjeALa++8W5lHh9EQGJBy8uZx XuZx1RfUUDeUVLvBoBzez4VhLCv6mhpLZu0zGt54RImDmnRBswodUUY/xZV0BAd9zbx0 xFqA== X-Gm-Message-State: APt69E19OekY2XHCOQi3PiiZVBBfKWbo5miUYklYCzNOaDdZcrF6gKok jpzqWurTQO0pSY4BBFapiehTNw== X-Received: by 2002:a63:6d0:: with SMTP id 199-v6mr4348329pgg.338.1528445947598; Fri, 08 Jun 2018 01:19:07 -0700 (PDT) Received: from ubt.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id s4-v6sm72243947pgp.35.2018.06.08.01.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jun 2018 01:19:06 -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 2/6] mmc: sdhci: made changes for System Address register of SDMA Date: Fri, 8 Jun 2018 16:18:09 +0800 Message-Id: <1528445893-14530-3-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528445893-14530-1-git-send-email-zhang.chunyan@linaro.org> References: <1528445893-14530-1-git-send-email-zhang.chunyan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index cf5695f..f57201f 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -805,6 +805,7 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) { u8 ctrl; + u32 reg; struct mmc_data *data = cmd->data; if (sdhci_data_line_cmd(cmd)) @@ -894,8 +895,10 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) SDHCI_ADMA_ADDRESS_HI); } else { WARN_ON(sg_cnt != 1); + reg = host->v4_mode ? SDHCI_ADMA_ADDRESS : + SDHCI_DMA_ADDRESS; sdhci_writel(host, sdhci_sdma_address(host), - SDHCI_DMA_ADDRESS); + reg); } } @@ -2721,6 +2724,7 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) */ if (intmask & SDHCI_INT_DMA_END) { u32 dmastart, dmanow; + u32 reg; dmastart = sdhci_sdma_address(host); dmanow = dmastart + host->data->bytes_xfered; @@ -2733,7 +2737,9 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) 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); + reg = host->v4_mode ? SDHCI_ADMA_ADDRESS : + SDHCI_DMA_ADDRESS; + sdhci_writel(host, dmanow, reg); } if (intmask & SDHCI_INT_DATA_END) {