From patchwork Sun Jan 7 12:14:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 123646 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1546715qgn; Sun, 7 Jan 2018 04:16:01 -0800 (PST) X-Google-Smtp-Source: ACJfBoshXm7xXEnQmNpdx9QWcHJW+1oAC55HCAnAdcO8ezzt8CtdQEHpS8mS4ZpWgdZOGOeeRZKy X-Received: by 10.84.133.7 with SMTP id 7mr8694491plf.61.1515327361381; Sun, 07 Jan 2018 04:16:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515327361; cv=none; d=google.com; s=arc-20160816; b=RZiKzV/wwX/a86VvCMiN6H6Twn/XoUvobOmdkqTFgid7P2fFYEm6Np9hqvbpdA+pNq reXZIeI3mxw/Ru1P3Edlo84+DRYDGAgxVyYGySJyq6dqI6HaqgYQk6OV2+efdkga52je 2mvqd2ODgNw/sANwvqIfGG3Yt5KZPA14zSunFAA4i7sfZMmwq2muq/35HzrJrUVWPiYP PI7Ki6W6ZplkS9VLOnewJbEuNWOagp3s6XPoOMGvL5qZKrkRbFXr2ruJjjVo4Rhwdt1g oJTgdt4mh81ZIHBNMHZ2ssQSWVj7kMKto+3Ty+i8ruy/74QISqy7MYRWAif4+84Ucyfm CQ0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=2ctu+RtGUy7WPlQAxxOUPLeJN7ObUpdkbLn50soQ47k=; b=AmB7q1pFJPppivJzdmb0PVUUVdjGt7YE10lwY4MV7AOvuKtfTlLlz+T76zL+5eFek4 lVj2xnxJueB5MMm8tFsl4ENSnnATL9C3MUsNnAyjSO5QITseJioa70b4GGT0ixWey5mA Z76OodQIJXyzNKh6Bswpa5OPCN4R+p3ulsq9F6Ehvymx5VpWRMbXr7urGI7I+MA7VfDN vsRL4q5lh+Ad1zZqZJmAidEZK+sViIk3QqSlJ4jHOQPx9yCSpYGyhroMCpWlSbB5XAEu ND2cf0/58gLXWKrvMjDUgDga7E9Vbq3sxKDEuyaA7wTpXCNO7AOhbcZ9nRDuPTc2WuQ7 bnqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j6si6115408pgv.665.2018.01.07.04.16.01; Sun, 07 Jan 2018 04:16:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753867AbeAGMP7 (ORCPT + 28 others); Sun, 7 Jan 2018 07:15:59 -0500 Received: from foss.arm.com ([217.140.101.70]:57400 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752944AbeAGMP6 (ORCPT ); Sun, 7 Jan 2018 07:15:58 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C41241435; Sun, 7 Jan 2018 04:15:57 -0800 (PST) Received: from localhost.localdomain (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EB9F53F581; Sun, 7 Jan 2018 04:15:55 -0800 (PST) From: Gilad Ben-Yossef To: Greg Kroah-Hartman Cc: Ofir Drang , 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 Message-Id: <1515327285-8948-3-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515327285-8948-1-git-send-email-gilad@benyossef.com> References: <1515327285-8948-1-git-send-email-gilad@benyossef.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 -- 2.7.4 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"