octeontx2-af: Fix devlink unregister
Ratheesh Kannoth
maintainerPATCH v2 1/1 octeontx2-af: Fix devlink unregister
Exact match feature is only available in CN10K-B.
Unregister exact match devlink entry only for
this silicon variant.
Fixes 87e4ea29b030 ("octeontx2-af: Debugsfs support for exact match.")
Signed-off-by Ratheesh Kannoth <[email protected]>
--- .../marvell/octeontx2/af/rvu_devlink.c | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_devlink.c +27 -8
@@ -1500,6 +1500,9 @@ static const struct devlink_param rvu_af_dl_params[] = {BIT (DEVLINK_PARAM_CMODE_RUNTIME ), rvu_af_dl_dwrr_mtu_get, rvu_af_dl_dwrr_mtu_set, rvu_af_dl_dwrr_mtu_validate), +}; + +static const struct devlink_param rvu_af_dl_param_exact_match[] = { DEVLINK_PARAM_DRIVER(RVU_AF_DEVLINK_PARAM_ID_NPC_EXACT_FEATURE_DISABLE, "npc_exact_feature_disable", DEVLINK_PARAM_TYPE_STRING, BIT(DEVLINK_PARAM_CMODE_RUNTIME),
@@ -1556,7 +1559,6 @@ int rvu_register_dl(struct rvu *rvu) {struct rvu_devlink *rvu_dl;struct devlink *dl; -size_t size;int err; dl = devlink_alloc(&rvu_devlink_ops, sizeof(struct rvu_devlink),
@@ -1578,21 +1580,32 @@ int rvu_register_dl(struct rvu *rvu) goto err_dl_health; } + err =devlink_params_register (dl, rvu_af_dl_params,ARRAY_SIZE (rvu_af_dl_params)); +if (err) { +dev_err (rvu->dev, +"devlink params register failed with error %d" , err); + goto err_dl_health; + } +/* Register exact match devlink only for CN10K-B */ - size =ARRAY_SIZE (rvu_af_dl_params);if (!rvu_npc_exact_has_match_table (rvu)) - size -=1 ; + goto done; - err =devlink_params_register (dl, rvu_af_dl_params, size); + err =devlink_params_register (dl, rvu_af_dl_param_exact_match, +ARRAY_SIZE (rvu_af_dl_param_exact_match));if (err) {dev_err (rvu->dev, -"devlink params register failed with error %d" , err); - goto err_dl_health; +"devlink exact match params register failed with error %d" , err); + goto err_dl_exact_match; } +done:devlink_register (dl);return 0 ; +err_dl_exact_match: +devlink_params_unregister (dl, rvu_af_dl_params,ARRAY_SIZE (rvu_af_dl_params)); + err_dl_health:rvu_health_reporters_destroy (rvu);devlink_free (dl);
@@ -1605,8 +1618,14 @@ void rvu_unregister_dl(struct rvu *rvu)struct devlink *dl = rvu_dl->dl;devlink_unregister (dl); -devlink_params_unregister (dl, rvu_af_dl_params, -ARRAY_SIZE (rvu_af_dl_params)); + +devlink_params_unregister (dl, rvu_af_dl_params,ARRAY_SIZE (rvu_af_dl_params)); + +/* Unregister exact match devlink only for CN10K-B */ +if (rvu_npc_exact_has_match_table (rvu)) +devlink_params_unregister (dl, rvu_af_dl_param_exact_match, +ARRAY_SIZE (rvu_af_dl_param_exact_match)); +rvu_health_reporters_destroy (rvu);devlink_free (dl); }
Signature · 1 line
2.25.1
Quoted 10 lines · Ratheesh Kannoth
Exact match feature is only available in CN10K-B.
Unregister exact match devlink entry only for
this silicon variant.Fixes 87e4ea29b030 ("octeontx2-af: Debugsfs support for exact match.")Signed-off-by Ratheesh Kannoth <[email protected]>--- .../marvell/octeontx2/af/rvu_devlink.c | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-)
Thanks,
Reviewed-by Leon Romanovsky <[email protected]>
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 31 Jan 2023 11:46:59 +0530 you wrote:
Exact match feature is only available in CN10K-B.
Unregister exact match devlink entry only for
this silicon variant.Fixes 87e4ea29b030 ("octeontx2-af: Debugsfs support for exact match.")Signed-off-by Ratheesh Kannoth <[email protected]>[...]
Here is the summary with links:
- [net,v2] octeontx2-af: Fix devlink unregister
https://git.kernel.org/netdev/net/c/917d5e04d4dd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html