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

Commit 6e962951 authored by Sean Anderson's avatar Sean Anderson Committed by Greg Kroah-Hartman
Browse files

soc: fsl: qbman: Add helper for sanity checking cgr ops 



[ Upstream commit d0e17a4653cebc2c8a20251c837dd1fcec5014d9 ]

This breaks out/combines get_affine_portal and the cgr sanity check in
preparation for the next commit. No functional change intended.

Signed-off-by: default avatarSean Anderson <sean.anderson@seco.com>
Acked-by: default avatarCamelia Groza <camelia.groza@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: fbec4e7fed89 ("soc: fsl: qbman: Use raw spinlock for cgr_lock")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 62c3ecd2

drivers/soc/fsl/qbman/qman.c

+19 −10
Original line number Diff line number Diff line
@@ -2481,13 +2481,8 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, 
}

EXPORT_SYMBOL(qman_create_cgr);



int qman_delete_cgr(struct qman_cgr *cgr)

static struct qman_portal *qman_cgr_get_affine_portal(struct qman_cgr *cgr)

{

	unsigned long irqflags;

	struct qm_mcr_querycgr cgr_state;

	struct qm_mcc_initcgr local_opts;

	int ret = 0;

	struct qman_cgr *i;

	struct qman_portal *p = get_affine_portal();



	if (cgr->chan != p->config->channel) {
@@ -2495,10 +2490,25 @@ int qman_delete_cgr(struct qman_cgr *cgr) 
		dev_err(p->config->dev, "CGR not owned by current portal");

		dev_dbg(p->config->dev, " create 0x%x, delete 0x%x\n",

			cgr->chan, p->config->channel);

		put_affine_portal();

		return NULL;

	}



		ret = -EINVAL;

		goto put_portal;

	return p;

}



int qman_delete_cgr(struct qman_cgr *cgr)

{

	unsigned long irqflags;

	struct qm_mcr_querycgr cgr_state;

	struct qm_mcc_initcgr local_opts;

	int ret = 0;

	struct qman_cgr *i;

	struct qman_portal *p = qman_cgr_get_affine_portal(cgr);



	if (!p)

		return -EINVAL;



	memset(&local_opts, 0, sizeof(struct qm_mcc_initcgr));

	spin_lock_irqsave(&p->cgr_lock, irqflags);

	list_del(&cgr->node);
@@ -2526,7 +2536,6 @@ int qman_delete_cgr(struct qman_cgr *cgr) 
		list_add(&cgr->node, &p->cgr_cbs);

release_lock:

	spin_unlock_irqrestore(&p->cgr_lock, irqflags);

put_portal:

	put_affine_portal();

	return ret;

}