From patchwork Tue Oct 22 05:58:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 177145 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4388282ill; Mon, 21 Oct 2019 22:59:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDfVo5Ikyv36lDIf8yZhN+hRPLVpjMbyDlu6II0f7eMcGjYYMntTW3PH/+o+4djsjULX+i X-Received: by 2002:a17:906:1f8b:: with SMTP id t11mr960746ejr.191.1571723991264; Mon, 21 Oct 2019 22:59:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571723991; cv=none; d=google.com; s=arc-20160816; b=D+xrSKbBxXQmBcSKiiQK0tVImRGkt33kz4lQB019jyqrItpOnBbzO0etITtClbM2+C jqA0s7KA1NJBElEO5pDmeJtR7i80QL0LV8eOcBHfsxbJpqiChyPj/I9iZPUSrwuWwXWu XHLaiqczRYzMDJq1rhkzzi3zklzxr9F1EqoRiRqPSWYm9kM1NsEOrbilLJHPvao9u1Gq E8ER0DrdOWQqMYxy7bCmYtA+tl4YcZFsVDtlGWrWNC0AqWcO+LUACGuI2WbUTvZH7BbK 3m48OXDkcFDlMjOaC74CvqHtlu9YCOmjSmtSuMlY95sMTqxnvqJNeGALi+zzleW2Vs/o DW5Q== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=shSJXxHkqiOnwVznDt/3eHxUBXqubG/+hrNMGFN/+WI=; b=IFnE4QA1rM9cRhnFK1CW9RW1JkVMjOGqD/mG/G+WAriHAlBQLDUhyHNNaima8eqB9V oS3DUhTI1b6mkVqCLYgrGg3pBkcaXZ5t6UDISuwgOc/UQ+im7jRYn0V41xxNfADWCPsb Am/fM60SNJJj1e7Rax4hIMWOZqzr0D0AFBngu1hs53l0O9K6DACrWm76ZOOLbygScAPt op0veX/qZjJMqrRmZ7CzOUCvEDjIXrqyDocDl4IXEiz9VX6eH608FzKfHePBX1h7lS+S t6hJCRb/jbx64LPhAL733IdKYsruoa7EqPFSG/O/ubitIzLwupEgCDoKKJP/s0eYEsy8 6GXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gAXkknV0; 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 f6si4283591edb.431.2019.10.21.22.59.51; Mon, 21 Oct 2019 22:59:51 -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=gAXkknV0; 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 S1731100AbfJVF7u (ORCPT + 5 others); Tue, 22 Oct 2019 01:59:50 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:38718 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731096AbfJVF7u (ORCPT ); Tue, 22 Oct 2019 01:59:50 -0400 Received: by mail-pf1-f195.google.com with SMTP id h195so9935345pfe.5 for ; Mon, 21 Oct 2019 22:59: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 :in-reply-to:references; bh=shSJXxHkqiOnwVznDt/3eHxUBXqubG/+hrNMGFN/+WI=; b=gAXkknV0IucthKymxPq6B+aWK9aCNWfbX4eYnr4pyGjA0hMdT1OztIzNZPrdJn7u8K Z1ykMhxLWpFO52vL4nSGDmaXBg+yCIt3WUr5hC4LqFjJCh/9miVn2JYz6FDwSHJ5rFXq uKshCmFJeG51cvhsB/FCvyJMaMOR6jdMl+vwmRu0R2fPAZ9dL3hob3qfBhmq39zsre3T aFf99CL7FKDHbIfcWo4UYJrbL26o6TJ2rPcyXlShN2rhCvyM3ZMkNy/3y+oCYI7zs6aX kuLEneqiXs1VLpG6Z9mZMCaID7JPILuVPGFcZMBgpkq+mEdPedz0vjEeUA5z3X2fiZrJ L0mQ== 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:in-reply-to:references; bh=shSJXxHkqiOnwVznDt/3eHxUBXqubG/+hrNMGFN/+WI=; b=otloVFjlJshTxJqDc8bYuvkvC9n0h/WphmdrLfBTirT9M3Te2EXOr10q2MITGrAPJm BkVEy3tBxYasMoNqr/LkFbA1mFiN89+CTYM9MxUSUSktRqbRQztnirrn76zaRcwEdRz1 +4lgyYgwQT48WsCsw8+YK/Eymsog6GnDX6wi6lIXykY5QzTmejmh87UEH3S+JnSrDJtr HOZCtEyoUvz5O1HoPdX9cQpveC+fYon84iWg6Z4sYiItx9f5YMYvpu4drukiusv9lzyq BkXmOs2t7mMJ4rQEgHuTIMn3vhn3ntRmsfguQcyRTH4BVu6mvm/O4V5B87nJ/hQ1BS0g KlUg== X-Gm-Message-State: APjAAAUksoBf9s7sZ4gfTVPZci/WtwigAKOTy73K0w+Nf2nLXPhhFLtD YFKVKm0LN1xkjOAywnkOvhongg== X-Received: by 2002:a63:1d60:: with SMTP id d32mr1932366pgm.37.1571723989575; Mon, 21 Oct 2019 22:59:49 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id g35sm16568061pgg.42.2019.10.21.22.59.45 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Oct 2019 22:59:48 -0700 (PDT) From: Baolin Wang To: adrian.hunter@intel.com, ulf.hansson@linaro.org, asutoshd@codeaurora.org Cc: orsonzhai@gmail.com, zhang.lyra@gmail.com, arnd@arndb.de, linus.walleij@linaro.org, vincent.guittot@linaro.org, baolin.wang@linaro.org, baolin.wang7@gmail.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] mmc: host: sdhci-sprd: Add software queue support Date: Tue, 22 Oct 2019 13:58:57 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Add software queue support to improve the performance. Signed-off-by: Baolin Wang --- drivers/mmc/host/Kconfig | 1 + drivers/mmc/host/sdhci-sprd.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) -- 1.7.9.5 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index efa4019..54b86f6 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -632,6 +632,7 @@ config MMC_SDHCI_SPRD depends on ARCH_SPRD depends on MMC_SDHCI_PLTFM select MMC_SDHCI_IO_ACCESSORS + select MMC_HSQ help This selects the SDIO Host Controller in Spreadtrum SoCs, this driver supports R11(IP version: R11P0). diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c index d07b979..3cc1277 100644 --- a/drivers/mmc/host/sdhci-sprd.c +++ b/drivers/mmc/host/sdhci-sprd.c @@ -19,6 +19,7 @@ #include #include "sdhci-pltfm.h" +#include "mmc_hsq.h" /* SDHCI_ARGUMENT2 register high 16bit */ #define SDHCI_SPRD_ARG2_STUFF GENMASK(31, 16) @@ -379,6 +380,16 @@ static unsigned int sdhci_sprd_get_ro(struct sdhci_host *host) return 0; } +static void sdhci_sprd_request_done(struct sdhci_host *host, + struct mmc_request *mrq) +{ + /* Validate if the request was from software queue firstly. */ + if (mmc_hsq_finalize_request(host->mmc, mrq)) + return; + + mmc_request_done(host->mmc, mrq); +} + static struct sdhci_ops sdhci_sprd_ops = { .read_l = sdhci_sprd_readl, .write_l = sdhci_sprd_writel, @@ -392,6 +403,7 @@ static unsigned int sdhci_sprd_get_ro(struct sdhci_host *host) .hw_reset = sdhci_sprd_hw_reset, .get_max_timeout_count = sdhci_sprd_get_max_timeout_count, .get_ro = sdhci_sprd_get_ro, + .request_done = sdhci_sprd_request_done, }; static void sdhci_sprd_request(struct mmc_host *mmc, struct mmc_request *mrq) @@ -521,6 +533,7 @@ static int sdhci_sprd_probe(struct platform_device *pdev) { struct sdhci_host *host; struct sdhci_sprd_host *sprd_host; + struct mmc_hsq *hsq; struct clk *clk; int ret = 0; @@ -631,6 +644,16 @@ static int sdhci_sprd_probe(struct platform_device *pdev) sprd_host->flags = host->flags; + hsq = devm_kzalloc(&pdev->dev, sizeof(*hsq), GFP_KERNEL); + if (!hsq) { + ret = -ENOMEM; + goto err_cleanup_host; + } + + ret = mmc_hsq_init(hsq, host->mmc); + if (ret) + goto err_cleanup_host; + ret = __sdhci_add_host(host); if (ret) goto err_cleanup_host; @@ -689,6 +712,7 @@ static int sdhci_sprd_runtime_suspend(struct device *dev) struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_sprd_host *sprd_host = TO_SPRD_HOST(host); + mmc_hsq_suspend(host->mmc); sdhci_runtime_suspend_host(host); clk_disable_unprepare(sprd_host->clk_sdio); @@ -717,6 +741,8 @@ static int sdhci_sprd_runtime_resume(struct device *dev) goto clk_disable; sdhci_runtime_resume_host(host, 1); + mmc_hsq_resume(host->mmc); + return 0; clk_disable: