Blame SOURCES/0109-netdrv-net-mlx5-DR-Add-HW-bits-and-definitions-for-G.patch

d8f823
From 05c740d36ff80368cce999cd1f694cfa5dd7ab4b Mon Sep 17 00:00:00 2001
d8f823
From: Alaa Hleihel <ahleihel@redhat.com>
d8f823
Date: Sun, 10 May 2020 15:04:33 -0400
d8f823
Subject: [PATCH 109/312] [netdrv] net/mlx5: DR, Add HW bits and definitions
d8f823
 for Geneve flex parser
d8f823
d8f823
Message-id: <20200510150452.10307-69-ahleihel@redhat.com>
d8f823
Patchwork-id: 306692
d8f823
Patchwork-instance: patchwork
d8f823
O-Subject: [RHEL8.3 BZ 1789380 v2 68/87] net/mlx5: DR, Add HW bits and definitions for Geneve flex parser
d8f823
Bugzilla: 1789380
d8f823
RH-Acked-by: Kamal Heib <kheib@redhat.com>
d8f823
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
d8f823
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
d8f823
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
d8f823
d8f823
Bugzilla: http://bugzilla.redhat.com/1789380
d8f823
Upstream: v5.5-rc1
d8f823
d8f823
commit a18fab48dbacbb7ff104a13e987778b7995bec07
d8f823
Author: Yevgeny Kliteynik <kliteyn@mellanox.com>
d8f823
Date:   Mon Oct 28 16:58:53 2019 +0200
d8f823
d8f823
    net/mlx5: DR, Add HW bits and definitions for Geneve flex parser
d8f823
d8f823
    Add definition for flex parser tunneling header for Geneve.
d8f823
d8f823
    Signed-off-by: Yevgeny Kliteynik <kliteyn@mellanox.com>
d8f823
    Reviewed-by: Alex Vesker <valex@mellanox.com>
d8f823
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
d8f823
d8f823
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
d8f823
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
d8f823
---
d8f823
 .../net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h  | 13 +++++++++++++
d8f823
 include/linux/mlx5/mlx5_ifc.h                               |  1 +
d8f823
 2 files changed, 14 insertions(+)
d8f823
d8f823
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h
d8f823
index 6d78b027fe56..1722f4668269 100644
d8f823
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h
d8f823
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5_ifc_dr.h
d8f823
@@ -559,6 +559,19 @@ struct mlx5_ifc_ste_flex_parser_tnl_vxlan_gpe_bits {
d8f823
 	u8         reserved_at_40[0x40];
d8f823
 };
d8f823
 
d8f823
+struct mlx5_ifc_ste_flex_parser_tnl_geneve_bits {
d8f823
+	u8         reserved_at_0[0x2];
d8f823
+	u8         geneve_opt_len[0x6];
d8f823
+	u8         geneve_oam[0x1];
d8f823
+	u8         reserved_at_9[0x7];
d8f823
+	u8         geneve_protocol_type[0x10];
d8f823
+
d8f823
+	u8         geneve_vni[0x18];
d8f823
+	u8         reserved_at_38[0x8];
d8f823
+
d8f823
+	u8         reserved_at_40[0x40];
d8f823
+};
d8f823
+
d8f823
 struct mlx5_ifc_ste_general_purpose_bits {
d8f823
 	u8         general_purpose_lookup_field[0x20];
d8f823
 
d8f823
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
d8f823
index a77ca587c3cc..4c703796c233 100644
d8f823
--- a/include/linux/mlx5/mlx5_ifc.h
d8f823
+++ b/include/linux/mlx5/mlx5_ifc.h
d8f823
@@ -1113,6 +1113,7 @@ enum {
d8f823
 };
d8f823
 
d8f823
 enum {
d8f823
+	MLX5_FLEX_PARSER_GENEVE_ENABLED		= 1 << 3,
d8f823
 	MLX5_FLEX_PARSER_VXLAN_GPE_ENABLED	= 1 << 7,
d8f823
 	MLX5_FLEX_PARSER_ICMP_V4_ENABLED	= 1 << 8,
d8f823
 	MLX5_FLEX_PARSER_ICMP_V6_ENABLED	= 1 << 9,
d8f823
-- 
d8f823
2.13.6
d8f823