From patchwork Mon Jul 9 03:19:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 141362 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2167060ljj; Sun, 8 Jul 2018 20:21:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfNJv8YudlAUaI4jvGjJenWI25D2zGazFny2OEGODrQpoxAMPJKkZdiPKy9OhWBOXvKn7n4 X-Received: by 2002:a17:902:184:: with SMTP id b4-v6mr4600003plb.340.1531106514182; Sun, 08 Jul 2018 20:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531106514; cv=none; d=google.com; s=arc-20160816; b=KATsPnbeP6hDNQmiZ2vtItj+ZEdD903GlgDO1F7sKHbqEIqUryQi3WoMBi1O4uuoPV jjko2EvlVVa+R1SYU62EWTxDXgzLiTP+6bnGy9F0ODLtoPBw5a4y3tdGpNkos8V6Q0ay aMdj3tpJ2AdZyezAq07NTXdRf/+RNrFmHsXOEcMK44MyDVX+xwAM+iZSoZOH9rtZN6eQ S8t1WzRI4xmNuI6/hiRITeNdd2zIWa3lwQs/8XfIwyJMf/0c6pTpYHb/allh3g98TV+0 drC+s3adisTfvT6ckBEBb8hSEMTPvbJdGTT9pduwT93QMKpOXBbKHUg/v2kCffXBdpR7 cfOg== 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=phQAPKjHuXaJ49E6Z2SoJBvzQ21pOgO1IGo0W1Ifx3w=; b=oqaFcuNUnDKfj7UVaFFim5/uzWipGIyd0KXkinX4eO5XBEY108abPGauM779FALxwQ zpNrr1dstMB4jberZWFqAMoWUDC+q3TZzDSLoEAFfZTSS+jn4x3hROwVU0T+1cF5M6/R e9T2LLZlQkvzCYCU9AYlXKgW1o7Sv544OOVNUVvXPYq04WWOwA55x4rND1KRxcD6yp5Q RU4osW/rnk8WuxoS+bSodnaAtenjBsVgV3VoR6bEdCrenhfDXN3gvsVfvL3C4EwyQHds /LdkCzWUMoJC8tOWMNFqPHyvFvpDPGlWDjPsOeD2Kg+//gl3LvRPZ3SQTAVWllNsC1pH boGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=T3hsvKmA; 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 b23-v6si13219207pls.341.2018.07.08.20.21.53; Sun, 08 Jul 2018 20:21:54 -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=T3hsvKmA; 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 S933476AbeGIDVx (ORCPT + 28 others); Sun, 8 Jul 2018 23:21:53 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35852 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933053AbeGIDVu (ORCPT ); Sun, 8 Jul 2018 23:21:50 -0400 Received: by mail-pf0-f193.google.com with SMTP id u16-v6so12590139pfh.3 for ; Sun, 08 Jul 2018 20:21:50 -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=phQAPKjHuXaJ49E6Z2SoJBvzQ21pOgO1IGo0W1Ifx3w=; b=T3hsvKmA5wT9bOLw8EqwK6etiLU05GuEo3vZ+YpAYSKfjW3csF+1Q7pdLYJ6/v4ED8 l8RXa8EkfE9ekym5jHnM529DFGgmIEMxk+NDm+nwli0yrfKXZsK55gdGbig7U1pVB3bu MhtgToBx7tvnqDlbu7IYsjqm+HoU079p3BgdU= 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=phQAPKjHuXaJ49E6Z2SoJBvzQ21pOgO1IGo0W1Ifx3w=; b=D41Vsgo7/t3qh8sZweckgDdSGZeeaNXb/lWWgZZiJPVOAeSjL335vJixUuEBUabJtE kzif6q6/U3+Dmto1/NyT9gb6Rdc65S8Ax44oMU2SyFYJt2zqX7N0F8ISlBz0MxOW4DB7 ZrFWh7jq11Os+fvTdnqMD4oS3v3jxCmamc9OmiT2cQJHqZltu3lPUCgw6UiLwVSKucv7 3F19ZB6Jkjsl38DP68VWgUMSO6aWPVZbUIlibmByXmh1ZZ+TrM45L1tmAKtPeyOVAHXk A5KeSdJxNVQw0p25lfy7/Gh3pZLomVVa/YSP+Ujebo2+ob/lwVqYVlBpwx07cHcifo1I Zwug== X-Gm-Message-State: APt69E04of/yOAANv1MBk2xZb8+8DmGZb1cRZwRoNtuVt+Fzuoj9frM6 xruufTWFIEqPTXO+mw+Ujptrew== X-Received: by 2002:a63:d518:: with SMTP id c24-v6mr11351335pgg.357.1531106510392; Sun, 08 Jul 2018 20:21:50 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Jul 2018 20:21:49 -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 4/7] mmc: sdhci: add 32-bit block count support for v4 mode Date: Mon, 9 Jul 2018 11:19:55 +0800 Message-Id: <1531106398-14062-5-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-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 | 4 +++- drivers/mmc/host/sdhci.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 7871ae2..f64e766 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -889,6 +889,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; host->data_timeout = 0; @@ -1021,7 +1022,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 24fa58a..889e48b 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))