Commit f0b37fa6 authored by Louis Peens's avatar Louis Peens Committed by David S. Miller
Browse files

nfp: flower: fix incorrect flag assignment 



A previous refactoring missed some locations the flags were renamed
but not moved from the previous flower_ext_feats to the new flower_en_feats
variable. This lead to the FLOW_MERGE and LAG features not being enabled.

Fixes: e09303d3 ("nfp: flower: renaming of feature bits")
Signed-off-by: default avatarLouis Peens <louis.peens@netronome.com>
Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91f3fd11

drivers/net/ethernet/netronome/nfp/flower/main.c

+3 −3
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static int nfp_flower_sync_feature_bits(struct nfp_app *app) 
	err = nfp_rtsym_write_le(app->pf->rtbl,

				 "_abi_flower_balance_sync_enable", 1);

	if (!err) {

		app_priv->flower_ext_feats |= NFP_FL_ENABLE_LAG;

		app_priv->flower_en_feats |= NFP_FL_ENABLE_LAG;

		nfp_flower_lag_init(&app_priv->nfp_lag);

	} else if (err == -ENOENT) {

		nfp_warn(app->cpp, "LAG not supported by FW.\n");
@@ -721,7 +721,7 @@ static int nfp_flower_sync_feature_bits(struct nfp_app *app) 
		err = nfp_rtsym_write_le(app->pf->rtbl,

					 "_abi_flower_merge_hint_enable", 1);

		if (!err) {

			app_priv->flower_ext_feats |= NFP_FL_ENABLE_FLOW_MERGE;

			app_priv->flower_en_feats |= NFP_FL_ENABLE_FLOW_MERGE;

			nfp_flower_internal_port_init(app_priv);

		} else if (err == -ENOENT) {

			nfp_warn(app->cpp,
@@ -840,7 +840,7 @@ static int nfp_flower_init(struct nfp_app *app) 
	return 0;



err_cleanup:

	if (app_priv->flower_ext_feats & NFP_FL_ENABLE_LAG)

	if (app_priv->flower_en_feats & NFP_FL_ENABLE_LAG)

		nfp_flower_lag_cleanup(&app_priv->nfp_lag);

	nfp_flower_metadata_cleanup(app);

err_free_app_priv:

CRA Git | Maintained and supported by SUSTech CRA and CCSE