From patchwork Fri Aug 24 09:20:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Zhang X-Patchwork-Id: 144996 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1064945ljw; Fri, 24 Aug 2018 02:21:00 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZWG19/3cYzOEIRAbSoIZnK/czIs9aiB3sQHHUGcunCBYNfU7swF44ajM2ub7tWNVgUDVmI X-Received: by 2002:a17:902:4d45:: with SMTP id o5-v6mr902892plh.78.1535102460717; Fri, 24 Aug 2018 02:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535102460; cv=none; d=google.com; s=arc-20160816; b=zrnAMBoRmC+kK4q7g92IlffrqwXWMbNG2pRc6N0Ub0u3ly/EJDEvArz86BEKi5YXy1 qFQ3/3ofvJhCnwn2bmGd32JCtD9FbK65IDnnxMC4kW5Zbyzvz5QjQobXBBRQASgmNF9O 3sRDzMmLb6+6v4pDF5Vv+ypvAwdMDyWmqpcCXFbIn61DeFqRm+azxucslenE0gotLzCX 7a+untlwxa75c4F+JMVk+ybTY6Aj3sXmhSzNOxHFqVwyO1msdu9M8w0mKuWgXdLmmjvf PKHId5B91aXqgc8y9vXyGBaSSjlpx2JxW6JuAIicIbZQ77pSuAZMbB5g5qcCzTpf6V3X PsDQ== 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=vGFW0eksYTgAicHNEinOVTwkCq1QSfxHTkyhgrrD8X0=; b=Yi/dLLLJ/S2axrAmDSpVqxZAqfdh/jHJF6/ICkKRDZHxWsI+vvr1r2WVArGIGpaVAl Fb7m0RRnloZ+sY7JyRjf7680NKrQW67OsmZgusQDrXRoiAcIUyNv1lVIh27lke698wAf ctf1KJMg6Ceg7whkRADLH/9yJDTudyNHGnee4MPSN8RJFUqU9tWId5lAoDAYbHyn4Vmx YgQEUP1X7yu1v4R95hhK9919KgNPv75e3FInbsB4on8RfJgNPIZa18lGk0fGaiAw8kYs yTHFFKvUgLI98Jc7xhVRCGGwNt8UYnQLfByU1UiFKdWsT+sp3lxNEK28sZ5e/mi+YUMh qOoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cxqy8bF4; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-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 x7-v6si5669010pgi.465.2018.08.24.02.21.00; Fri, 24 Aug 2018 02:21:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-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=cxqy8bF4; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-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 S1727621AbeHXMyp (ORCPT + 5 others); Fri, 24 Aug 2018 08:54:45 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45866 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726776AbeHXMyp (ORCPT ); Fri, 24 Aug 2018 08:54:45 -0400 Received: by mail-pg1-f195.google.com with SMTP id m4-v6so3514691pgv.12 for ; Fri, 24 Aug 2018 02:20:59 -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=vGFW0eksYTgAicHNEinOVTwkCq1QSfxHTkyhgrrD8X0=; b=cxqy8bF4frF/YyPA7ZMy11XROdwuJUAytF1f546o4eP/E87a262731O8XyfvKfwWOU bV86wioiIhKP8hF1CTAfgDrUjHXdsFAUw5aeRCJBKJwjZPJn/zVBSAJxFsvbnzdtJIHq 5NgTJ77HP4yI5DukUy8XHZZeJoTP03agdCXnY= 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=vGFW0eksYTgAicHNEinOVTwkCq1QSfxHTkyhgrrD8X0=; b=o6SYiVduiGHs11G+oifP/4aNWx/PJM4tRBpbYXFwu1zD97Re4zt84LhXoXOJ9DQBEd MbTT9VbuvWPndhCx9lwSnc7imbFCFzEfafyipW0wosLUUlvJgG05pDobhnd8p0y5gs+M CCPWzO52NhKbcbQIs73GzN6JIRfHtXTsPo3m8qjVbvjYGt815h7jEui9gsIsRbKd2u0Z Fpi3LW/xLx8rygGNKkvvp/yK+5ea8PKyOzwYgg75TvayuM8l40NUBgp7Rpw4TPs/2Bmo rl+3WAQAAs5N2tKvmIOBYRwCkbHN6q4RZIfQj4K9k7t8gUbWmB/Eelr98VSq44Gex2/g /PNw== X-Gm-Message-State: APzg51CnRPxdfDwhYDV2zjJ/AjgccoIkfRFSJ0BL5xS9/kkC/B897fdg Zpqbqw2Mszc/DTbj4zQ+Sxx+gA== X-Received: by 2002:a63:d946:: with SMTP id e6-v6mr910039pgj.24.1535102458765; Fri, 24 Aug 2018 02:20:58 -0700 (PDT) Received: from ubt.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id g6-v6sm9520314pfb.11.2018.08.24.02.20.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Aug 2018 02:20:57 -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 , Chunyan Zhang Subject: [PATCH V6 2/9] mmc: sdhci: Add sd host v4 mode Date: Fri, 24 Aug 2018 17:20:21 +0800 Message-Id: <1535102428-20332-3-git-send-email-zhang.chunyan@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535102428-20332-1-git-send-email-zhang.chunyan@linaro.org> References: <1535102428-20332-1-git-send-email-zhang.chunyan@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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 introduced an interface to enable v4 mode. Signed-off-by: Chunyan Zhang --- drivers/mmc/host/sdhci.c | 29 +++++++++++++++++++++++++++++ drivers/mmc/host/sdhci.h | 3 +++ 2 files changed, 32 insertions(+) -- 2.7.4 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index f70135c..a50842c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -123,6 +123,29 @@ EXPORT_SYMBOL_GPL(sdhci_dumpregs); * * \*****************************************************************************/ +static void sdhci_do_enable_v4_mode(struct sdhci_host *host) +{ + u16 ctrl2; + + ctrl2 = sdhci_readb(host, SDHCI_HOST_CONTROL2); + if (ctrl2 & SDHCI_CTRL_V4_MODE) + return; + + ctrl2 |= SDHCI_CTRL_V4_MODE; + sdhci_writeb(host, ctrl2, SDHCI_HOST_CONTROL); +} + +/* + * This can be called before sdhci_add_host() by Vendor's host controller + * driver to enable v4 mode if supported. + */ +void sdhci_enable_v4_mode(struct sdhci_host *host) +{ + host->v4_mode = true; + sdhci_do_enable_v4_mode(host); +} +EXPORT_SYMBOL_GPL(sdhci_enable_v4_mode); + static inline bool sdhci_data_line_cmd(struct mmc_command *cmd) { return cmd->data || cmd->flags & MMC_RSP_BUSY; @@ -252,6 +275,9 @@ static void sdhci_init(struct sdhci_host *host, int soft) else sdhci_do_reset(host, SDHCI_RESET_ALL); + if (host->v4_mode) + sdhci_do_enable_v4_mode(host); + sdhci_set_default_irqs(host); host->cqe_on = false; @@ -3371,6 +3397,9 @@ void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps, u32 *caps1) sdhci_do_reset(host, SDHCI_RESET_ALL); + if (host->v4_mode) + sdhci_do_enable_v4_mode(host); + of_property_read_u64(mmc_dev(host->mmc)->of_node, "sdhci-caps-mask", &dt_caps_mask); of_property_read_u64(mmc_dev(host->mmc)->of_node, diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 7ae95f8..131d869 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 @@ -504,6 +505,7 @@ struct sdhci_host { bool preset_enabled; /* Preset is enabled */ bool pending_reset; /* Cmd/data reset is pending */ bool irq_wake_enabled; /* IRQ wakeup is enabled */ + bool v4_mode; /* Host Version 4 Enable */ struct mmc_request *mrqs_done[SDHCI_MAX_MRQS]; /* Requests done */ struct mmc_command *cmd; /* Current command */ @@ -751,5 +753,6 @@ bool sdhci_cqe_irq(struct sdhci_host *host, u32 intmask, int *cmd_error, int *data_error); void sdhci_dumpregs(struct sdhci_host *host); +void sdhci_enable_v4_mode(struct sdhci_host *host); #endif /* __SDHCI_HW_H */