Commit 0d5bfebf authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux 

Saeed Mahameed says:

====================
updates from mlx5-next 2022-09-24

Updates form mlx5-next including[1]:

1) HW definitions and support for NPPS clock settings.

2) various cleanups

3) Enable hash mode by default for all NICs

4) page tracker and advanced virtualization HW definitions for vfio

[1] https://lore.kernel.org/netdev/20220907233636.388475-1-saeed@kernel.org/

* 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux:
  net/mlx5: Remove from FPGA IFC file not-needed definitions
  net/mlx5: Remove unused structs
  net/mlx5: Remove unused functions
  net/mlx5: detect and enable bypass port select flow table
  net/mlx5: Lag, enable hash mode by default for all NICs
  net/mlx5: Lag, set active ports if support bypass port select flow table
  RDMA/mlx5: Don't set tx affinity when lag is in hash mode
  net/mlx5: add IFC bits for bypassing port select flow table
  net/mlx5: Add support for NPPS with real time mode
  net/mlx5: Expose NPPS related registers
  net/mlx5: Query ADV_VIRTUALIZATION capabilities
  net/mlx5: Introduce ifc bits for page tracker
  RDMA/mlx5: Move function mlx5_core_query_ib_ppcnt() to mlx5_ib
====================

Link: https://lore.kernel.org/all/20220927201906.234015-1-saeed@kernel.org/


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d4ddeefa 9175d810

drivers/infiniband/hw/mlx5/mad.c

+23 −2
Original line number Diff line number Diff line
@@ -147,6 +147,28 @@ static void pma_cnt_assign(struct ib_pma_portcounters *pma_cnt, 
			     vl_15_dropped);

}



static int query_ib_ppcnt(struct mlx5_core_dev *dev, u8 port_num, void *out,

			  size_t sz)

{

	u32 *in;

	int err;



	in  = kvzalloc(sz, GFP_KERNEL);

	if (!in) {

		err = -ENOMEM;

		return err;

	}



	MLX5_SET(ppcnt_reg, in, local_port, port_num);



	MLX5_SET(ppcnt_reg, in, grp, MLX5_INFINIBAND_PORT_COUNTERS_GROUP);

	err = mlx5_core_access_reg(dev, in, sz, out,

				   sz, MLX5_REG_PPCNT, 0, 0);



	kvfree(in);

	return err;

}



static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num,

			   const struct ib_mad *in_mad, struct ib_mad *out_mad)

{
@@ -208,8 +230,7 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u32 port_num, 
			goto done;

		}



		err = mlx5_core_query_ib_ppcnt(mdev, mdev_port_num,

					       out_cnt, sz);

		err = query_ib_ppcnt(mdev, mdev_port_num, out_cnt, sz);

		if (!err)

			pma_cnt_assign(pma_cnt, out_cnt);

	}

drivers/infiniband/hw/mlx5/mlx5_ib.h

+12 −0
Original line number Diff line number Diff line
@@ -1541,6 +1541,18 @@ int mlx5_ib_test_wc(struct mlx5_ib_dev *dev); 


static inline bool mlx5_ib_lag_should_assign_affinity(struct mlx5_ib_dev *dev)

{

	/*

	 * If the driver is in hash mode and the port_select_flow_table_bypass cap

	 * is supported, it means that the driver no longer needs to assign the port

	 * affinity by default. If a user wants to set the port affinity explicitly,

	 * the user has a dedicated API to do that, so there is no need to assign

	 * the port affinity by default.

	 */

	if (dev->lag_active &&

	    mlx5_lag_mode_is_hash(dev->mdev) &&

	    MLX5_CAP_PORT_SELECTION(dev->mdev, port_select_flow_table_bypass))

		return 0;



	return dev->lag_active ||

		(MLX5_CAP_GEN(dev->mdev, num_lag_ports) > 1 &&

		 MLX5_CAP_GEN(dev->mdev, lag_tx_port_affinity));

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h

+0 −5
Original line number Diff line number Diff line
@@ -77,11 +77,6 @@ static inline bool mlx5_ipsec_is_rx_flow(struct mlx5_cqe64 *cqe) 
	return MLX5_IPSEC_METADATA_MARKER(be32_to_cpu(cqe->ft_metadata));

}



static inline bool mlx5e_ipsec_is_tx_flow(struct mlx5e_accel_tx_ipsec_state *ipsec_st)

{

	return ipsec_st->x;

}



static inline bool mlx5e_ipsec_eseg_meta(struct mlx5_wqe_eth_seg *eseg)

{

	return eseg->flow_table_metadata & cpu_to_be32(MLX5_ETH_WQE_FT_META_IPSEC);

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

+6 −0
Original line number Diff line number Diff line
@@ -280,6 +280,12 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev) 
			return err;

	}



	if (MLX5_CAP_GEN(dev, adv_virtualization)) {

		err = mlx5_core_get_caps(dev, MLX5_CAP_ADV_VIRTUALIZATION);

		if (err)

			return err;

	}



	return 0;

}

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

+0 −7
Original line number Diff line number Diff line
@@ -875,13 +875,6 @@ void mlx5_drain_health_wq(struct mlx5_core_dev *dev) 
	cancel_work_sync(&health->fatal_report_work);

}



void mlx5_health_flush(struct mlx5_core_dev *dev)

{

	struct mlx5_core_health *health = &dev->priv.health;



	flush_workqueue(health->wq);

}



void mlx5_health_cleanup(struct mlx5_core_dev *dev)

{

	struct mlx5_core_health *health = &dev->priv.health;