You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
114 lines
3.9 KiB
114 lines
3.9 KiB
From de02021ce3ace07649d7864cfa2521cd565a7d19 Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Tue, 12 May 2020 10:53:59 -0400
|
|
Subject: [PATCH 139/312] [include] net/mlx5: Add mlx5_ifc definitions for
|
|
connection tracking support
|
|
|
|
Message-id: <20200512105530.4207-34-ahleihel@redhat.com>
|
|
Patchwork-id: 306904
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789382 033/124] net/mlx5: Add mlx5_ifc definitions for connection tracking support
|
|
Bugzilla: 1789382
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
|
Upstream: v5.6-rc1
|
|
|
|
commit 822e114b50641d3b57d2eb30939e60d8b4758288
|
|
Author: Paul Blakey <paulb@mellanox.com>
|
|
Date: Mon Apr 1 13:31:32 2019 +0300
|
|
|
|
net/mlx5: Add mlx5_ifc definitions for connection tracking support
|
|
|
|
Add the required hardware definitions to mlx5_ifc:
|
|
ignore_flow_level, registers, copy_header, and fwd_and_modify cap.
|
|
|
|
Signed-off-by: Paul Blakey <paulb@mellanox.com>
|
|
Reviewed-by: Roi Dayan <roid@mellanox.com>
|
|
Reviewed-by: Oz Sholomo <ozsh@mellanox.com>
|
|
Reviewed-by: Mark Bloch <markb@mellanox.com>
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
|
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
|
---
|
|
include/linux/mlx5/mlx5_ifc.h | 24 ++++++++++++++++++++----
|
|
1 file changed, 20 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
|
|
index ef0ed32db813..5b9d2eb36ad4 100644
|
|
--- a/include/linux/mlx5/mlx5_ifc.h
|
|
+++ b/include/linux/mlx5/mlx5_ifc.h
|
|
@@ -375,8 +375,17 @@ struct mlx5_ifc_flow_table_fields_supported_bits {
|
|
u8 outer_esp_spi[0x1];
|
|
u8 reserved_at_58[0x2];
|
|
u8 bth_dst_qp[0x1];
|
|
+ u8 reserved_at_5b[0x5];
|
|
|
|
- u8 reserved_at_5b[0x25];
|
|
+ u8 reserved_at_60[0x18];
|
|
+ u8 metadata_reg_c_7[0x1];
|
|
+ u8 metadata_reg_c_6[0x1];
|
|
+ u8 metadata_reg_c_5[0x1];
|
|
+ u8 metadata_reg_c_4[0x1];
|
|
+ u8 metadata_reg_c_3[0x1];
|
|
+ u8 metadata_reg_c_2[0x1];
|
|
+ u8 metadata_reg_c_1[0x1];
|
|
+ u8 metadata_reg_c_0[0x1];
|
|
};
|
|
|
|
struct mlx5_ifc_flow_table_prop_layout_bits {
|
|
@@ -401,7 +410,8 @@ struct mlx5_ifc_flow_table_prop_layout_bits {
|
|
u8 reformat_l3_tunnel_to_l2[0x1];
|
|
u8 reformat_l2_to_l3_tunnel[0x1];
|
|
u8 reformat_and_modify_action[0x1];
|
|
- u8 reserved_at_15[0x2];
|
|
+ u8 ignore_flow_level[0x1];
|
|
+ u8 reserved_at_16[0x1];
|
|
u8 table_miss_action_domain[0x1];
|
|
u8 termination_table[0x1];
|
|
u8 reserved_at_19[0x7];
|
|
@@ -725,7 +735,9 @@ enum {
|
|
|
|
struct mlx5_ifc_flow_table_eswitch_cap_bits {
|
|
u8 fdb_to_vport_reg_c_id[0x8];
|
|
- u8 reserved_at_8[0xf];
|
|
+ u8 reserved_at_8[0xd];
|
|
+ u8 fdb_modify_header_fwd_to_table[0x1];
|
|
+ u8 reserved_at_16[0x1];
|
|
u8 flow_source[0x1];
|
|
u8 reserved_at_18[0x2];
|
|
u8 multi_fdb_encap[0x1];
|
|
@@ -4022,7 +4034,8 @@ struct mlx5_ifc_set_fte_in_bits {
|
|
u8 reserved_at_a0[0x8];
|
|
u8 table_id[0x18];
|
|
|
|
- u8 reserved_at_c0[0x18];
|
|
+ u8 ignore_flow_level[0x1];
|
|
+ u8 reserved_at_c1[0x17];
|
|
u8 modify_enable_mask[0x8];
|
|
|
|
u8 reserved_at_e0[0x20];
|
|
@@ -5520,6 +5533,7 @@ struct mlx5_ifc_copy_action_in_bits {
|
|
union mlx5_ifc_set_action_in_add_action_in_auto_bits {
|
|
struct mlx5_ifc_set_action_in_bits set_action_in;
|
|
struct mlx5_ifc_add_action_in_bits add_action_in;
|
|
+ struct mlx5_ifc_copy_action_in_bits copy_action_in;
|
|
u8 reserved_at_0[0x40];
|
|
};
|
|
|
|
@@ -5562,6 +5576,8 @@ enum {
|
|
MLX5_ACTION_IN_FIELD_METADATA_REG_C_3 = 0x54,
|
|
MLX5_ACTION_IN_FIELD_METADATA_REG_C_4 = 0x55,
|
|
MLX5_ACTION_IN_FIELD_METADATA_REG_C_5 = 0x56,
|
|
+ MLX5_ACTION_IN_FIELD_METADATA_REG_C_6 = 0x57,
|
|
+ MLX5_ACTION_IN_FIELD_METADATA_REG_C_7 = 0x58,
|
|
MLX5_ACTION_IN_FIELD_OUT_TCP_SEQ_NUM = 0x59,
|
|
MLX5_ACTION_IN_FIELD_OUT_TCP_ACK_NUM = 0x5B,
|
|
};
|
|
--
|
|
2.13.6
|
|
|