Commit d0e17a46 authored by Sean Anderson's avatar Sean Anderson Committed by David S. Miller

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

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>
parent fca4804f
...@@ -2483,13 +2483,8 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags, ...@@ -2483,13 +2483,8 @@ int qman_create_cgr(struct qman_cgr *cgr, u32 flags,
} }
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) ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment