From patchwork Wed Jan 3 13:35:09 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: 123300 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp10180125qgn; Wed, 3 Jan 2018 05:36:20 -0800 (PST) X-Google-Smtp-Source: ACJfBos6g+IUOfw3m9jxqZa6xquZxFnsQ9FjN55luzgxgv8ijuXZzpggcRTlLT0PbePonlwPlRfv X-Received: by 10.99.114.14 with SMTP id n14mr1289727pgc.308.1514986580234; Wed, 03 Jan 2018 05:36:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514986580; cv=none; d=google.com; s=arc-20160816; b=KSgQ2s8JrVE6Bq6KUHZ5DXfYX7XMnX6wYHHww3X2tbeIC0nQOfIApcmHC3YzWSo8QK G3QkQxKxr2mozaADtjxJp/q5qqRMg2arpJsH4Pe3VVXpcVBM/WxI0vLKMSOYSFpIZuL0 MOIMuU50rx4r+9+Sd+WBxlpCzS3xXOIz3gnZAnPS7ZwBN2Bw6VDXt9TEIKypd0YrIouY SA6I139FiP/7UhHq0a0T+59wIPLXQ0KOIIt6wEV9PPKI7g56v2GOGKzyPHCPDECRbJXz AUjp1Gyx+9FfCzsky6Z5XlY++IEQc+VggPc6pwTGpm6nrJTAO3nSKR2hjDRNbN5Vy3RT fL+w== 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=Yhe/mLq+ggybLAqiuNJk1zpNjoxa9bXF+I2k3yfZk6k=; b=ZUAwklRkdyHMWtQkfDihlHEixytcFUKngtg0sKL/8Yc8JD4Pp3C0zDVQx4I3YidPOT rzXMCVkF5ePLlNHHwqWAhdg0HzQ4DrZZUE45rxJCA7dVPhdCkWtyOTiCRU7XPhlrBxGV lqC3wsneF6lGMezAkL6dfP5qCFH1hGE9FyCkg9CG/C2uHpqIQH3JEH+ZO6GY4bC07efG /2M41OWExfa6kFz+kwzpres/mUH7HQ1L8dMJqv8LyvXu4BSHBaGCCCCnj/SrMl603uMd 8G4gBXAatGRCF6h4TduXWKlhtTpoMkNhDV/1PYBJJ3qnuQIJVYTP5hi70YZL36PjHo+4 NgWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-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 r80si726949pfk.216.2018.01.03.05.36.20; Wed, 03 Jan 2018 05:36:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-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-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752690AbeACNgS (ORCPT + 1 other); Wed, 3 Jan 2018 08:36:18 -0500 Received: from foss.arm.com ([217.140.101.70]:49966 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752680AbeACNgR (ORCPT ); Wed, 3 Jan 2018 08:36:17 -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 1B1A91529; Wed, 3 Jan 2018 05:36:17 -0800 (PST) Received: from sugar.kfn.arm.com (unknown [10.45.48.137]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8E2CE3F24A; Wed, 3 Jan 2018 05:36:15 -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 v2 02/27] staging: ccree: fold hash defs into queue defs Date: Wed, 3 Jan 2018 13:35:09 +0000 Message-Id: <1514986544-5888-3-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514986544-5888-1-git-send-email-gilad@benyossef.com> References: <1514986544-5888-1-git-send-email-gilad@benyossef.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@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 c06c791..79782976 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 efe403c..0000000 --- a/drivers/staging/ccree/hash_defs.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* 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 e0cd7b4..b978862 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"