Commit 7f9f953d authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Schedule IRQ kthreads only on non-RT kernels 

In RT kernels, the IRQ handler's code is executed as a kernel
thread. Modify the driver to avoid explicitly scheduling the IRQ kernel
thread.

Link: https://lore.kernel.org/r/20220912135742.11764-4-sreekanth.reddy@broadcom.com


Signed-off-by: default avatarSreekanth Reddy <sreekanth.reddy@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 47cd930e

drivers/scsi/mpi3mr/mpi3mr_fw.c

+15 −1
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ int mpi3mr_process_op_reply_q(struct mpi3mr_ioc *mrioc, 
		if ((le16_to_cpu(reply_desc->reply_flags) &

		    MPI3_REPLY_DESCRIPT_FLAGS_PHASE_MASK) != exp_phase)

			break;

#ifndef CONFIG_PREEMPT_RT

		/*

		 * Exit completion loop to avoid CPU lockup

		 * Ensure remaining completion happens from threaded ISR.
@@ -545,7 +546,7 @@ int mpi3mr_process_op_reply_q(struct mpi3mr_ioc *mrioc, 
			op_reply_q->enable_irq_poll = true;

			break;

		}



#endif

	} while (1);



	writel(reply_ci,
@@ -614,6 +615,8 @@ static irqreturn_t mpi3mr_isr_primary(int irq, void *privdata) 
		return IRQ_NONE;

}



#ifndef CONFIG_PREEMPT_RT



static irqreturn_t mpi3mr_isr(int irq, void *privdata)

{

	struct mpi3mr_intr_info *intr_info = privdata;
@@ -691,6 +694,8 @@ static irqreturn_t mpi3mr_isr_poll(int irq, void *privdata) 
	return IRQ_HANDLED;

}



#endif



/**

 * mpi3mr_request_irq - Request IRQ and register ISR

 * @mrioc: Adapter instance reference
@@ -713,8 +718,13 @@ static inline int mpi3mr_request_irq(struct mpi3mr_ioc *mrioc, u16 index) 
	snprintf(intr_info->name, MPI3MR_NAME_LENGTH, "%s%d-msix%d",

	    mrioc->driver_name, mrioc->id, index);



#ifndef CONFIG_PREEMPT_RT

	retval = request_threaded_irq(pci_irq_vector(pdev, index), mpi3mr_isr,

	    mpi3mr_isr_poll, IRQF_SHARED, intr_info->name, intr_info);

#else

	retval = request_threaded_irq(pci_irq_vector(pdev, index), mpi3mr_isr_primary,

	    NULL, IRQF_SHARED, intr_info->name, intr_info);

#endif

	if (retval) {

		ioc_err(mrioc, "%s: Unable to allocate interrupt %d!\n",

		    intr_info->name, pci_irq_vector(pdev, index));
@@ -2179,9 +2189,13 @@ int mpi3mr_op_request_post(struct mpi3mr_ioc *mrioc, 
		pi = 0;

	op_req_q->pi = pi;



#ifndef CONFIG_PREEMPT_RT

	if (atomic_inc_return(&mrioc->op_reply_qinfo[reply_qidx].pend_ios)

	    > MPI3MR_IRQ_POLL_TRIGGER_IOCOUNT)

		mrioc->op_reply_qinfo[reply_qidx].enable_irq_poll = true;

#else

	atomic_inc_return(&mrioc->op_reply_qinfo[reply_qidx].pend_ios);

#endif



	writel(op_req_q->pi,

	    &mrioc->sysif_regs->oper_queue_indexes[reply_qidx].producer_index);