Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
[ 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: Sean Anderson <sean.anderson@seco.com>
Acked-by: Camelia Groza <camelia.groza@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: fbec4e7fed89 ("soc: fsl: qbman: Use raw spinlock for cgr_lock")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sean Anderson 2022-09-02 17:57:34 -04:00 committed by Ksawlii
parent a61dc603b1
commit b0cb2a8931
1 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/soc/fsl/qbman/qman.c
View file

@ -2483,13 +2483,8 @@ out:
} }
EXPORT_SYMBOL(qman_create_cgr); 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(); struct qman_portal *p = get_affine_portal();
if (cgr->chan != p->config->channel) { if (cgr->chan != p->config->channel) {
@ -2497,10 +2492,25 @@ int qman_delete_cgr(struct qman_cgr *cgr)
dev_err(p->config->dev, "CGR not owned by current portal"); dev_err(p->config->dev, "CGR not owned by current portal");
dev_dbg(p->config->dev, " create 0x%x, delete 0x%x\n", dev_dbg(p->config->dev, " create 0x%x, delete 0x%x\n",
cgr->chan, p->config->channel); cgr->chan, p->config->channel);
put_affine_portal();
ret = -EINVAL; return NULL;
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)); memset(&local_opts, 0, sizeof(struct qm_mcc_initcgr));
spin_lock_irqsave(&p->cgr_lock, irqflags); spin_lock_irqsave(&p->cgr_lock, irqflags);
list_del(&cgr->node); list_del(&cgr->node);
@ -2528,7 +2538,6 @@ int qman_delete_cgr(struct qman_cgr *cgr)
list_add(&cgr->node, &p->cgr_cbs); list_add(&cgr->node, &p->cgr_cbs);
release_lock: release_lock:
spin_unlock_irqrestore(&p->cgr_lock, irqflags); spin_unlock_irqrestore(&p->cgr_lock, irqflags);
put_portal:
put_affine_portal(); put_affine_portal();
return ret; return ret;
} }