From patchwork Fri Jun 8 08:18:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 137938 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp580276lji; Fri, 8 Jun 2018 01:19:24 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJfLJ5jI9zm9xzhsjgpXaLUnpHtcSSpboxky9nwoUNIvCBj6X4j7BaxdY6gPfK0h+hEdoD1 X-Received: by 2002:a17:902:224:: with SMTP id 33-v6mr5460001plc.309.1528445964395; Fri, 08 Jun 2018 01:19:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528445964; cv=none; d=google.com; s=arc-20160816; b=VCVjByqUQS1tXurwBEv0CCWaw0UsVe2qcOoZF4AWgYW3VkJGyWdAo0RBXt9C5bpmkP bey+ZVkuh9+FkhFcY71SvtHZgLTPl0ok82OjZCfYlT9DsA4Y0SFz8GOHukm2FJXZEkpW h5i7fZBxg7zCTcG3mXWi6ZelwLHCeWJUv3gIwipDDtR6LMySxSF5EzQlTX3SaZPFovxD E/p7bcHAIeapOHnyy3VSjTYo01wJHZNaw8aHIviLf2tFY8l6271COqjkPdA4cDYQ5iLx gdBgf0XUe5O4sO3nrqeYt7ZiFiw5VN2UHMpqMa24tklT0TgR4y0wb9ppcOzfQZNJSWdE nxcw== 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=2kKdK2qZqm7YxqxQreraVLLw0s8TN4UgsB3k/YpdPQI=; b=L/bB19S+NJPoe2PXxtNl4bRSR982ZcCvD8Re84xDIdZFuc0NhJOlwjdFqB4E/brmH8 5DjagFIqUiFpaMfDkILmpPUebQxnyIlfaFJfcCDZY0QkBGMAhd/7xcK1XK/NWOl4fWuG vJAzxuOd7gsO+UOktkwSOXf+axlnxFAq5p5eqRVWavXDOKQJ6Nn2t3n5r+/A463pJfK/ fd/dT1qotnHDCnOqx9ORIG4+PqCYCaABjvC1acZrzSY2bfzQgwQy1B3meIUTBbveCwkG aavwGi3GBgmoQ1LXwlOEaFCB8TskAYSByaGIQuAmQIIo9IcUhbQ1I/k/jX3+Sh1O6Zc1 8/UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eMu3uV+F; 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 r7-v6si56442506ple.585.2018.06.08.01.19.24; Fri, 08 Jun 2018 01:19:24 -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=eMu3uV+F; 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 S1752948AbeFHITV (ORCPT + 30 others); Fri, 8 Jun 2018 04:19:21 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:44239 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752897AbeFHITP (ORCPT ); Fri, 8 Jun 2018 04:19:15 -0400 Received: by mail-pl0-f67.google.com with SMTP id z9-v6so7854833plk.11 for ; Fri, 08 Jun 2018 01:19:15 -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=2kKdK2qZqm7YxqxQreraVLLw0s8TN4UgsB3k/YpdPQI=; b=eMu3uV+FIFUH5dBfHJQiTcF0H8MCPRxIB+C1Z8BezzykBY/c9VijVF7D+18wXIupGp 9aY28w3zMYMd9f4wZZWE//C9ccivy+hltm8SjDk5jBnJGI5a+lUBK1LuAlkY6UTSbi+2 lt+JsJqsQ9mWalp1GrUydWKAmewnFKaXj9XeM= 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=2kKdK2qZqm7YxqxQreraVLLw0s8TN4UgsB3k/YpdPQI=; b=c4zpc+GFUNIe6tBlQNg/q0Qku/FJe2oS73AVap+aWE53uKPq9Ug5Y51oUOsHh6SgAr 9bZLZOtkNKyCj4++w/VrURnXKb0oUz7U7jeRFFsDVVMATSMKTmNxWiSmEWzdVXp9ee5B 26tQdfQ7/thZ/9PbAKDvNPl/NlD4ZwTgWMMxO95zB3C/PPbn3DgYFictaxnNsN50Wt9i 9DTRQfiDrbn2TvQwb/rGni2vxG2wc1kzCmI+QDFTZwWlZnTabeU1tu2TivS3baENv7MN MAG8Qmk8f497A3wxuChK50Ebbz0Op9ba8GmtYUVP9mX7m+7ga72U+dBpMeRqVk6KvJ1z Lcrw== X-Gm-Message-State: APt69E3CBhpRDd2xaI7uV0Uwff7MP9Mqp12HhGgjBJLJuU5E/Yw7Ym9E RK2BjpAsqAxNIVeyQZn6W/JDwQ== X-Received: by 2002:a17:902:8f8b:: with SMTP id z11-v6mr5516405plo.203.1528445954765; Fri, 08 Jun 2018 01:19:14 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jun 2018 01:19:13 -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 4/6] mmc: sdhci: add 32-bit block count support for v4 mode Date: Fri, 8 Jun 2018 16:18:11 +0800 Message-Id: <1528445893-14530-5-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 When Host Version 4 is enabled, SDMA System Address register is re-defined as 32-bit Block Count, and SDMA uses ADMA System Address register (05Fh-058h) instead. Signed-off-by: Chunyan Zhang --- drivers/mmc/host/sdhci.c | 3 ++- drivers/mmc/host/sdhci.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 5d3b0d8..b8ee124 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -943,7 +943,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) /* Set the DMA boundary value and block size */ sdhci_writew(host, SDHCI_MAKE_BLKSZ(host->sdma_boundary, data->blksz), SDHCI_BLOCK_SIZE); - sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT); + reg = host->v4_mode ? SDHCI_32BIT_BLK_CNT : SDHCI_BLOCK_COUNT; + sdhci_writew(host, data->blocks, reg); } static inline bool sdhci_auto_cmd12(struct sdhci_host *host, diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 820a863..1e84539 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -28,6 +28,7 @@ #define SDHCI_DMA_ADDRESS 0x00 #define SDHCI_ARGUMENT2 SDHCI_DMA_ADDRESS +#define SDHCI_32BIT_BLK_CNT SDHCI_DMA_ADDRESS #define SDHCI_BLOCK_SIZE 0x04 #define SDHCI_MAKE_BLKSZ(dma, blksz) (((dma & 0x7) << 12) | (blksz & 0xFFF))