Skip to content

Commit 61c00cc

Browse files
Tariq ToukanSaeed Mahameed
authored andcommitted
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: a12ff35 ("net/mlx5: Introduce TLS TX offload hardware bits and structures") Signed-off-by: Tariq Toukan <[email protected]> Reviewed-by: Eran Ben Elisha <[email protected]> Signed-off-by: Saeed Mahameed <[email protected]>
1 parent b57e66a commit 61c00cc

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void mlx5_ktls_destroy_key(struct mlx5_core_dev *mdev, u32 key_id);
4545

4646
static inline bool mlx5_accel_is_ktls_device(struct mlx5_core_dev *mdev)
4747
{
48-
if (!MLX5_CAP_GEN(mdev, tls))
48+
if (!MLX5_CAP_GEN(mdev, tls_tx))
4949
return false;
5050

5151
if (!MLX5_CAP_GEN(mdev, log_max_dek))

drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ struct sk_buff *mlx5e_tls_handle_tx_skb(struct net_device *netdev,
269269
int datalen;
270270
u32 skb_seq;
271271

272-
if (MLX5_CAP_GEN(sq->channel->mdev, tls)) {
272+
if (MLX5_CAP_GEN(sq->channel->mdev, tls_tx)) {
273273
skb = mlx5e_ktls_handle_tx_skb(netdev, sq, skb, wqe, pi);
274274
goto out;
275275
}

drivers/net/ethernet/mellanox/mlx5/core/fw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev)
242242
return err;
243243
}
244244

245-
if (MLX5_CAP_GEN(dev, tls)) {
245+
if (MLX5_CAP_GEN(dev, tls_tx)) {
246246
err = mlx5_core_get_caps(dev, MLX5_CAP_TLS);
247247
if (err)
248248
return err;

include/linux/mlx5/mlx5_ifc.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,14 +1448,15 @@ struct mlx5_ifc_cmd_hca_cap_bits {
14481448

14491449
u8 reserved_at_440[0x20];
14501450

1451-
u8 tls[0x1];
1452-
u8 reserved_at_461[0x2];
1451+
u8 reserved_at_460[0x3];
14531452
u8 log_max_uctx[0x5];
14541453
u8 reserved_at_468[0x3];
14551454
u8 log_max_umem[0x5];
14561455
u8 max_num_eqs[0x10];
14571456

1458-
u8 reserved_at_480[0x3];
1457+
u8 reserved_at_480[0x1];
1458+
u8 tls_tx[0x1];
1459+
u8 reserved_at_482[0x1];
14591460
u8 log_max_l2_table[0x5];
14601461
u8 reserved_at_488[0x8];
14611462
u8 log_uar_page_sz[0x10];

0 commit comments

Comments
 (0)