Commit 60c8972d authored by Jianbo Liu's avatar Jianbo Liu Committed by Saeed Mahameed
Browse files

net/mlx5: Change key type to key purpose 



Change the naming of key type in DEK fields and macros, to be
consistent with the device spec.

Signed-off-by: default avatarJianbo Liu <jianbol@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 9a0ed4f2

drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ int mlx5_create_encryption_key(struct mlx5_core_dev *mdev, 
	memcpy(key_p, key, sz_bytes);



	MLX5_SET(encryption_key_obj, obj, key_size, general_obj_key_size);

	MLX5_SET(encryption_key_obj, obj, key_type, key_type);

	MLX5_SET(encryption_key_obj, obj, key_purpose, key_type);

	MLX5_SET(general_obj_in_cmd_hdr, in, opcode,

		 MLX5_CMD_OP_CREATE_GENERAL_OBJECT);

	MLX5_SET(general_obj_in_cmd_hdr, in, obj_type,

drivers/net/ethernet/mellanox/mlx5/core/lib/crypto.h

+3 −3
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
#define __MLX5_LIB_CRYPTO_H__



enum {

	MLX5_ACCEL_OBJ_TLS_KEY = MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_TLS,

	MLX5_ACCEL_OBJ_IPSEC_KEY = MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_IPSEC,

	MLX5_ACCEL_OBJ_MACSEC_KEY = MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_MACSEC,

	MLX5_ACCEL_OBJ_TLS_KEY = MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_TLS,

	MLX5_ACCEL_OBJ_IPSEC_KEY = MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_IPSEC,

	MLX5_ACCEL_OBJ_MACSEC_KEY = MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_MACSEC,

};



int mlx5_create_encryption_key(struct mlx5_core_dev *mdev,

include/linux/mlx5/mlx5_ifc.h

+4 −4
Original line number Diff line number Diff line
@@ -11986,7 +11986,7 @@ struct mlx5_ifc_encryption_key_obj_bits { 
	u8         reserved_at_49[0xb];

	u8         key_size[0x4];

	u8         reserved_at_58[0x4];

	u8         key_type[0x4];

	u8         key_purpose[0x4];



	u8         reserved_at_60[0x8];

	u8         pd[0x18];
@@ -12135,9 +12135,9 @@ enum { 
};



enum {

	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_TLS = 0x1,

	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_IPSEC = 0x2,

	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_TYPE_MACSEC = 0x4,

	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_TLS = 0x1,

	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_IPSEC = 0x2,

	MLX5_GENERAL_OBJECT_TYPE_ENCRYPTION_KEY_PURPOSE_MACSEC = 0x4,

};



struct mlx5_ifc_tls_static_params_bits {