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.
107 lines
4.0 KiB
107 lines
4.0 KiB
From f7b14b69355d929a435c95b1d3821ea74dc91919 Mon Sep 17 00:00:00 2001
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
|
Date: Tue, 12 May 2020 10:54:16 -0400
|
|
Subject: [PATCH 153/312] [netdrv] net/mlx5: Deprecate usage of generic TLS HW
|
|
capability bit
|
|
|
|
Message-id: <20200512105530.4207-51-ahleihel@redhat.com>
|
|
Patchwork-id: 306923
|
|
Patchwork-instance: patchwork
|
|
O-Subject: [RHEL8.3 BZ 1789382 050/124] net/mlx5: Deprecate usage of generic TLS HW capability bit
|
|
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 61c00cca41aeeaa8e5263c2f81f28534bc1efafb
|
|
Author: Tariq Toukan <tariqt@mellanox.com>
|
|
Date: Mon Jan 27 14:18:14 2020 +0200
|
|
|
|
net/mlx5: Deprecate usage of generic TLS HW capability bit
|
|
|
|
Deprecate the generic TLS cap bit, use the new TX-specific
|
|
TLS cap bit instead.
|
|
|
|
Fixes: a12ff35e0fb7 ("net/mlx5: Introduce TLS TX offload hardware bits and structures")
|
|
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
|
|
Reviewed-by: Eran Ben Elisha <eranbe@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>
|
|
---
|
|
drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h | 2 +-
|
|
drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c | 2 +-
|
|
drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +-
|
|
include/linux/mlx5/mlx5_ifc.h | 7 ++++---
|
|
4 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h b/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h
|
|
index d787bc0a4155..e09bc3858d57 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h
|
|
@@ -45,7 +45,7 @@ void mlx5_ktls_destroy_key(struct mlx5_core_dev *mdev, u32 key_id);
|
|
|
|
static inline bool mlx5_accel_is_ktls_device(struct mlx5_core_dev *mdev)
|
|
{
|
|
- if (!MLX5_CAP_GEN(mdev, tls))
|
|
+ if (!MLX5_CAP_GEN(mdev, tls_tx))
|
|
return false;
|
|
|
|
if (!MLX5_CAP_GEN(mdev, log_max_dek))
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c
|
|
index 71384ad1a443..ef1ed15a53b4 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c
|
|
@@ -269,7 +269,7 @@ struct sk_buff *mlx5e_tls_handle_tx_skb(struct net_device *netdev,
|
|
int datalen;
|
|
u32 skb_seq;
|
|
|
|
- if (MLX5_CAP_GEN(sq->channel->mdev, tls)) {
|
|
+ if (MLX5_CAP_GEN(sq->channel->mdev, tls_tx)) {
|
|
skb = mlx5e_ktls_handle_tx_skb(netdev, sq, skb, wqe, pi);
|
|
goto out;
|
|
}
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fw.c b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
|
|
index c375edfe528c..67c7c07d471a 100644
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/fw.c
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fw.c
|
|
@@ -239,7 +239,7 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev)
|
|
return err;
|
|
}
|
|
|
|
- if (MLX5_CAP_GEN(dev, tls)) {
|
|
+ if (MLX5_CAP_GEN(dev, tls_tx)) {
|
|
err = mlx5_core_get_caps(dev, MLX5_CAP_TLS);
|
|
if (err)
|
|
return err;
|
|
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
|
|
index 60d1b97197ac..cfe89228ca78 100644
|
|
--- a/include/linux/mlx5/mlx5_ifc.h
|
|
+++ b/include/linux/mlx5/mlx5_ifc.h
|
|
@@ -1449,14 +1449,15 @@ struct mlx5_ifc_cmd_hca_cap_bits {
|
|
|
|
u8 reserved_at_440[0x20];
|
|
|
|
- u8 tls[0x1];
|
|
- u8 reserved_at_461[0x2];
|
|
+ u8 reserved_at_460[0x3];
|
|
u8 log_max_uctx[0x5];
|
|
u8 reserved_at_468[0x3];
|
|
u8 log_max_umem[0x5];
|
|
u8 max_num_eqs[0x10];
|
|
|
|
- u8 reserved_at_480[0x3];
|
|
+ u8 reserved_at_480[0x1];
|
|
+ u8 tls_tx[0x1];
|
|
+ u8 reserved_at_482[0x1];
|
|
u8 log_max_l2_table[0x5];
|
|
u8 reserved_at_488[0x8];
|
|
u8 log_uar_page_sz[0x10];
|
|
--
|
|
2.13.6
|
|
|