Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e22dc7be authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-fsl-fix-v5.0' of... 

Merge tag 'soc-fsl-fix-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/fixes

soc/fsl fixes for v5.0

- qbman: avoid missing interrupts by only clearing processed events

* tag 'soc-fsl-fix-v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux

:
  soc: fsl: qbman: avoid race in clearing QMan interrupt

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 69835820 89857a8a

drivers/soc/fsl/qbman/qman.c

+5 −4
Original line number Diff line number Diff line
@@ -1143,18 +1143,19 @@ static void qm_mr_process_task(struct work_struct *work); 
static irqreturn_t portal_isr(int irq, void *ptr)

{

	struct qman_portal *p = ptr;



	u32 clear = QM_DQAVAIL_MASK | p->irq_sources;

	u32 is = qm_in(&p->p, QM_REG_ISR) & p->irq_sources;

	u32 clear = 0;



	if (unlikely(!is))

		return IRQ_NONE;



	/* DQRR-handling if it's interrupt-driven */

	if (is & QM_PIRQ_DQRI)

	if (is & QM_PIRQ_DQRI) {

		__poll_portal_fast(p, QMAN_POLL_LIMIT);

		clear = QM_DQAVAIL_MASK | QM_PIRQ_DQRI;

	}

	/* Handling of anything else that's interrupt-driven */

	clear |= __poll_portal_slow(p, is);

	clear |= __poll_portal_slow(p, is) & QM_PIRQ_SLOW;

	qm_out(&p->p, QM_REG_ISR, clear);

	return IRQ_HANDLED;

}