| From 14d49c154c362893bdfa5be48b08f996e6962c9e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 27 Apr 2020 18:30:48 +0800 |
| Subject: mmc: sdhci-pci-gli: Fix no irq handler from suspend |
| |
| From: Ben Chuang <ben.chuang@genesyslogic.com.tw> |
| |
| [ Upstream commit 282ede76e47048eebc8ce5324b412890f0ec0a69 ] |
| |
| The kernel prints a message similar to |
| "[ 28.881959] do_IRQ: 5.36 No irq handler for vector" |
| when GL975x resumes from suspend. Implement a resume callback to fix this. |
| |
| Fixes: 31e43f31890c ("mmc: sdhci-pci-gli: Enable MSI interrupt for GL975x") |
| Co-developed-by: Renius Chen <renius.chen@genesyslogic.com.tw> |
| Signed-off-by: Renius Chen <renius.chen@genesyslogic.com.tw> |
| Tested-by: Dave Flogeras <dflogeras2@gmail.com> |
| Signed-off-by: Ben Chuang <ben.chuang@genesyslogic.com.tw> |
| Tested-by: Vineeth Pillai <vineethrp@gmail.com> |
| Acked-by: Adrian Hunter <adrian.hunter@intel.com> |
| Link: https://lore.kernel.org/r/20200427103048.20785-1-benchuanggli@gmail.com |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Samuel Zou <zou_wei@huawei.com> |
| [Samuel Zou: Make sdhci_pci_gli_resume() static] |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/mmc/host/sdhci-pci-gli.c | 18 ++++++++++++++++++ |
| 1 file changed, 18 insertions(+) |
| |
| diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c |
| index ce15a05f23d41..ff39d81a5742c 100644 |
| --- a/drivers/mmc/host/sdhci-pci-gli.c |
| +++ b/drivers/mmc/host/sdhci-pci-gli.c |
| @@ -334,6 +334,18 @@ static u32 sdhci_gl9750_readl(struct sdhci_host *host, int reg) |
| return value; |
| } |
| |
| +#ifdef CONFIG_PM_SLEEP |
| +static int sdhci_pci_gli_resume(struct sdhci_pci_chip *chip) |
| +{ |
| + struct sdhci_pci_slot *slot = chip->slots[0]; |
| + |
| + pci_free_irq_vectors(slot->chip->pdev); |
| + gli_pcie_enable_msi(slot); |
| + |
| + return sdhci_pci_resume_host(chip); |
| +} |
| +#endif |
| + |
| static const struct sdhci_ops sdhci_gl9755_ops = { |
| .set_clock = sdhci_set_clock, |
| .enable_dma = sdhci_pci_enable_dma, |
| @@ -348,6 +360,9 @@ const struct sdhci_pci_fixes sdhci_gl9755 = { |
| .quirks2 = SDHCI_QUIRK2_BROKEN_DDR50, |
| .probe_slot = gli_probe_slot_gl9755, |
| .ops = &sdhci_gl9755_ops, |
| +#ifdef CONFIG_PM_SLEEP |
| + .resume = sdhci_pci_gli_resume, |
| +#endif |
| }; |
| |
| static const struct sdhci_ops sdhci_gl9750_ops = { |
| @@ -366,4 +381,7 @@ const struct sdhci_pci_fixes sdhci_gl9750 = { |
| .quirks2 = SDHCI_QUIRK2_BROKEN_DDR50, |
| .probe_slot = gli_probe_slot_gl9750, |
| .ops = &sdhci_gl9750_ops, |
| +#ifdef CONFIG_PM_SLEEP |
| + .resume = sdhci_pci_gli_resume, |
| +#endif |
| }; |
| -- |
| 2.20.1 |
| |