Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d945faa6 authored by Baolin Wang's avatar Baolin Wang Committed by Todd Kjos
Browse files

UPSTREAM: mmc: host: sdhci-sprd: Add software queue support 



Add software queue support to improve the performance.

bug: 151514181
Signed-off-by: default avatarBaolin Wang <baolin.wang@linaro.org>
Signed-off-by: default avatarBaolin Wang <baolin.wang7@gmail.com>
Link: https://lore.kernel.org/r/f629b32943aae9e30ffa17acf4af06c270417001.1581478569.git.baolin.wang7@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit f4498549e1690af7cba1eff8570da9c134cb80b5)
Change-Id: Idbe8c95844196ff4791f9517d800f0b94117f48d
parent 52f44456

drivers/mmc/host/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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).

drivers/mmc/host/sdhci-sprd.c

+28 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/slab.h>



#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 struct sdhci_ops sdhci_sprd_ops = { 
	.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,18 @@ 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;



	host->always_defer_done = true;



	ret = __sdhci_add_host(host);

	if (ret)

		goto err_cleanup_host;
@@ -689,6 +714,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 +743,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: