svn commit: r353247 - stable/12/sys/dev/mlx5/mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Mon Oct  7 09:55:13 2019
New Revision: 353247
URL: https://svnweb.freebsd.org/changeset/base/353247

Log:
  MFC r352987:
  Remove mkey_be from channel structure in mlx5en(4).
  Use value from priv structure instead.
  This saves some space in the channel structure.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/dev/mlx5/mlx5_en/en.h
  stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/en.h	Mon Oct  7 09:54:08 2019	(r353246)
+++ stable/12/sys/dev/mlx5/mlx5_en/en.h	Mon Oct  7 09:55:13 2019	(r353247)
@@ -862,7 +862,6 @@ struct mlx5e_channel {
 	struct mlx5e_rq rq;
 	struct mlx5e_snd_tag tag;
 	struct mlx5e_sq sq[MLX5E_MAX_TX_NUM_TC];
-	u32	mkey_be;
 	u8	num_tc;
 
 	/* control */

Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c	Mon Oct  7 09:54:08 2019	(r353246)
+++ stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c	Mon Oct  7 09:55:13 2019	(r353247)
@@ -1272,7 +1272,7 @@ mlx5e_create_rq(struct mlx5e_channel *c,
 
 		/* set value for constant fields */
 		for (j = 0; j < rq->nsegs; j++)
-			wqe->data[j].lkey = c->mkey_be;
+			wqe->data[j].lkey = cpu_to_be32(priv->mr.key);
 	}
 
 	INIT_WORK(&rq->dim.work, mlx5e_dim_work);
@@ -1628,7 +1628,7 @@ mlx5e_create_sq(struct mlx5e_channel *c,
 	if (err)
 		goto err_sq_wq_destroy;
 
-	sq->mkey_be = c->mkey_be;
+	sq->mkey_be = cpu_to_be32(priv->mr.key);
 	sq->ifp = priv->ifp;
 	sq->priv = priv;
 	sq->tc = tc;
@@ -2158,7 +2158,6 @@ mlx5e_open_channel(struct mlx5e_priv *priv, int ix,
 	/* setup send tag */
 	c->tag.m_snd_tag.ifp = priv->ifp;
 	c->tag.type = IF_SND_TAG_TYPE_UNLIMITED;
-	c->mkey_be = cpu_to_be32(priv->mr.key);
 	c->num_tc = priv->num_tc;
 
 	/* init mutexes */