From patchwork Thu Aug 16 07:54:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 144330 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1760517ljj; Thu, 16 Aug 2018 00:55:42 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyjb3iCGTWio2oTJloQ9TdoBzL44jNCpzPub8Yo1i1f34X4rvH9LXXksqfc4ZMBTR0Vh13U X-Received: by 2002:a62:9f85:: with SMTP id v5-v6mr31105276pfk.27.1534406142233; Thu, 16 Aug 2018 00:55:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534406142; cv=none; d=google.com; s=arc-20160816; b=rjeXNYzKJNYOHt1KSRVtWbKyJ+VqQWg5TpXMyoBzQIFqiiQ+M7gRZ+k6sUP8piCo3W WpJbHitY9Q7Po2UkvGHGe5Y0QvQXMozdIon67Lgdwl04XRgAp4tzCQt3iVa7L91k2B2u ajmzdQUKE0ntoVOE8CElDbALcXDhUp+5SUUxlqQnPJeuSg967B87uzJfeLJNIg2mz0hW YdWMCsq6bEK+8ik+7wXY5jrxVEEvV9xxMPeUDroWypYLXtCoO6GN4eal/uOZ7K225kWZ 7gB2rHZRCaVYvn7OZ1crxudjpUn9GJWg237o9L6aGjjbmMV/8JxJt2BrtVtdSMn22Xkw fZDQ== 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=tfDeQ46/C06dDmQGL2FRTZ/CLblF/VG3NSDxyH8wH4w=; b=hel0XuxiJ4yeZA6JH5q9oFz3TmehA1X01PVfapchbGz95BziyTe+0wA+nTDeP5q+B1 fI99ywIolE2IK+05xMEdbKxJcIA6Bf4ORjM2wfcESGVcil7VyaVZjvjA3/rIShEHs4cF t7GFZTmOJ8tEz7PyArzMH0NXbNE1wYs+IWPqniih6Zh1kJYHSsiduf6U22tC5z4Q0xRA Y1EKqJR/xJpv2OButzsf9RXKdhz5Mr9hsqUSi+Hd81je5eZS125t4DVEZGYk3RmArC1A COPdCRW5vfukq022vAxf9AtM4ndyDA6YfIWp8As5ah9rC1h630B1z/9s6VWAzifdw28V gwZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kBJ4VkwC; 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 r29-v6si24354997pff.24.2018.08.16.00.55.41; Thu, 16 Aug 2018 00:55:42 -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=kBJ4VkwC; 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 S2389636AbeHPKwV (ORCPT + 32 others); Thu, 16 Aug 2018 06:52:21 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:36315 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389621AbeHPKwU (ORCPT ); Thu, 16 Aug 2018 06:52:20 -0400 Received: by mail-pg1-f194.google.com with SMTP id h12-v6so1693612pgs.3 for ; Thu, 16 Aug 2018 00:55:39 -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=tfDeQ46/C06dDmQGL2FRTZ/CLblF/VG3NSDxyH8wH4w=; b=kBJ4VkwC9a9Fbirw66Hnp5sdsmCCI8q0uYUhXaBz6N7sE/jng7Q+QbtCGZzCCHbqR6 yCdkD7I0t2B3TkhuYvCfqu0Vz+RZKwo8GIxZk7IIRzt1xu3nY95aYKrQk9ZoeAjsKJdG gGILVBBogtccB3JDBgR6S1crxtgk79kenIIHc= 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=tfDeQ46/C06dDmQGL2FRTZ/CLblF/VG3NSDxyH8wH4w=; b=oPu/jxs9ZfOXlYHtx41DqcfbZwstfc5QLousjZ1F+72IYRmTWZ5ncp2jjaG9Q+3i7i +P9ed7YCKLYZ3WtXLtGhUyRlMjMpqYP5DTlxBwtwjPHmMVcZ7Knoysb3QvFq6EzSgcWy giPnQ/ofk0A1HyJailODDlNddOntIcAZzOzv+nxQawaDRVmHv/jVloTOYBOz/dG+Cs+H Q9Aplnhq2xkvlNPuT0vnHetylsO42kzLEJhGdzxtmXF5doP5Fbu0mF3fUa7adVZJt5qb OGjXJ0oQiIxB+iq6dGBUN9Ic9ulszJ/vyWQnTgGDMFR/3G1W0tb88vW08F2LKzmAk41k l7cA== X-Gm-Message-State: AOUpUlFAsgXKlnq5ibsNkWQEHK8gpQD2yAM+UCFRsn/yLQbQRFV+ZDky Ket5DQHkxcRpBLb4WRCnzuJabA== X-Received: by 2002:a63:5a5e:: with SMTP id k30-v6mr28479313pgm.123.1534406138967; Thu, 16 Aug 2018 00:55:38 -0700 (PDT) Received: from ubt.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id i25-v6sm50838137pfi.150.2018.08.16.00.55.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Aug 2018 00:55:38 -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 , Chunyan Zhang Subject: [PATCH V5 05/10] mmc: sdhci: Add 32-bit block count support for v4 mode Date: Thu, 16 Aug 2018 15:54:19 +0800 Message-Id: <1534406064-10065-6-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1534406064-10065-1-git-send-email-zhang.chunyan@linaro.org> References: <1534406064-10065-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 Host Controller Version 4.10 re-defines SDMA System Address register as 32-bit Block Count for v4 mode, and SDMA uses ADMA System Address register (05Fh-058h) instead if v4 mode is enabled. Also when using 32-bit block count, 16-bit block count register need to be set to zero. Signed-off-by: Chunyan Zhang --- drivers/mmc/host/sdhci.c | 14 +++++++++++++- drivers/mmc/host/sdhci.h | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 1dea1c4..b3328ee 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1073,7 +1073,19 @@ 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); + + /* + * For Version 4.10 onwards, if v4 mode is enabled, 16-bit Block Count + * register need to be set to zero, 32-bit Block Count register would + * be selected. + */ + if (host->version >= SDHCI_SPEC_410 && host->v4_mode) { + if (sdhci_readw(host, SDHCI_BLOCK_COUNT)) + sdhci_writew(host, 0, SDHCI_BLOCK_COUNT); + sdhci_writew(host, data->blocks, SDHCI_32BIT_BLK_CNT); + } else { + sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT); + } } 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 f95eda2..d34971ac 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))