From patchwork Mon Jan 1 12:06:29 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: 123033 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp7794881qgn; Mon, 1 Jan 2018 04:07:44 -0800 (PST) X-Google-Smtp-Source: ACJfBovWRuNo8PM9kfSxhqNY+nDbuAaO4lOtWauSSoRrDq3w7ObclxHbWRoCm5VDNlhAeqA6jyO2 X-Received: by 10.98.160.193 with SMTP id p62mr43200622pfl.138.1514808464751; Mon, 01 Jan 2018 04:07:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514808464; cv=none; d=google.com; s=arc-20160816; b=UVHrt9JBft6WxwktQ4R/hXBEvb4YOBB/LLuzoRrIe7Eyqkqscfxw6DNUAdRAXk+h84 GNY8UZAPB/qC6jAPHZhaIhCSMN1VHqEtfUBnK01wmin8chWtDru3lFEiftphj8MVXJVu UWiCxMBfnmvcTRNuxMjc6n2zubm9GOQ2z2GpSFeieBjACy0HSfXpaAxKBrqMs3xntCAB H+6KN1TmjINsUZ72+HdcqzBo6gLL2ASPf/UVMtDB5IB2OwbRTYW6uSpgqFKBTiRSTAUb vH02E/jglzZCMkDOy8OH5I1LvkVB+4fzpOYtK/9piD8n2HbN4yIGUtF0WHaaXI8nbJFo tuOg== 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=Js6W+Bc7l6FRyO7pVNlgDMkmZe3Oikq4Ygyc+R3wbVw=; b=s9qK5Q/aHVITYPHHzhpUBVuUxTdXKqsoJ6ThWt3te3EIs6WuxMFyru8YgcvnVA3Kzg UfvEXNWsEyx4a1pY5htP3zW5KmkjVnnqUQt+rG3R3A+iEMAaPArvrkdpUJN4tnwTwbc3 GKBpOhZ9oWu/JiZpXRTnlw7psPGhCKj0L2+NoyYf6Rh86v4YRwPVOk/sl2EVrFmUMKlH CUj/Z/Lo9bwjEh1MNeNsPQShk8vxSwhCudyUU4D4cUSlzlnGT4Rqbade6M/Tyb8H3k2D 6RgVK8XZpFq12gI6TLb1GcugDFmP1+icaeYyIQOReJWZUPWNEvb4LlBoEboyGivnt9xe qGUw== 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 z8si306050pfh.232.2018.01.01.04.07.44; Mon, 01 Jan 2018 04:07:44 -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 S1751317AbeAAMHj (ORCPT + 28 others); Mon, 1 Jan 2018 07:07:39 -0500 Received: from foss.arm.com ([217.140.101.70]:59038 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750819AbeAAMHe (ORCPT ); Mon, 1 Jan 2018 07:07:34 -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 A534580D; Mon, 1 Jan 2018 04:07:34 -0800 (PST) Received: from sugar.kfn.arm.com (unknown [10.45.48.158]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6394F3F41F; Mon, 1 Jan 2018 04:07:32 -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 02/26] staging: ccree: fold hash defs into queue defs Date: Mon, 1 Jan 2018 12:06:29 +0000 Message-Id: <1514808421-21993-3-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514808421-21993-1-git-send-email-gilad@benyossef.com> References: <1514808421-21993-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 d691141..da5aabc 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 d527e06..0000000 --- a/drivers/staging/ccree/hash_defs.h +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (C) 2012-2017 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 e8d70c8..bf3aec8 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"