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

Commit ea2b8488 authored by Roy Pledge's avatar Roy Pledge Committed by Li Yang
Browse files

soc/fsl/qbman: Disable interrupts during portal recovery 



Disable the QBMan interrupts during recovery.

Signed-off-by: default avatarRoy Pledge <roy.pledge@nxp.com>
Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent 627da8ba

drivers/soc/fsl/qbman/qman.c

+19 −3
Original line number Diff line number Diff line
@@ -1070,6 +1070,20 @@ int qman_wq_alloc(void) 
	return 0;

}





void qman_enable_irqs(void)

{

	int i;



	for (i = 0; i < num_possible_cpus(); i++) {

		if (affine_portals[i]) {

			qm_out(&affine_portals[i]->p, QM_REG_ISR, 0xffffffff);

			qm_out(&affine_portals[i]->p, QM_REG_IIR, 0);

		}



	}

}



/*

 * This is what everything can wait on, even if it migrates to a different cpu

 * to the one whose affine portal it is waiting on.
@@ -1269,8 +1283,8 @@ static int qman_create_portal(struct qman_portal *portal, 
	qm_out(p, QM_REG_ISDR, isdr);

	portal->irq_sources = 0;

	qm_out(p, QM_REG_IER, 0);

	qm_out(p, QM_REG_ISR, 0xffffffff);

	snprintf(portal->irqname, MAX_IRQNAME, IRQNAME, c->cpu);

	qm_out(p, QM_REG_IIR, 1);

	if (request_irq(c->irq, portal_isr, 0, portal->irqname,	portal)) {

		dev_err(c->dev, "request_irq() failed\n");

		goto fail_irq;
@@ -1290,7 +1304,7 @@ static int qman_create_portal(struct qman_portal *portal, 
	isdr &= ~(QM_PIRQ_DQRI | QM_PIRQ_MRI);

	qm_out(p, QM_REG_ISDR, isdr);

	if (qm_dqrr_current(p)) {

		dev_err(c->dev, "DQRR unclean\n");

		dev_dbg(c->dev, "DQRR unclean\n");

		qm_dqrr_cdc_consume_n(p, 0xffff);

	}

	if (qm_mr_current(p) && drain_mr_fqrni(p)) {
@@ -1303,7 +1317,9 @@ static int qman_create_portal(struct qman_portal *portal, 
	}

	/* Success */

	portal->config = c;

	qm_out(p, QM_REG_ISR, 0xffffffff);

	qm_out(p, QM_REG_ISDR, 0);

	if (!qman_requires_cleanup())

		qm_out(p, QM_REG_IIR, 0);

	/* Write a sane SDQCR */

	qm_dqrr_sdqcr_set(p, portal->sdqcr);

drivers/soc/fsl/qbman/qman_ccsr.c

+1 −0
Original line number Diff line number Diff line
@@ -744,6 +744,7 @@ int qman_requires_cleanup(void) 


void qman_done_cleanup(void)

{

	qman_enable_irqs();

	__qman_requires_cleanup = 0;

}

drivers/soc/fsl/qbman/qman_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -279,3 +279,4 @@ int qman_shutdown_fq(u32 fqid); 


int qman_requires_cleanup(void);

void qman_done_cleanup(void);

void qman_enable_irqs(void);