| Message ID | 20220715215954.1449214-38-sean.anderson@seco.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: dpaa: Convert to phylink | expand |
> -----Original Message----- > From: Linuxppc-dev <linuxppc-dev- > bounces+camelia.groza=nxp.com@lists.ozlabs.org> On Behalf Of Sean > Anderson > Sent: Saturday, July 16, 2022 1:00 > To: David S . Miller <davem@davemloft.net>; Jakub Kicinski > <kuba@kernel.org>; Madalin Bucur <madalin.bucur@nxp.com>; > netdev@vger.kernel.org > Cc: Leo Li <leoyang.li@nxp.com>; Sean Anderson > <sean.anderson@seco.com>; Russell King <linux@armlinux.org.uk>; linux- > kernel@vger.kernel.org; Eric Dumazet <edumazet@google.com>; Paolo > Abeni <pabeni@redhat.com>; linuxppc-dev@lists.ozlabs.org; linux-arm- > kernel@lists.infradead.org > Subject: [PATCH net-next v3 37/47] soc: fsl: qbman: Add CGR update > function > > This adds a function to update a CGR with new parameters. > qman_cgr_create can almost be used for this (with flags=0), but it's not It's qman_create_cgr, not qman_cgr_create. > suitable because it also registers the callback function. The _safe > variant was modeled off of qman_cgr_delete_safe. However, we handle > multiple arguments and a return value. > > Signed-off-by: Sean Anderson <sean.anderson@seco.com> Acked-by: Camelia Groza <camelia.groza@nxp.com>
On 7/21/22 9:18 AM, Camelia Alexandra Groza wrote: >> -----Original Message----- >> From: Linuxppc-dev <linuxppc-dev- >> bounces+camelia.groza=nxp.com@lists.ozlabs.org> On Behalf Of Sean >> Anderson >> Sent: Saturday, July 16, 2022 1:00 >> To: David S . Miller <davem@davemloft.net>; Jakub Kicinski >> <kuba@kernel.org>; Madalin Bucur <madalin.bucur@nxp.com>; >> netdev@vger.kernel.org >> Cc: Leo Li <leoyang.li@nxp.com>; Sean Anderson >> <sean.anderson@seco.com>; Russell King <linux@armlinux.org.uk>; linux- >> kernel@vger.kernel.org; Eric Dumazet <edumazet@google.com>; Paolo >> Abeni <pabeni@redhat.com>; linuxppc-dev@lists.ozlabs.org; linux-arm- >> kernel@lists.infradead.org >> Subject: [PATCH net-next v3 37/47] soc: fsl: qbman: Add CGR update >> function >> >> This adds a function to update a CGR with new parameters. >> qman_cgr_create can almost be used for this (with flags=0), but it's not > > It's qman_create_cgr, not qman_cgr_create. Thanks, will fix. >> suitable because it also registers the callback function. The _safe >> variant was modeled off of qman_cgr_delete_safe. However, we handle >> multiple arguments and a return value. >> >> Signed-off-by: Sean Anderson <sean.anderson@seco.com> > > Acked-by: Camelia Groza <camelia.groza@nxp.com> >
diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index eb6600aab09b..68b825ea10f1 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -2568,6 +2568,53 @@ void qman_delete_cgr_safe(struct qman_cgr *cgr) } EXPORT_SYMBOL(qman_delete_cgr_safe); +static int qman_update_cgr(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts) +{ + int ret; + unsigned long irqflags; + struct qman_portal *p = qman_cgr_get_affine_portal(cgr); + + if (!p) + return -EINVAL; + + spin_lock_irqsave(&p->cgr_lock, irqflags); + ret = qm_modify_cgr(cgr, 0, opts); + spin_unlock_irqrestore(&p->cgr_lock, irqflags); + put_affine_portal(); + return ret; +} + +struct update_cgr_params { + struct qman_cgr *cgr; + struct qm_mcc_initcgr *opts; + int ret; +}; + +static void qman_update_cgr_smp_call(void *p) +{ + struct update_cgr_params *params = p; + + params->ret = qman_update_cgr(params->cgr, params->opts); +} + +int qman_update_cgr_safe(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts) +{ + struct update_cgr_params params = { + .cgr = cgr, + .opts = opts, + }; + + preempt_disable(); + if (qman_cgr_cpus[cgr->cgrid] != smp_processor_id()) + smp_call_function_single(qman_cgr_cpus[cgr->cgrid], + qman_update_cgr_smp_call, ¶ms, true); + else + params.ret = qman_update_cgr(cgr, opts); + preempt_enable(); + return params.ret; +} +EXPORT_SYMBOL(qman_update_cgr_safe); + /* Cleanup FQs */ static int _qm_mr_consume_and_match_verb(struct qm_portal *p, int v) diff --git a/include/soc/fsl/qman.h b/include/soc/fsl/qman.h index 59eeba31c192..0d3d6beb7fdb 100644 --- a/include/soc/fsl/qman.h +++ b/include/soc/fsl/qman.h @@ -1171,6 +1171,15 @@ int qman_delete_cgr(struct qman_cgr *cgr); */ void qman_delete_cgr_safe(struct qman_cgr *cgr); +/** + * qman_update_cgr_safe - Modifies a congestion group object from any CPU + * @cgr: the 'cgr' object to modify + * @opts: state of the CGR settings + * + * This will select the proper CPU and modify the CGR settings. + */ +int qman_update_cgr_safe(struct qman_cgr *cgr, struct qm_mcc_initcgr *opts); + /** * qman_query_cgr_congested - Queries CGR's congestion status * @cgr: the 'cgr' object to query
This adds a function to update a CGR with new parameters. qman_cgr_create can almost be used for this (with flags=0), but it's not suitable because it also registers the callback function. The _safe variant was modeled off of qman_cgr_delete_safe. However, we handle multiple arguments and a return value. Signed-off-by: Sean Anderson <sean.anderson@seco.com> --- (no changes since v2) Changes in v2: - New drivers/soc/fsl/qbman/qman.c | 47 ++++++++++++++++++++++++++++++++++++ include/soc/fsl/qman.h | 9 +++++++ 2 files changed, 56 insertions(+)