leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net/mlx5: DR, Replace local WIRE_PORT macro with the existing MLX5_VPORT_UPLINK

Browse Source 
SW steering defines its own macro for uplink vport number.
Replace this macro with an already existing mlx5 macro.

Signed-off-by: Yevgeny Kliteynik <kliteyn@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
This commit is contained in:
Yevgeny Kliteynik 2021-09-23 02:23:23 +03:00 committed by Saeed Mahameed
parent f9f93bd55c
commit 7ae8ac9a58
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c
View File

@ -669,7 +669,7 @@ int mlx5dr_actions_build_ste_arr(struct mlx5dr_matcher *matcher,
attr.hit_gvmi = action->vport->caps->vhca_gvmi; attr.hit_gvmi = action->vport->caps->vhca_gvmi;
dest_action = action; dest_action = action;
if (rx_rule) { if (rx_rule) {
if (action->vport->caps->num == WIRE_PORT) { if (action->vport->caps->num == MLX5_VPORT_UPLINK) {
mlx5dr_dbg(dmn, "Device doesn't support Loopback on WIRE vport\n"); mlx5dr_dbg(dmn, "Device doesn't support Loopback on WIRE vport\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }

2
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c
View File

@ -170,7 +170,7 @@ static int dr_domain_query_vports(struct mlx5dr_domain *dmn)
/* Last vport is the wire port */ /* Last vport is the wire port */
wire_vport = &dmn->info.caps.vports_caps[vport]; wire_vport = &dmn->info.caps.vports_caps[vport];
wire_vport->num = WIRE_PORT; wire_vport->num = MLX5_VPORT_UPLINK;
wire_vport->icm_address_rx = esw_caps->uplink_icm_address_rx; wire_vport->icm_address_rx = esw_caps->uplink_icm_address_rx;
wire_vport->icm_address_tx = esw_caps->uplink_icm_address_tx; wire_vport->icm_address_tx = esw_caps->uplink_icm_address_tx;
wire_vport->vport_gvmi = 0; wire_vport->vport_gvmi = 0;

4
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_rule.c
View File

@ -1042,10 +1042,10 @@ static bool dr_rule_skip(enum mlx5dr_domain_type domain,
return false; return false;
if (mask->misc.source_port) { if (mask->misc.source_port) {
if (rx && value->misc.source_port != WIRE_PORT) if (rx && value->misc.source_port != MLX5_VPORT_UPLINK)
return true; return true;
if (!rx && value->misc.source_port == WIRE_PORT) if (!rx && value->misc.source_port == MLX5_VPORT_UPLINK)
return true; return true;
} }

7
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_types.h
View File

@ -4,7 +4,7 @@
#ifndef _DR_TYPES_ #ifndef _DR_TYPES_
#define _DR_TYPES_ #define _DR_TYPES_
#include <linux/mlx5/driver.h> #include <linux/mlx5/vport.h>
#include <linux/refcount.h> #include <linux/refcount.h>
#include "fs_core.h" #include "fs_core.h"
#include "wq.h" #include "wq.h"
@ -14,7 +14,6 @@
#define DR_RULE_MAX_STES 18 #define DR_RULE_MAX_STES 18
#define DR_ACTION_MAX_STES 5 #define DR_ACTION_MAX_STES 5
#define WIRE_PORT 0xFFFF
#define DR_STE_SVLAN 0x1 #define DR_STE_SVLAN 0x1
#define DR_STE_CVLAN 0x2 #define DR_STE_CVLAN 0x2
#define DR_SZ_MATCH_PARAM (MLX5_ST_SZ_DW_MATCH_PARAM * 4) #define DR_SZ_MATCH_PARAM (MLX5_ST_SZ_DW_MATCH_PARAM * 4)
@ -1106,10 +1105,10 @@ static inline struct mlx5dr_cmd_vport_cap *
mlx5dr_get_vport_cap(struct mlx5dr_cmd_caps *caps, u16 vport) mlx5dr_get_vport_cap(struct mlx5dr_cmd_caps *caps, u16 vport)
{ {
if (!caps->vports_caps || if (!caps->vports_caps ||
(vport >= caps->num_vports && vport != WIRE_PORT)) (vport >= caps->num_vports && vport != MLX5_VPORT_UPLINK))
return NULL; return NULL;
if (vport == WIRE_PORT) if (vport == MLX5_VPORT_UPLINK)
vport = caps->num_vports; vport = caps->num_vports;
return &caps->vports_caps[vport]; return &caps->vports_caps[vport];