lkml.org 
[lkml]   [2019]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 155/171] net/mlx5: E-Switch, Fix default encap mode
    Date
    From: Maor Gottlieb <maorg@mellanox.com>

    [ Upstream commit 9a64144d683a4395f57562d90247c61a0bf5105f ]

    Encap mode is related to switchdev mode only. Move the init of
    the encap mode to eswitch_offloads. Before this change, we reported
    that eswitch supports encap, even tough the device was in non
    SRIOV mode.

    Fixes: 7768d1971de67 ('net/mlx5: E-Switch, Add control for encapsulation')
    Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
    Reviewed-by: Roi Dayan <roid@mellanox.com>
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 5 -----
    drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 7 +++++++
    2 files changed, 7 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
    index 6a921e24cd5e..e9339e7d6a18 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
    @@ -1882,11 +1882,6 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
    esw->enabled_vports = 0;
    esw->mode = SRIOV_NONE;
    esw->offloads.inline_mode = MLX5_INLINE_MODE_NONE;
    - if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, reformat) &&
    - MLX5_CAP_ESW_FLOWTABLE_FDB(dev, decap))
    - esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;
    - else
    - esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;

    dev->priv.eswitch = esw;
    return 0;
    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
    index 47b446d30f71..c2beadc41c40 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
    @@ -1840,6 +1840,12 @@ int esw_offloads_init(struct mlx5_eswitch *esw, int vf_nvports,
    {
    int err;

    + if (MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, reformat) &&
    + MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, decap))
    + esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;
    + else
    + esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;
    +
    err = esw_offloads_steering_init(esw, vf_nvports, total_nvports);
    if (err)
    return err;
    @@ -1901,6 +1907,7 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw)
    esw_offloads_devcom_cleanup(esw);
    esw_offloads_unload_all_reps(esw, num_vfs);
    esw_offloads_steering_cleanup(esw);
    + esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;
    }

    static int esw_mode_from_devlink(u16 mode, u16 *mlx5_mode)
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-07-19 06:34    [W:4.155 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site