Commit 80ad41f2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2020-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2020-04-20

This series includes misc updates and clean ups to mlx5 driver:

1) improve some comments from Hu Haowen.
2) Handles errors of netif_set_real_num_{tx,rx}_queues, from Maxim
3) IPsec and FPGA related code cleanup to prepare for ASIC devices
   IPsec offloads, from Raed
4) Allow partial mask for tunnel options, from Roi.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 794867ee 6533380d

drivers/net/ethernet/mellanox/mlx5/core/accel/ipsec.c

+14 −5
Original line number Diff line number Diff line
@@ -58,12 +58,21 @@ int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters, 


void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       const __be32 saddr[4],

				       const __be32 daddr[4],

				       const __be32 spi, bool is_ipv6)

				       u32 *sa_handle)

{

	return mlx5_fpga_ipsec_create_sa_ctx(mdev, xfrm, saddr, daddr,

					     spi, is_ipv6);

	__be32 saddr[4] = {}, daddr[4] = {};



	if (!xfrm->attrs.is_ipv6) {

		saddr[3] = xfrm->attrs.saddr.a4;

		daddr[3] = xfrm->attrs.daddr.a4;

	} else {

		memcpy(saddr, xfrm->attrs.saddr.a6, sizeof(saddr));

		memcpy(daddr, xfrm->attrs.daddr.a6, sizeof(daddr));

	}



	return mlx5_fpga_ipsec_create_sa_ctx(mdev, xfrm, saddr,

					     daddr, xfrm->attrs.spi,

					     xfrm->attrs.is_ipv6, sa_handle);

}



void mlx5_accel_esp_free_hw_context(void *context)

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

+2 −6
Original line number Diff line number Diff line
@@ -48,9 +48,7 @@ int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters, 


void *mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				       struct mlx5_accel_esp_xfrm *xfrm,

				       const __be32 saddr[4],

				       const __be32 daddr[4],

				       const __be32 spi, bool is_ipv6);

				       u32 *sa_handle);

void mlx5_accel_esp_free_hw_context(void *context);



int mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev);
@@ -64,9 +62,7 @@ void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev); 
static inline void *

mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				 struct mlx5_accel_esp_xfrm *xfrm,

				 const __be32 saddr[4],

				 const __be32 daddr[4],

				 const __be32 spi, bool is_ipv6)

				 u32 *sa_handle)

{

	return NULL;

}

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static void mlx5_fw_tracer_handle_traces(struct work_struct *work) 
		get_block_timestamp(tracer, &tmp_trace_block[TRACES_PER_BLOCK - 1]);



	while (block_timestamp > tracer->last_timestamp) {

		/* Check block override if its not the first block */

		/* Check block override if it's not the first block */

		if (!tracer->last_timestamp) {

			u64 *ts_event;

			/* To avoid block override be the HW in case of buffer

drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static inline void 
mlx5e_notify_hw(struct mlx5_wq_cyc *wq, u16 pc, void __iomem *uar_map,

		struct mlx5_wqe_ctrl_seg *ctrl)

{

	ctrl->fm_ce_se = MLX5_WQE_CTRL_CQ_UPDATE;

	ctrl->fm_ce_se |= MLX5_WQE_CTRL_CQ_UPDATE;

	/* ensure wqe is visible to device before updating doorbell record */

	dma_wmb();

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
#include "en/txrx.h"



#if IS_ENABLED(CONFIG_GENEVE)

#include <net/geneve.h>



static inline bool mlx5_geneve_tx_allowed(struct mlx5_core_dev *mdev)

{

	return mlx5_tx_swp_supported(mdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE