From: Avinash Patil <pat...@marvell.com>
commit 7be0f5b5e169a566be9400481c21de32f147ccbe upstream
Newer pcie devices (8897 onwards) support MSI. This
patch enables it.
Signed-off-by: Avinash Patil <pat...@marvell.com>
Signed-off-by: Amitkumar Karwar <akar...@marvell.com>
Signed-off-by: Kalle Valo <kv...@codeaurora.org>
[Kevin: replace mwifiex_dbg() with pr_debug()]
Signed-off-by: Kevin Hao <kexin....@windriver.com>
---
drivers/net/wireless/mwifiex/pcie.c | 32 +++++++++++++++++++++++++-------
drivers/net/wireless/mwifiex/pcie.h | 1 +
2 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/mwifiex/pcie.c
b/drivers/net/wireless/mwifiex/pcie.c
index bcc7751d883c..dab899d48236 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -2538,6 +2538,30 @@ static void mwifiex_pcie_cleanup(struct mwifiex_adapter
*adapter)
kfree(card);
}
+static int mwifiex_pcie_request_irq(struct mwifiex_adapter *adapter)
+{
+ int ret;
+ struct pcie_service_card *card = adapter->card;
+ struct pci_dev *pdev = card->dev;
+
+ if (pci_enable_msi(pdev) != 0)
+ pci_disable_msi(pdev);
+ else
+ card->msi_enable = 1;
+
+ pr_debug("msi_enable = %d\n", card->msi_enable);
+
+ ret = request_irq(pdev->irq, mwifiex_pcie_interrupt, IRQF_SHARED,
+ "MRVL_PCIE", pdev);
+ if (ret) {
+ pr_err("request_irq failed: ret=%d\n", ret);
+ adapter->card = NULL;
+ return -1;
+ }
+
+ return 0;
+}
+
/*
* This function registers the PCIE device.
*
@@ -2545,20 +2569,14 @@ static void mwifiex_pcie_cleanup(struct mwifiex_adapter
*adapter)
*/
static int mwifiex_register_dev(struct mwifiex_adapter *adapter)
{
- int ret;
struct pcie_service_card *card = adapter->card;
struct pci_dev *pdev = card->dev;
/* save adapter pointer in card */
card->adapter = adapter;
- ret = request_irq(pdev->irq, mwifiex_pcie_interrupt, IRQF_SHARED,
- "MRVL_PCIE", pdev);
- if (ret) {
- pr_err("request_irq failed: ret=%d\n", ret);
- adapter->card = NULL;
+ if (mwifiex_pcie_request_irq(adapter))
return -1;
- }
adapter->dev = &pdev->dev;
adapter->tx_buf_size = card->pcie.tx_buf_size;
diff --git a/drivers/net/wireless/mwifiex/pcie.h
b/drivers/net/wireless/mwifiex/pcie.h
index 0e7ee8b72358..78e3a0aa68ee 100644
--- a/drivers/net/wireless/mwifiex/pcie.h
+++ b/drivers/net/wireless/mwifiex/pcie.h
@@ -284,6 +284,7 @@ struct pcie_service_card {
dma_addr_t sleep_cookie_pbase;
void __iomem *pci_mmap;
void __iomem *pci_mmap1;
+ int msi_enable;
};
static inline int
--
2.9.3
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
