openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Gilad Ben-Yossef 2018-01-07 12:14:13 +00:00 committed by Greg Kroah-Hartman
parent 70da8241af
commit 977cd76c2d
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/ccree/cc_hw_queue_defs.h
View File

@ -186,6 +186,19 @@ enum cc_hw_des_key_size {
END_OF_DES_KEYS = S32_MAX, 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 */ /* Descriptor packing macros */
/*****************************/ /*****************************/

23
drivers/staging/ccree/hash_defs.h
View File

@ -1,23 +0,0 @@
/* 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_*/

1
drivers/staging/ccree/ssi_driver.h
View File

@ -30,7 +30,6 @@
#include "dx_reg_common.h" #include "dx_reg_common.h"
#define CC_SUPPORT_SHA CC_DEV_SHA_MAX #define CC_SUPPORT_SHA CC_DEV_SHA_MAX
#include "cc_crypto_ctx.h" #include "cc_crypto_ctx.h"
#include "hash_defs.h"
#include "cc_hw_queue_defs.h" #include "cc_hw_queue_defs.h"
#include "ssi_sram_mgr.h" #include "ssi_sram_mgr.h"