From patchwork Fri Jun 8 08:18:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 137942 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp586423lji; Fri, 8 Jun 2018 01:26:46 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLpZ1pziZBKMfUIC1rpi7SIpLosxcnynSfBMmlz0AJ57WBgWxxeLAxo97tBz8uWEEN3IZ2G X-Received: by 2002:a17:902:aa98:: with SMTP id d24-v6mr5560182plr.185.1528446406432; Fri, 08 Jun 2018 01:26:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528446406; cv=none; d=google.com; s=arc-20160816; b=PVZN/gCU3wiqsAvztuxS8vZ6FSYF5bDs91jd6ygYH1bsKRxdIsXjSaH+da/FjGRjKj Icpz4ByNT9hVSVMFlxvgSbag1wAPTqVBzhNQzbF7QMUbk/Qvo9FTKfVfaiLDb72fc/TH VT66Km3SGguGAD+O78+3idEbgpX1hNYIct2A+rj6h41xNToF8ZT/+fgG9rZeGKdX1GiG djhhErX9VBXsQ97rugFVa+cQqUrsEgwWEL9uqdbNd0XxnYs94HdN60ceWACzXw+Ci6vS ihZok+LNRviEG2jWXNs1YW5T5n+IMwwCYhiVUJcs4b92/xPFXzx87h27+35JuJoB8QB5 hwjg== 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=3FkQjw0tnznQzkqhNl9915wjCXW19DdBddES+/u0pdI=; b=uwpJD6sVTO17AWN79B9Yxe59U/8JYi6uy5W0iBYmN0NzC+l9/BdE6ySZ+76Z+KFuAb JulD7iXVvQScjHfic1bQzLQh7G+PJxXCqvNASLl8NFDt09nTNfmQ9nGdiCc3+aej6vS8 wgGlJhkuEEGVaTuhIl7lhBuWsAr5HZJsKfS3+7ni/CJ7xT0ef5odubo5ikRkoQ4uKa4U AsuEqmIh+p3z4Bq11vohjr7wTUrXrxGF1qFOXqqYoKEWa6z59VkeTGAXFEK0NSzs+j9S JOR12NsfoS6u2I+iXRWPuPq2jnMoikJbRMCqQDFN6PkQV2fCU1mMJ81bOowoOx93+9lu GGlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D7A11XC9; 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 91-v6si37260210ple.308.2018.06.08.01.26.46; Fri, 08 Jun 2018 01:26:46 -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=D7A11XC9; 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 S1752950AbeFHI0n (ORCPT + 30 others); Fri, 8 Jun 2018 04:26:43 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:39593 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752804AbeFHITE (ORCPT ); Fri, 8 Jun 2018 04:19:04 -0400 Received: by mail-pl0-f65.google.com with SMTP id f1-v6so7865979plt.6 for ; Fri, 08 Jun 2018 01:19:04 -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=3FkQjw0tnznQzkqhNl9915wjCXW19DdBddES+/u0pdI=; b=D7A11XC9NRb0A18pNGJQ+MUULMWZ24DD87PMtK1ouKTtEaJlz5CzywJQni4Xxm2vIS uwCkhELfoXJm29QE7Z3ZpglaARof5Vj4hGciCM/MY1teWI+as2nPpms2bkyrOc2hAT1y njLfAxMsQ90LE+oE64Gghv8Nf1B47XSxJn7AM= 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=3FkQjw0tnznQzkqhNl9915wjCXW19DdBddES+/u0pdI=; b=NRbhH2zZ1KPCmzjusietB8Css/um8CRrxi3hYCkPI4/CcZnNuCprrIlJRTOokN+mIk ubKdkbjQPrs0c4Jo/ePxJHj/CdgRoTrLa1+4Ttre4Qj7KiyaF8qr4plbCbF6/BeD8Mk+ bnH7UW7nOZNOX4Wy0/4ZY4GzRs7QFQJJCc31osOpXBVzjIcZv7MsVOW0r8jMlaTpXGw0 hXp8Trqx1CPF0Wf54Y4U+Q+Jf8gA/y+itaqD8traywHVi4R01dObt4fQP5TnyqIkHOew kcimQdK9bsyN/KqSdmzFCfUJm4Th75XthN5uJC1MnlzDYUX7G3sITFMWytA0UGpjcrsQ euLg== X-Gm-Message-State: APt69E3WpnZXKbiy9KdSyQzrSOpuZuLmb+tq5sTCU5uqggE25lBEWls2 dnqjqQ+D53dyeV7ELj34D9wBvg== X-Received: by 2002:a17:902:6e4:: with SMTP id 91-v6mr5528041plh.63.1528445944162; Fri, 08 Jun 2018 01:19:04 -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.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jun 2018 01:19:03 -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 1/6] mmc: sdhci: add sd host v4 mode Date: Fri, 8 Jun 2018 16:18:08 +0800 Message-Id: <1528445893-14530-2-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 For SD host controller version 4.00 or later ones, there're two modes of implementation - Version 3.00 compatible mode or Version 4 mode. This patch introduces a flag to record this. Signed-off-by: Chunyan Zhang --- drivers/mmc/host/sdhci.c | 6 ++++++ drivers/mmc/host/sdhci.h | 6 ++++++ 2 files changed, 12 insertions(+) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 2ededa7f..cf5695f 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3302,6 +3302,12 @@ void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps, u32 *caps1) v = ver ? *ver : sdhci_readw(host, SDHCI_HOST_VERSION); host->version = (v & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; + if (host->version >= SDHCI_SPEC_400) { + if (sdhci_readw(host, SDHCI_HOST_CONTROL2) & + SDHCI_CTRL_V4_MODE) + host->v4_mode = true; + } + if (host->quirks & SDHCI_QUIRK_MISSING_CAPS) return; diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index c95b0a4..128b0ba 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -184,6 +184,7 @@ #define SDHCI_CTRL_DRV_TYPE_D 0x0030 #define SDHCI_CTRL_EXEC_TUNING 0x0040 #define SDHCI_CTRL_TUNED_CLK 0x0080 +#define SDHCI_CTRL_V4_MODE 0x1000 #define SDHCI_CTRL_PRESET_VAL_ENABLE 0x8000 #define SDHCI_CAPABILITIES 0x40 @@ -270,6 +271,8 @@ #define SDHCI_SPEC_100 0 #define SDHCI_SPEC_200 1 #define SDHCI_SPEC_300 2 +#define SDHCI_SPEC_400 3 +#define SDHCI_SPEC_410 4 /* * End of controller registers. @@ -551,6 +554,9 @@ struct sdhci_host { u32 sdma_boundary; unsigned long private[0] ____cacheline_aligned; + + /* Host Version 4 Enable */ + bool v4_mode; }; struct sdhci_ops {