Commit b0fc0167 authored by Loic Poulain's avatar Loic Poulain Committed by Greg Kroah-Hartman
Browse files

bus: mhi: core: Allow shared IRQ for event rings 



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.

Reviewed-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarLoic Poulain <loic.poulain@linaro.org>
Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20200929175218.8178-17-manivannan.sadhasivam@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21cb9b18

drivers/bus/mhi/core/init.c

+7 −0
Original line number Diff line number Diff line
@@ -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,

drivers/bus/mhi/core/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */