From patchwork Fri Jun 15 02:04: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: 138642 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp249073lji; Thu, 14 Jun 2018 19:04:52 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLOVWOsrmncLaLLZe/CPuaRUJveU3d0Hq19a/3HWZ4ZtUyZ/1qMsUPgw8Y0G8uVfU05PbEB X-Received: by 2002:a17:902:4545:: with SMTP id m63-v6mr5790505pld.268.1529028292301; Thu, 14 Jun 2018 19:04:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529028292; cv=none; d=google.com; s=arc-20160816; b=hO5b51fDf1oUum5KDQzQKbhnRHNfDzeFznDTztZUXcozuT3oRpuGevnbyTjGJ3ruDY /BNoBgL20hH6PKzE45yyZ2AFrwCuvr1Lr5UxS0DFoDEb+it7FuAl+422b478XQ1f3b0K aMF0JSo7UqG2yDKbMvakywqMaP09gUYJc1k/PrbUH4R1YltAX3YE0tYSPWDMvAhLbWN7 trNjuuiuSVbw28wWRrLNd09VJjhMCCPjc6mjus2HSQtzoe58HvgFm/wTfeyL/Tt3sx63 jpdRoXPmbdIkTKK8TlFjpAc/OwPjtCGG0nAUa8fQ74Pyt+PNIK6bX3xJclbnR+WPFKU0 dtVw== 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=JQ/+qHm5SoQuAjGmqHFzX5yBCep3v78pTmbpRniKgK8DlFQhR927o5vp/LfVz7mYFX nLAJ9M9IpuYzQSEAIKIGucUtYqfVY73diAnQ4q6x9FOvBUHPP1zTr1T1qBkcaUyqUYUN aTgQVsK6kKIU3uVUor1Kg43t6XzR7qUc9Z4nmBNh1+gVT7dPhDJObA1gBCn1daMYqusY rlzXcY1Q1E4xOPHdOkLtZ8qmlkRKsMo14J6RNNa8gT8ozzjEZBijVpCL0vz1+BJVW7Iv XvbXIYFGMpXfW18lDnK8fQ222zI47gsdQi12qSFb2ztCjpSH2TDM8eMXlTVJ7z0BUFUE OsyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HW9zZO7h; 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 g17-v6si6578040plo.355.2018.06.14.19.04.52; Thu, 14 Jun 2018 19:04:52 -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=HW9zZO7h; 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 S965418AbeFOCEt (ORCPT + 30 others); Thu, 14 Jun 2018 22:04:49 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:44124 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965317AbeFOCEq (ORCPT ); Thu, 14 Jun 2018 22:04:46 -0400 Received: by mail-pl0-f68.google.com with SMTP id z9-v6so4524435plk.11 for ; Thu, 14 Jun 2018 19:04:46 -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=HW9zZO7hejz4TlVe51+27U2fh7I5Dalfh8DeArj+79MNzXuIuQKK5UVBqsy5zGzGnN +ld7wC66ouHlRr0BQqIyEeThpwkxG+A0PMhLIkQ9ZXo6AkdXw8xJRi3X0bpZy0oR2Fyn Cm0gerReU3XWKqHLfnkAux0dDXy8USsYuZwl4= 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=LS1mUEJr5VhYYXIMhdv4dO7EPWSZwdtj+JHlc3ydHogicAsrD0N9o6W+pp3eNKnMgc kbM5e6D7ld1fTn0iqnWgNMRhp6K4E9Huras5AHVw/rJRJ/quzfW/77uBU1F8TKJVy5yQ 5bZ3ituKLvOUdOtdkH84RySlKsw/Sghg8aGDNBRXDXOUlJFx1ObwZBlK5NQbOo+M7WFw 1lj6BawLcf5FdEv8h/9aJCgVyDYH4lJbQCQv/qhnSx3pxfoLdPJGD28MtZ84GQHOLDC5 I03uJ52Ln+yeL7X5gg4YIQ18cMYfoENkx/vO3fJjNXiXUrZVDZypy0lPrrQ8LXe0cDPB e3KA== X-Gm-Message-State: APt69E00HM/JJZNxj2jeVhoEWOXpkB9tqpiAYRHU4aG5SVXMoGFVp//N MFCvPWJGgYk00EL0FYMJvs2OFA== X-Received: by 2002:a17:902:4203:: with SMTP id g3-v6mr5588112pld.315.1529028286198; Thu, 14 Jun 2018 19:04:46 -0700 (PDT) Received: from ubt.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id k69-v6sm9504953pgc.39.2018.06.14.19.04.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 14 Jun 2018 19:04:45 -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 V2 1/7] mmc: sdhci: add sd host v4 mode Date: Fri, 15 Jun 2018 10:04:09 +0800 Message-Id: <1529028255-6022-2-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529028255-6022-1-git-send-email-zhang.chunyan@linaro.org> References: <1529028255-6022-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 {