From: Baolin Wang <baolin.wang@linaro.org>
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 v6 2/4] mmc: host: sdhci: Add request_done ops for struct sdhci_ops
Date: Mon, 11 Nov 2019 15:33:58 +0800 [thread overview]
Message-ID: <94603120e6431f0ce35af78935bfe7dddda4850b.1573456284.git.baolin.wang@linaro.org> (raw)
In-Reply-To: <cover.1573456283.git.baolin.wang@linaro.org>
In-Reply-To: <cover.1573456283.git.baolin.wang@linaro.org>
Add request_done ops for struct sdhci_ops as a preparation in case some
host controllers have different method to complete one request, such as
supporting request completion of MMC software queue.
Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
---
drivers/mmc/host/sdhci.c | 12 ++++++++++--
drivers/mmc/host/sdhci.h | 2 ++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b056400..850241f 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2729,7 +2729,10 @@ static bool sdhci_request_done(struct sdhci_host *host)
spin_unlock_irqrestore(&host->lock, flags);
- mmc_request_done(host->mmc, mrq);
+ if (host->ops->request_done)
+ host->ops->request_done(host, mrq);
+ else
+ mmc_request_done(host->mmc, mrq);
return false;
}
@@ -3157,7 +3160,12 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
/* Process mrqs ready for immediate completion */
for (i = 0; i < SDHCI_MAX_MRQS; i++) {
- if (mrqs_done[i])
+ if (!mrqs_done[i])
+ continue;
+
+ if (host->ops->request_done)
+ host->ops->request_done(host, mrqs_done[i]);
+ else
mmc_request_done(host->mmc, mrqs_done[i]);
}
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 0ed3e0e..d89cdb9 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -644,6 +644,8 @@ struct sdhci_ops {
void (*voltage_switch)(struct sdhci_host *host);
void (*adma_write_desc)(struct sdhci_host *host, void **desc,
dma_addr_t addr, int len, unsigned int cmd);
+ void (*request_done)(struct sdhci_host *host,
+ struct mmc_request *mrq);
};
#ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS
--
1.7.9.5
next prev parent reply other threads:[~2019-11-11 7:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 7:33 [PATCH v6 0/4] Add MMC software queue support Baolin Wang
2019-11-11 7:33 ` [PATCH v6 1/4] mmc: Add MMC host " Baolin Wang
2019-11-11 7:33 ` Baolin Wang [this message]
2019-11-11 7:33 ` [PATCH v6 3/4] mmc: host: sdhci-sprd: Add " Baolin Wang
2019-11-11 7:34 ` [PATCH v6 4/4] mmc: host: sdhci: Add a variable to defer to complete requests if needed Baolin Wang
2019-11-11 7:44 ` Adrian Hunter
2019-11-11 7:57 ` Baolin Wang
2019-11-11 9:28 ` [PATCH v6 0/4] Add MMC software queue support Arnd Bergmann
2019-11-11 12:58 ` Baolin Wang
2019-11-11 16:59 ` Arnd Bergmann
2019-11-12 8:48 ` Baolin Wang
2019-11-18 10:04 ` (Exiting) Baolin Wang
2019-11-22 9:50 ` Arnd Bergmann
2019-11-22 13:19 ` Linus Walleij
2019-11-22 13:49 ` Arnd Bergmann
2019-11-26 7:40 ` Paolo Valente
2019-11-26 9:54 ` Arnd Bergmann
2019-11-26 11:17 ` Hannes Reinecke
2019-11-27 7:49 ` Baolin Wang
2019-11-27 9:00 ` Christoph Hellwig
2019-11-27 12:01 ` Arnd Bergmann
2019-12-10 15:17 ` Ulf Hansson
2019-11-28 12:15 ` Martin K. Petersen
2019-11-28 15:54 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=94603120e6431f0ce35af78935bfe7dddda4850b.1573456284.git.baolin.wang@linaro.org \
--to=baolin.wang@linaro.org \
--cc=adrian.hunter@intel.com \
--cc=arnd@arndb.de \
--cc=asutoshd@codeaurora.org \
--cc=baolin.wang7@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=orsonzhai@gmail.com \
--cc=ulf.hansson@linaro.org \
--cc=vincent.guittot@linaro.org \
--cc=zhang.lyra@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).