Commit f9f93bd5 authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Saeed Mahameed

net/mlx5: DR, Fix vport number data type to u16

According to the HW spec, vport number is a 16-bit value.
Fix vport usage all over the code to u16 data type.
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: default avatarMuhammad Sammar <muhammads@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent dd9a887b
...@@ -1747,7 +1747,7 @@ mlx5dr_action_create_modify_header(struct mlx5dr_domain *dmn, ...@@ -1747,7 +1747,7 @@ mlx5dr_action_create_modify_header(struct mlx5dr_domain *dmn,
struct mlx5dr_action * struct mlx5dr_action *
mlx5dr_action_create_dest_vport(struct mlx5dr_domain *dmn, mlx5dr_action_create_dest_vport(struct mlx5dr_domain *dmn,
u32 vport, u8 vhca_id_valid, u16 vport, u8 vhca_id_valid,
u16 vhca_id) u16 vhca_id)
{ {
struct mlx5dr_cmd_vport_cap *vport_cap; struct mlx5dr_cmd_vport_cap *vport_cap;
......
...@@ -272,7 +272,7 @@ int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev, ...@@ -272,7 +272,7 @@ int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev,
u32 table_id, u32 table_id,
u32 group_id, u32 group_id,
u32 modify_header_id, u32 modify_header_id,
u32 vport_id) u16 vport)
{ {
u32 out[MLX5_ST_SZ_DW(set_fte_out)] = {}; u32 out[MLX5_ST_SZ_DW(set_fte_out)] = {};
void *in_flow_context; void *in_flow_context;
...@@ -303,7 +303,7 @@ int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev, ...@@ -303,7 +303,7 @@ int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev,
in_dests = MLX5_ADDR_OF(flow_context, in_flow_context, destination); in_dests = MLX5_ADDR_OF(flow_context, in_flow_context, destination);
MLX5_SET(dest_format_struct, in_dests, destination_type, MLX5_SET(dest_format_struct, in_dests, destination_type,
MLX5_FLOW_DESTINATION_TYPE_VPORT); MLX5_FLOW_DESTINATION_TYPE_VPORT);
MLX5_SET(dest_format_struct, in_dests, destination_id, vport_id); MLX5_SET(dest_format_struct, in_dests, destination_id, vport);
err = mlx5_cmd_exec(mdev, in, inlen, out, sizeof(out)); err = mlx5_cmd_exec(mdev, in, inlen, out, sizeof(out));
kvfree(in); kvfree(in);
......
...@@ -38,7 +38,7 @@ static void dr_domain_uninit_cache(struct mlx5dr_domain *dmn) ...@@ -38,7 +38,7 @@ static void dr_domain_uninit_cache(struct mlx5dr_domain *dmn)
} }
int mlx5dr_domain_cache_get_recalc_cs_ft_addr(struct mlx5dr_domain *dmn, int mlx5dr_domain_cache_get_recalc_cs_ft_addr(struct mlx5dr_domain *dmn,
u32 vport_num, u16 vport_num,
u64 *rx_icm_addr) u64 *rx_icm_addr)
{ {
struct mlx5dr_fw_recalc_cs_ft *recalc_cs_ft; struct mlx5dr_fw_recalc_cs_ft *recalc_cs_ft;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "dr_types.h" #include "dr_types.h"
struct mlx5dr_fw_recalc_cs_ft * struct mlx5dr_fw_recalc_cs_ft *
mlx5dr_fw_create_recalc_cs_ft(struct mlx5dr_domain *dmn, u32 vport_num) mlx5dr_fw_create_recalc_cs_ft(struct mlx5dr_domain *dmn, u16 vport_num)
{ {
struct mlx5dr_cmd_create_flow_table_attr ft_attr = {}; struct mlx5dr_cmd_create_flow_table_attr ft_attr = {};
struct mlx5dr_fw_recalc_cs_ft *recalc_cs_ft; struct mlx5dr_fw_recalc_cs_ft *recalc_cs_ft;
......
...@@ -752,9 +752,9 @@ struct mlx5dr_esw_caps { ...@@ -752,9 +752,9 @@ struct mlx5dr_esw_caps {
struct mlx5dr_cmd_vport_cap { struct mlx5dr_cmd_vport_cap {
u16 vport_gvmi; u16 vport_gvmi;
u16 vhca_gvmi; u16 vhca_gvmi;
u16 num;
u64 icm_address_rx; u64 icm_address_rx;
u64 icm_address_tx; u64 icm_address_tx;
u32 num;
}; };
struct mlx5dr_roce_cap { struct mlx5dr_roce_cap {
...@@ -1103,7 +1103,7 @@ mlx5dr_ste_htbl_may_grow(struct mlx5dr_ste_htbl *htbl) ...@@ -1103,7 +1103,7 @@ mlx5dr_ste_htbl_may_grow(struct mlx5dr_ste_htbl *htbl)
} }
static inline struct mlx5dr_cmd_vport_cap * static inline struct mlx5dr_cmd_vport_cap *
mlx5dr_get_vport_cap(struct mlx5dr_cmd_caps *caps, u32 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 != WIRE_PORT))
...@@ -1154,7 +1154,7 @@ int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev, ...@@ -1154,7 +1154,7 @@ int mlx5dr_cmd_set_fte_modify_and_vport(struct mlx5_core_dev *mdev,
u32 table_id, u32 table_id,
u32 group_id, u32 group_id,
u32 modify_header_id, u32 modify_header_id,
u32 vport_id); u16 vport_id);
int mlx5dr_cmd_del_flow_table_entry(struct mlx5_core_dev *mdev, int mlx5dr_cmd_del_flow_table_entry(struct mlx5_core_dev *mdev,
u32 table_type, u32 table_type,
u32 table_id); u32 table_id);
...@@ -1372,11 +1372,11 @@ struct mlx5dr_fw_recalc_cs_ft { ...@@ -1372,11 +1372,11 @@ struct mlx5dr_fw_recalc_cs_ft {
}; };
struct mlx5dr_fw_recalc_cs_ft * struct mlx5dr_fw_recalc_cs_ft *
mlx5dr_fw_create_recalc_cs_ft(struct mlx5dr_domain *dmn, u32 vport_num); mlx5dr_fw_create_recalc_cs_ft(struct mlx5dr_domain *dmn, u16 vport_num);
void mlx5dr_fw_destroy_recalc_cs_ft(struct mlx5dr_domain *dmn, void mlx5dr_fw_destroy_recalc_cs_ft(struct mlx5dr_domain *dmn,
struct mlx5dr_fw_recalc_cs_ft *recalc_cs_ft); struct mlx5dr_fw_recalc_cs_ft *recalc_cs_ft);
int mlx5dr_domain_cache_get_recalc_cs_ft_addr(struct mlx5dr_domain *dmn, int mlx5dr_domain_cache_get_recalc_cs_ft_addr(struct mlx5dr_domain *dmn,
u32 vport_num, u16 vport_num,
u64 *rx_icm_addr); u64 *rx_icm_addr);
int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn, int mlx5dr_fw_create_md_tbl(struct mlx5dr_domain *dmn,
struct mlx5dr_cmd_flow_destination_hw_info *dest, struct mlx5dr_cmd_flow_destination_hw_info *dest,
......
...@@ -89,7 +89,7 @@ mlx5dr_action_create_dest_flow_fw_table(struct mlx5dr_domain *domain, ...@@ -89,7 +89,7 @@ mlx5dr_action_create_dest_flow_fw_table(struct mlx5dr_domain *domain,
struct mlx5dr_action * struct mlx5dr_action *
mlx5dr_action_create_dest_vport(struct mlx5dr_domain *domain, mlx5dr_action_create_dest_vport(struct mlx5dr_domain *domain,
u32 vport, u8 vhca_id_valid, u16 vport, u8 vhca_id_valid,
u16 vhca_id); u16 vhca_id);
struct mlx5dr_action * struct mlx5dr_action *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment