[v2,16/21] bus: mhi: core: Allow shared IRQ for event rings

Message ID	20200928040951.18207-17-manivannan.sadhasivam@linaro.org
State	Superseded
Headers	show Return-Path: <SRS0=VSLf=DF=vger.kernel.org=linux-arm-msm-owner@kernel.org> From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> To: gregkh@linuxfoundation.org Cc: hemantk@codeaurora.org, bbhatt@codeaurora.org, linux-arm-msm@vger.kernel.org, jhugo@codeaurora.org, linux-kernel@vger.kernel.org, Loic Poulain <loic.poulain@linaro.org>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Subject: [PATCH v2 16/21] bus: mhi: core: Allow shared IRQ for event rings Date: Mon, 28 Sep 2020 09:39:46 +0530 Message-Id: <20200928040951.18207-17-manivannan.sadhasivam@linaro.org> In-Reply-To: <20200928040951.18207-1-manivannan.sadhasivam@linaro.org> References: <20200928040951.18207-1-manivannan.sadhasivam@linaro.org> Precedence: bulk
Series	MHI changes for v5.10 \| expand [v2,00/21] MHI changes for v5.10 [v2,01/21] bus: mhi: fix doubled words and struct image_info kernel-doc [v2,02/21] bus: mhi: core: Remove double occurrence for mhi_ctrl_ev_task() declaration [v2,03/21] bus: mhi: core: Abort suspends due to outgoing pending packets [v2,04/21] bus: mhi: core: Use helper API to trigger a non-blocking host resume [v2,05/21] bus: mhi: core: Trigger host resume if suspended during mhi_device_get() [v2,06/21] bus: mhi: core: Use generic name field for an MHI device [v2,07/21] bus: mhi: core: Introduce helper function to check device state [v2,08/21] bus: mhi: core: Introduce counters to track MHI device state transitions [v2,09/21] bus: mhi: core: Read and save device hardware information from BHI [v2,10/21] bus: mhi: core: Introduce APIs to allocate and free the MHI controller [v2,11/21] bus: mhi: core: Add const qualifier to MHI config information [v2,12/21] bus: mhi: Remove include of rwlock_types.h [v2,13/21] bus: mhi: Fix entries based on Kconfig coding style [v2,14/21] bus: mhi: core: Introduce debugfs entries for MHI [v2,15/21] bus: mhi: core: Introduce sysfs entries for MHI [v2,16/21] bus: mhi: core: Allow shared IRQ for event rings [v2,17/21] bus: mhi: Remove unused nr_irqs_req variable [v2,18/21] bus: mhi: core: Fix the building of MHI module [v2,19/21] bus: mhi: debugfs: Print channel context read-pointer [v2,20/21] bus: mhi: Remove auto-start option [v2,21/21] net: qrtr: Start MHI channels during init

Message ID

20200928040951.18207-17-manivannan.sadhasivam@linaro.org

State

Superseded

Headers

From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
To: gregkh@linuxfoundation.org
Cc: hemantk@codeaurora.org, bbhatt@codeaurora.org,
	linux-arm-msm@vger.kernel.org, jhugo@codeaurora.org,
	linux-kernel@vger.kernel.org, Loic Poulain <loic.poulain@linaro.org>,
	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Subject: [PATCH v2 16/21] bus: mhi: core: Allow shared IRQ for event rings
Date: Mon, 28 Sep 2020 09:39:46 +0530
Message-Id: <20200928040951.18207-17-manivannan.sadhasivam@linaro.org>
In-Reply-To: <20200928040951.18207-1-manivannan.sadhasivam@linaro.org>
References: <20200928040951.18207-1-manivannan.sadhasivam@linaro.org>
Precedence: bulk

Series

MHI changes for v5.10 | expand

Commit Message

Manivannan Sadhasivam Sept. 28, 2020, 4:09 a.m. UTC

From: Loic Poulain <loic.poulain@linaro.org>

There is no requirement for using a dedicated IRQ per event ring.
Some systems does not support multiple MSI vectors (e.g. intel
without CONFIG_IRQ_REMAP), In that case the MHI controller can
configure all the event rings to use the same interrupt (as fallback).

Allow this by removing the nr_irqs = ev_ring test and add extra check
in the irq_setup function.

Signed-off-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 drivers/bus/mhi/core/init.c | 7 +++++++
 drivers/bus/mhi/core/pm.c   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
index a33665b7ee54..103d51f35e28 100644
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -162,6 +162,13 @@  int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)
 		if (mhi_event->offload_ev)
 			continue;
 
+		if (mhi_event->irq >= mhi_cntrl->nr_irqs) {
+			dev_err(dev, "irq %d not available for event ring\n",
+				mhi_event->irq);
+			ret = -EINVAL;
+			goto error_request;
+		}
+
 		ret = request_irq(mhi_cntrl->irq[mhi_event->irq],
 				  mhi_irq_handler,
 				  IRQF_SHARED | IRQF_NO_SUSPEND,
diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c
index ce4d969818b4..3de7b1639ec6 100644
--- a/drivers/bus/mhi/core/pm.c
+++ b/drivers/bus/mhi/core/pm.c
@@ -918,7 +918,7 @@  int mhi_async_power_up(struct mhi_controller *mhi_cntrl)
 
 	dev_info(dev, "Requested to power ON\n");
 
-	if (mhi_cntrl->nr_irqs < mhi_cntrl->total_ev_rings)
+	if (mhi_cntrl->nr_irqs < 1)
 		return -EINVAL;
 
 	/* Supply default wake routines if not provided by controller driver */

[v2,16/21] bus: mhi: core: Allow shared IRQ for event rings

Commit Message

Patch