svn commit: r361445 - in head/sys/dev/mlx5: . mlx5_core mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Mon May 25 12:31:48 2020
New Revision: 361445
URL: https://svnweb.freebsd.org/changeset/base/361445

Log:
  Update the TLS capability bit after recent PRM changes in mlx5en(4).
  
  A CX6-DX firmware version equal to or newer than 12.27.0372 is
  now required.
  
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/dev/mlx5/mlx5_core/mlx5_fw.c
  head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c
  head/sys/dev/mlx5/mlx5_ifc.h

Modified: head/sys/dev/mlx5/mlx5_core/mlx5_fw.c
==============================================================================
--- head/sys/dev/mlx5/mlx5_core/mlx5_fw.c	Mon May 25 09:52:44 2020	(r361444)
+++ head/sys/dev/mlx5/mlx5_core/mlx5_fw.c	Mon May 25 12:31:48 2020	(r361445)
@@ -227,7 +227,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;

Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c
==============================================================================
--- head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c	Mon May 25 09:52:44 2020	(r361444)
+++ head/sys/dev/mlx5/mlx5_en/mlx5_en_hw_tls.c	Mon May 25 12:31:48 2020	(r361445)
@@ -119,7 +119,7 @@ mlx5e_tls_init(struct mlx5e_priv *priv)
 	struct sysctl_oid *node;
 	uint32_t x;
 
-	if (MLX5_CAP_GEN(priv->mdev, tls) == 0)
+	if (MLX5_CAP_GEN(priv->mdev, tls_tx) == 0)
 		return (0);
 
 	ptls->wq = create_singlethread_workqueue("mlx5-tls-wq");
@@ -161,7 +161,7 @@ mlx5e_tls_cleanup(struct mlx5e_priv *priv)
 	struct mlx5e_tls *ptls = &priv->tls;
 	uint32_t x;
 
-	if (MLX5_CAP_GEN(priv->mdev, tls) == 0)
+	if (MLX5_CAP_GEN(priv->mdev, tls_tx) == 0)
 		return;
 
 	ptls->init = 0;

Modified: head/sys/dev/mlx5/mlx5_ifc.h
==============================================================================
--- head/sys/dev/mlx5/mlx5_ifc.h	Mon May 25 09:52:44 2020	(r361444)
+++ head/sys/dev/mlx5/mlx5_ifc.h	Mon May 25 12:31:48 2020	(r361445)
@@ -1296,14 +1296,15 @@ struct mlx5_ifc_cmd_hca_cap_bits {
 	u8         reserved_at_440[0x8];
 	u8         create_qp_start_hint[0x18];
 
-	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_63[0x3];
+	u8         reserved_at_480[0x1];
+	u8         tls_tx[0x1];
+	u8         reserved_at_482[0x1];
 	u8         log_max_l2_table[0x5];
 	u8         reserved_64[0x8];
 	u8         log_uar_page_sz[0x10];