From: Gilad Ben-Yossef <gilad@benyossef.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ofir Drang <ofir.drang@arm.com>,
linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org,
driverdev-devel@linuxdriverproject.org,
devel@driverdev.osuosl.org
Subject: [PATCH v3 02/27] staging: ccree: fold hash defs into queue defs
Date: Sun, 7 Jan 2018 12:14:13 +0000 [thread overview]
Message-ID: <1515327285-8948-3-git-send-email-gilad@benyossef.com> (raw)
In-Reply-To: <1515327285-8948-1-git-send-email-gilad@benyossef.com>
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>
---
drivers/staging/ccree/cc_hw_queue_defs.h | 13 +++++++++++++
drivers/staging/ccree/hash_defs.h | 23 -----------------------
drivers/staging/ccree/ssi_driver.h | 1 -
3 files changed, 13 insertions(+), 24 deletions(-)
delete mode 100644 drivers/staging/ccree/hash_defs.h
diff --git a/drivers/staging/ccree/cc_hw_queue_defs.h b/drivers/staging/ccree/cc_hw_queue_defs.h
index 52d32d1..bfc18b3 100644
--- a/drivers/staging/ccree/cc_hw_queue_defs.h
+++ b/drivers/staging/ccree/cc_hw_queue_defs.h
@@ -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 */
/*****************************/
diff --git a/drivers/staging/ccree/hash_defs.h b/drivers/staging/ccree/hash_defs.h
deleted file mode 100644
index 92d5c10..0000000
--- a/drivers/staging/ccree/hash_defs.h
+++ /dev/null
@@ -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_*/
-
diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h
index 7383a83..df805db 100644
--- a/drivers/staging/ccree/ssi_driver.h
+++ b/drivers/staging/ccree/ssi_driver.h
@@ -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"
--
2.7.4
next prev parent reply other threads:[~2018-01-07 12:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-07 12:14 [PATCH v3 00/27] staging: ccree: fixes and cleanups Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 01/27] staging: ccree: SPDXify driver Gilad Ben-Yossef
2018-01-07 12:14 ` Gilad Ben-Yossef [this message]
2018-01-07 12:14 ` [PATCH v3 03/27] staging: ccree: fold reg common defines into driver Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 04/27] staging: ccree: remove GFP_DMA flag from mem allocs Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 05/27] staging: ccree: pick alloc mem flags based on req flags Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 06/27] staging: ccree: copy larval digest from RAM Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 07/27] staging: ccree: tag debugfs init/exit func properly Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 08/27] staging: ccree: remove unused leftover field Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 09/27] staging: ccree: break send_request and fix ret val Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 10/27] staging: ccree: add backlog processing Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 11/27] stating: ccree: revert "staging: ccree: fix leak of import() after init()" Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 12/27] staging: ccree: failing the suspend is not an error Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 13/27] staging: ccree: check DMA pool buf !NULL before free Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 14/27] staging: ccree: handle end of sg list gracefully Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 15/27] staging: ccree: use Makefile to include PM code Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 16/27] staging: ccree: remove unused field Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 17/27] staging: ccree: use array for double buffer Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 18/27] staging: ccree: allocate hash bufs inside req ctx Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 19/27] staging: ccree: do not map bufs in ahash_init Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 20/27] staging: ccree: fix indentation of func params Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 21/27] staging: ccree: fold common code into service func Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 22/27] staging: ccree: put pointer next to var name Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 23/27] stating: ccree: fix allocation of void sized buf Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 24/27] staging: ccree: use a consistent file naming convention Gilad Ben-Yossef
2018-01-08 15:28 ` Greg Kroah-Hartman
2018-01-09 7:42 ` Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 25/27] staging: ccree: remove unneeded includes Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 26/27] staging: ccree: update TODO Gilad Ben-Yossef
2018-01-07 12:14 ` [PATCH v3 27/27] staging: ccree: add missing include Gilad Ben-Yossef
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515327285-8948-3-git-send-email-gilad@benyossef.com \
--to=gilad@benyossef.com \
--cc=devel@driverdev.osuosl.org \
--cc=driverdev-devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ofir.drang@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®