Commit 54deb0e7 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Remove not-needed IPsec config 

In current code, the CONFIG_MLX5_IPSEC and CONFIG_MLX5_EN_IPSEC are
the same. So remove useless indirection.

Link: https://lore.kernel.org/r/fd14492cbc01a0d51a5bfedde02bcd2154123fde.1649232994.git.leonro@nvidia.com


Reviewed-by: default avatarRaed Salem <raeds@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
parent a6a9eaf1

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −15
Original line number Diff line number Diff line
@@ -142,28 +142,14 @@ config MLX5_CORE_IPOIB 
	help

	  MLX5 IPoIB offloads & acceleration support.



config MLX5_IPSEC

config MLX5_EN_IPSEC

	bool "Mellanox Technologies IPsec Connect-X support"

	depends on MLX5_CORE_EN

	depends on XFRM_OFFLOAD

	depends on INET_ESP_OFFLOAD || INET6_ESP_OFFLOAD

	select MLX5_ACCEL

	help

	Build IPsec support for the Connect-X family of network cards by Mellanox

	Technologies.

	Note: If you select this option, the mlx5_core driver will include

	IPsec support for the Connect-X family.



config MLX5_EN_IPSEC

	bool "IPSec XFRM cryptography-offload acceleration"

	depends on MLX5_CORE_EN

	depends on XFRM_OFFLOAD

	depends on INET_ESP_OFFLOAD || INET6_ESP_OFFLOAD

	depends on MLX5_IPSEC

	help

	  Build support for IPsec cryptography-offload acceleration in the NIC.

	  Note: Support for hardware with this capability needs to be selected

	  for this option to become available.



config MLX5_EN_TLS

	bool "Mellanox Technologies TLS Connect-X support"

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -88,13 +88,13 @@ mlx5_core-$(CONFIG_MLX5_CORE_IPOIB) += ipoib/ipoib.o ipoib/ethtool.o ipoib/ipoib 
#

# Accelerations & FPGA

#

mlx5_core-$(CONFIG_MLX5_IPSEC) += accel/ipsec_offload.o

mlx5_core-$(CONFIG_MLX5_ACCEL) += lib/crypto.o



mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o



mlx5_core-$(CONFIG_MLX5_EN_IPSEC) += en_accel/ipsec.o en_accel/ipsec_rxtx.o \

				     en_accel/ipsec_stats.o en_accel/ipsec_fs.o

				     en_accel/ipsec_stats.o en_accel/ipsec_fs.o \

				     accel/ipsec_offload.o



mlx5_core-$(CONFIG_MLX5_EN_TLS) += en_accel/ktls_stats.o \

				   en_accel/fs_tcp.o en_accel/ktls.o en_accel/ktls_txrx.o \

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

+2 −16
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/mlx5/driver.h>

#include <linux/mlx5/accel.h>



#ifdef CONFIG_MLX5_IPSEC

#ifdef CONFIG_MLX5_EN_IPSEC



unsigned int mlx5_accel_ipsec_counters_count(struct mlx5_core_dev *mdev);

int mlx5_accel_ipsec_counters_read(struct mlx5_core_dev *mdev, u64 *counters,
@@ -42,22 +42,8 @@ struct mlx5_accel_ipsec_ops { 
};



#else



static inline void *

mlx5_accel_esp_create_hw_context(struct mlx5_core_dev *mdev,

				 struct mlx5_accel_esp_xfrm *xfrm,

				 u32 *sa_handle)

{

	return NULL;

}



static inline void mlx5_accel_esp_free_hw_context(struct mlx5_core_dev *mdev,

						  void *context)

{

}



static inline void mlx5_accel_ipsec_init(struct mlx5_core_dev *mdev) {}



static inline void mlx5_accel_ipsec_cleanup(struct mlx5_core_dev *mdev) {}

#endif /* CONFIG_MLX5_IPSEC */

#endif /* CONFIG_MLX5_EN_IPSEC */

#endif /* __MLX5_IPSEC_OFFLOAD_H__ */

include/linux/mlx5/accel.h

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ enum mlx5_accel_ipsec_cap { 
	MLX5_ACCEL_IPSEC_CAP_TX_IV_IS_ESN	= 1 << 7,

};



#ifdef CONFIG_MLX5_ACCEL

#ifdef CONFIG_MLX5_EN_IPSEC



u32 mlx5_ipsec_device_caps(struct mlx5_core_dev *mdev);
@@ -152,5 +152,5 @@ static inline int 
mlx5_accel_esp_modify_xfrm(struct mlx5_accel_esp_xfrm *xfrm,

			   const struct mlx5_accel_esp_xfrm_attrs *attrs) { return -EOPNOTSUPP; }



#endif /* CONFIG_MLX5_ACCEL */

#endif /* CONFIG_MLX5_EN_IPSEC */

#endif /* __MLX5_ACCEL_H__ */

include/linux/mlx5/driver.h

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ struct mlx5_core_dev { 
#ifdef CONFIG_MLX5_FPGA

	struct mlx5_fpga_device *fpga;

#endif

#ifdef CONFIG_MLX5_ACCEL

#ifdef CONFIG_MLX5_EN_IPSEC

	const struct mlx5_accel_ipsec_ops *ipsec_ops;

#endif

	struct mlx5_clock        clock;