mhi: use irq_flags if controller driver configures it

If controller driver has specified the irq_flags, mhi uses this specified
irq_flags. Otherwise, mhi uses default irq_flags.

The purpose of this change is to support one MSI vector for QCA6390.
MHI will use one same MSI vector too in this scenario.

In case of one MSI vector, IRQ_NO_BALANCING is needed when irq handler
is requested. The reason is if irq migration happens, the msi_data may
change too. However, the msi_data is already programmed to QCA6390
hardware during initialization phase. This msi_data inconsistence will
result in crash in kernel.

Another issue is in case of one MSI vector, IRQF_NO_SUSPEND will trigger
WARNINGS because QCA6390 wants to disable the IRQ during the suspend.

To avoid above two issues, QCA6390 driver specifies the irq_flags in case
of one MSI vector when mhi_register_controller is called.

Signed-off-by: Carl Huang <cjhuang@codeaurora.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index f0697f433c2f1bb8d32ad71ca24148b5a6d3cbfa..aa575d3fb3aeaaf6735e428efdf44aa79e8b5539 100644 (file)
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -151,12 +151,17 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)
 {
        struct mhi_event *mhi_event = mhi_cntrl->mhi_event;
        struct device *dev = &mhi_cntrl->mhi_dev->dev;
+       unsigned long irq_flags = IRQF_SHARED | IRQF_NO_SUSPEND;
        int i, ret;
 
+       /* if controller driver has set irq_flags, use it */
+       if (mhi_cntrl->irq_flags)
+               irq_flags = mhi_cntrl->irq_flags;
+
        /* Setup BHI_INTVEC IRQ */
        ret = request_threaded_irq(mhi_cntrl->irq[0], mhi_intvec_handler,
                                   mhi_intvec_threaded_handler,
-                                  IRQF_SHARED | IRQF_NO_SUSPEND,
+                                  irq_flags,
                                   "bhi", mhi_cntrl);
        if (ret)
                return ret;
@@ -174,7 +179,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)
 
                ret = request_irq(mhi_cntrl->irq[mhi_event->irq],
                                  mhi_irq_handler,
-                                 IRQF_SHARED | IRQF_NO_SUSPEND,
+                                 irq_flags,
                                  "mhi", mhi_event);
                if (ret) {
                        dev_err(dev, "Error requesting irq:%d for ev:%d\n",

diff --git a/include/linux/mhi.h b/include/linux/mhi.h
index 562862ff819c4316d20fa8ca86f98ae6aeab1e61..b7138127664f1f554733b207b8afa9ac33d838a2 100644 (file)
--- a/include/linux/mhi.h
+++ b/include/linux/mhi.h
@@ -353,6 +353,7 @@ struct mhi_controller_config {
  * @fbc_download: MHI host needs to do complete image transfer (optional)
  * @pre_init: MHI host needs to do pre-initialization before power up
  * @wake_set: Device wakeup set flag
+ * @irq_flags: irq flags passed to request_irq (optional)
  *
  * Fields marked as (required) need to be populated by the controller driver
  * before calling mhi_register_controller(). For the fields marked as (optional)
@@ -444,6 +445,7 @@ struct mhi_controller {
        bool fbc_download;
        bool pre_init;
        bool wake_set;
+       unsigned long irq_flags;
 };
 
 /**