From: "ernest.zhang" <ernest.zhang@bayhubtech.com>
To: Adrian Hunter <adrian.hunter@intel.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: ernest.zhang@bayhubtech.com, chuanjin.pang@bayhubtech.com,
mike.li@bayhubtech.com, chevron.li@bayhubtech.com,
shirley.her@bayhubtech.com, xiaoguang.yu@bayhubtech.com,
bobby.wu@bayhubtech.com
Subject: [PATCH V7 5/5] mmc: sdhci: Add MSI interrupt support for O2 SD host
Date: Mon, 16 Jul 2018 14:26:55 +0800 [thread overview]
Message-ID: <20180716062655.24703-5-ernest.zhang@bayhubtech.com> (raw)
In-Reply-To: <20180716062655.24703-1-ernest.zhang@bayhubtech.com>
Add MSI interrupt support if the SD host device can support MSI interrupt.
Signed-off-by: ernest.zhang <ernest.zhang@bayhubtech.com>
---
Changes in V7:
N/A
Changes in V6:
1. Move change log to correct place.
2. Reduce unneeded pr_info prints.
3. In function sdhci_pci_o2_probe_slot, remove using local
variable 'mmc' instead of using 'host->mmc'.
4. Make the msi enable code a sperate function.
Changes in V5:
1. Because pci_enable_msi is marked as deprecated and should not be
used in new code, use pci_alloc_irq_vectors instead.
2. Remove unneeded CONFIG_PCI_MSI macro check.
Changes in V4:
Enable MSI interrupt if the MSI capability bit is set in
capability register.
Changes in V1~V3:
N/A
---
drivers/mmc/host/sdhci-pci-o2micro.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c
index 7747e8ba2e3d..56bc71763956 100644
--- a/drivers/mmc/host/sdhci-pci-o2micro.c
+++ b/drivers/mmc/host/sdhci-pci-o2micro.c
@@ -260,6 +260,29 @@ static void sdhci_pci_o2_fujin2_pci_init(struct sdhci_pci_chip *chip)
pci_write_config_dword(chip->pdev, O2_SD_MISC_CTRL4, scratch_32);
}
+static void sdhci_pci_o2_enable_msi(struct sdhci_pci_chip *chip,
+ struct sdhci_host *host)
+{
+ int ret;
+
+ ret = pci_find_capability(chip->pdev, PCI_CAP_ID_MSI);
+ if (!ret) {
+ pr_info("%s: unsupport msi, use INTx irq\n",
+ mmc_hostname(host->mmc));
+ return;
+ }
+
+ ret = pci_alloc_irq_vectors(chip->pdev, 1, 1,
+ PCI_IRQ_MSI | PCI_IRQ_MSIX);
+ if (ret < 0) {
+ pr_err("%s: enable PCI MSI failed, err=%d\n",
+ mmc_hostname(host->mmc), ret);
+ return;
+ }
+
+ host->irq = pci_irq_vector(chip->pdev, 0);
+}
+
int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
{
struct sdhci_pci_chip *chip;
@@ -279,6 +302,8 @@ int sdhci_pci_o2_probe_slot(struct sdhci_pci_slot *slot)
if (reg & 0x1)
host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
+ sdhci_pci_o2_enable_msi(chip, host);
+
if (chip->pdev->device == PCI_DEVICE_ID_O2_SEABIRD0) {
ret = pci_read_config_dword(chip->pdev,
O2_SD_MISC_SETTING, ®);
--
2.17.1
next prev parent reply other threads:[~2018-07-16 6:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-16 6:26 [PATCH V7 1/5] mmc: sdhci: Add support for O2 eMMC HS200 mode ernest.zhang
2018-07-16 6:26 ` [PATCH V7 2/5] mmc: sdhci: Change O2 Host HS200 mode clock frequency to 200MHz ernest.zhang
2018-07-25 7:45 ` Adrian Hunter
2018-07-27 6:49 ` Ernest Zhang(WH)
2018-07-27 6:58 ` Adrian Hunter
2018-07-16 6:26 ` [PATCH V7 3/5] mmc: sdhci: Export sdhci tuning function symbol ernest.zhang
2018-07-25 7:46 ` Adrian Hunter
2018-07-16 6:26 ` [PATCH V7 4/5] mmc: sdhci: Add support for O2 hardware tuning ernest.zhang
2018-07-25 7:48 ` Adrian Hunter
2018-07-16 6:26 ` ernest.zhang [this message]
2018-07-25 7:48 ` [PATCH V7 5/5] mmc: sdhci: Add MSI interrupt support for O2 SD host Adrian Hunter
2018-07-25 7:44 ` [PATCH V7 1/5] mmc: sdhci: Add support for O2 eMMC HS200 mode Adrian Hunter
2018-07-30 15:05 ` Ulf Hansson
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=20180716062655.24703-5-ernest.zhang@bayhubtech.com \
--to=ernest.zhang@bayhubtech.com \
--cc=adrian.hunter@intel.com \
--cc=bobby.wu@bayhubtech.com \
--cc=chevron.li@bayhubtech.com \
--cc=chuanjin.pang@bayhubtech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mike.li@bayhubtech.com \
--cc=shirley.her@bayhubtech.com \
--cc=ulf.hansson@linaro.org \
--cc=xiaoguang.yu@bayhubtech.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).