Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977cd76c authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: fold hash defs into queue defs 



Fold the two remaining enum in hash defs into the queue defs
that are using them and delete the hash defs include file.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70da8241

drivers/staging/ccree/cc_hw_queue_defs.h

+13 −0
Original line number Diff line number Diff line
@@ -186,6 +186,19 @@ enum cc_hw_des_key_size { 
	END_OF_DES_KEYS = S32_MAX,

};



enum cc_hash_conf_pad {

	HASH_PADDING_DISABLED = 0,

	HASH_PADDING_ENABLED = 1,

	HASH_DIGEST_RESULT_LITTLE_ENDIAN = 2,

	HASH_CONFIG1_PADDING_RESERVE32 = S32_MAX,

};



enum cc_hash_cipher_pad {

	DO_NOT_PAD = 0,

	DO_PAD = 1,

	HASH_CIPHER_DO_PADDING_RESERVE32 = S32_MAX,

};



/*****************************/

/* Descriptor packing macros */

/*****************************/

drivers/staging/ccree/hash_defs.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */



#ifndef _HASH_DEFS_H_

#define _HASH_DEFS_H_



#include "cc_crypto_ctx.h"



enum cc_hash_conf_pad {

	HASH_PADDING_DISABLED = 0,

	HASH_PADDING_ENABLED = 1,

	HASH_DIGEST_RESULT_LITTLE_ENDIAN = 2,

	HASH_CONFIG1_PADDING_RESERVE32 = S32_MAX,

};



enum cc_hash_cipher_pad {

	DO_NOT_PAD = 0,

	DO_PAD = 1,

	HASH_CIPHER_DO_PADDING_RESERVE32 = S32_MAX,

};



#endif /*_HASH_DEFS_H_*/

drivers/staging/ccree/ssi_driver.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "dx_reg_common.h"

#define CC_SUPPORT_SHA CC_DEV_SHA_MAX

#include "cc_crypto_ctx.h"

#include "hash_defs.h"

#include "cc_hw_queue_defs.h"

#include "ssi_sram_mgr.h"