Hi, > -----Original Message----- > From: Viacheslav Ovsiienko <viachesl...@mellanox.com> > Sent: Wednesday, November 13, 2019 6:25 PM > To: dev@dpdk.org > Cc: Matan Azrad <ma...@mellanox.com>; Raslan Darawsheh > <rasl...@mellanox.com>; Ori Kam <or...@mellanox.com> > Subject: [PATCH] net/mlx5: fix environment variable recovery > > The state of environment variable MLX5_BF_SHUT_UP was not > recovered correctly if there was no tx_db_nc devarg specified. > > Fixes: 8409a28573d3 ("net/mlx5: control transmit doorbell register mapping") > > Signed-off-by: Viacheslav Ovsiienko <viachesl...@mellanox.com> > --- > drivers/net/mlx5/mlx5.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c > index 6ffe951..bafc84c 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -448,12 +448,9 @@ struct mlx5_flow_id_pool * > } > > static void > -mlx5_restore_doorbell_mapping_env(const struct mlx5_dev_config > *config, > - int value) > +mlx5_restore_doorbell_mapping_env(int value) > { > assert(rte_eal_process_type() == RTE_PROC_PRIMARY); > - if (config->dbnc == MLX5_ARG_UNSET) > - return; > /* Restore the original environment variable state. */ > if (value == MLX5_ARG_UNSET) > unsetenv(MLX5_SHUT_UP_BF); > @@ -530,7 +527,7 @@ struct mlx5_flow_id_pool * > sh->devx = 1; > DRV_LOG(DEBUG, "DevX is supported"); > /* The device is created, no need for environment. */ > - mlx5_restore_doorbell_mapping_env(config, dbmap_env); > + mlx5_restore_doorbell_mapping_env(dbmap_env); > } else { > /* The environment variable is still configured. */ > sh->ctx = mlx5_glue->open_device(spawn->ibv_dev); > @@ -539,10 +536,9 @@ struct mlx5_flow_id_pool * > * The environment variable is not needed anymore, > * all device creation attempts are completed. > */ > - mlx5_restore_doorbell_mapping_env(config, dbmap_env); > - if (!sh->ctx) { > + mlx5_restore_doorbell_mapping_env(dbmap_env); > + if (!sh->ctx) > goto error; > - } > DRV_LOG(DEBUG, "DevX is NOT supported"); > } > err = mlx5_glue->query_device_ex(sh->ctx, NULL, &sh- > >device_attr); > -- > 1.8.3.1
Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh