From patchwork Wed Jan 3 13:35:10 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: 123301 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp10180402qgn; Wed, 3 Jan 2018 05:36:36 -0800 (PST) X-Google-Smtp-Source: ACJfBovxBPQcufZTZ8SgSCMeMQ37HgAOLon+2NV+QY/23TFgGXIzFIS4UPq4MkO6CgW9V/I0XRIV X-Received: by 10.101.93.8 with SMTP id e8mr1273294pgr.214.1514986596894; Wed, 03 Jan 2018 05:36:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514986596; cv=none; d=google.com; s=arc-20160816; b=kqzkGE6YdXt7QuSU8/uZUXppOiLrtmv9tKAo1HIb1vJ2Qc9yfN/P9GN6T4NX17MPh2 RkKgsuCmZMGyFuTi31KPdiFkqZ2o3QP4zNy09UEXtIVVYvyrgOheqcVKYziLKFTu3p+n XdJ6kE8qoeGffU8xlke2XOUiiDCZWaZDwOHOGGICb90WORPSMUU/gdiC/We3AmU32IJ0 wgv7r9pQL0CiUWgWDMW42S+aO/mb+qr8MOtl1MXf9l6TJltNwWqLmcFmcPyyyFIQ0eBu QfJngF25ZKei9VsplE436O3kdbpoNxtcqXBdEKhAu1lN+huYlEjaT5jXTRdEQ28iAIcr PTLg== 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=pAzczU5mC8QMEzYkbYDtieIx+jZyVJLnRnnhWKSVQ68=; b=gaGMSvv81RMY0BQ7n8fxdotw0hueVacw7jg6+QG2vB/RLvxhNHbJDyPkh9TvnfM8W8 WOJJ6LFH9D7eh0E4l6dNpR29Z5GeO8ysIcW27jqZikk+aZEbyinwgxwOpwfiyM9XQpWG kX4qIn0iw42zBaK/D6sXSSK2oUdnzdB1X4FIKnzq9d3q1FmVVkpWukC0WUreZKqpqFNy 10OfQHIXWICSM3EWj9W70kruFPdTEF729HTfW84u627xl+JvuOz0UWGDLhAEYUEybApL HOqERrwng80gMRz/2ExzaSTyCcsEuFbJfPVvOJm44hbl5uKrF9cHGRP+rLCg0/esrLEf 5Y4g== 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 t64si649209pgc.258.2018.01.03.05.36.36; Wed, 03 Jan 2018 05:36:36 -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 S1752883AbeACNgc (ORCPT + 28 others); Wed, 3 Jan 2018 08:36:32 -0500 Received: from foss.arm.com ([217.140.101.70]:49980 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751329AbeACNga (ORCPT ); Wed, 3 Jan 2018 08:36:30 -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 A97C11529; Wed, 3 Jan 2018 05:36:29 -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 2D7423F24A; Wed, 3 Jan 2018 05:36:27 -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 03/27] staging: ccree: fold reg common defines into driver Date: Wed, 3 Jan 2018 13:35:10 +0000 Message-Id: <1514986544-5888-4-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fold the 2 macro defined in dx_reg_common.h into the file they are used in and delete the file. Signed-off-by: Gilad Ben-Yossef --- drivers/staging/ccree/cc_crypto_ctx.h | 4 ++-- drivers/staging/ccree/dx_reg_common.h | 13 ------------- drivers/staging/ccree/ssi_driver.h | 5 +++-- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 drivers/staging/ccree/dx_reg_common.h -- 2.7.4 diff --git a/drivers/staging/ccree/cc_crypto_ctx.h b/drivers/staging/ccree/cc_crypto_ctx.h index 1b2698f..88b6e88 100644 --- a/drivers/staging/ccree/cc_crypto_ctx.h +++ b/drivers/staging/ccree/cc_crypto_ctx.h @@ -8,7 +8,7 @@ /* context size */ #ifndef CC_CTX_SIZE_LOG2 -#if (CC_SUPPORT_SHA > 256) +#if (CC_DEV_SHA_MAX > 256) #define CC_CTX_SIZE_LOG2 8 #else #define CC_CTX_SIZE_LOG2 7 @@ -59,7 +59,7 @@ #define CC_SHA384_BLOCK_SIZE 128 #define CC_SHA512_BLOCK_SIZE 128 -#if (CC_SUPPORT_SHA > 256) +#if (CC_DEV_SHA_MAX > 256) #define CC_DIGEST_SIZE_MAX CC_SHA512_DIGEST_SIZE #define CC_HASH_BLOCK_SIZE_MAX CC_SHA512_BLOCK_SIZE /*1024b*/ #else /* Only up to SHA256 */ diff --git a/drivers/staging/ccree/dx_reg_common.h b/drivers/staging/ccree/dx_reg_common.h deleted file mode 100644 index 84184d2..0000000 --- a/drivers/staging/ccree/dx_reg_common.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* Copyright (C) 2012-2018 ARM Limited or its affiliates. */ - -#ifndef __CC_REG_COMMON_H__ -#define __CC_REG_COMMON_H__ - -#define CC_DEV_SIGNATURE 0xDCC71200UL - -#define CC_HW_VERSION 0xef840015UL - -#define CC_DEV_SHA_MAX 512 - -#endif /*__CC_REG_COMMON_H__*/ diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h index b978862..3810740 100644 --- a/drivers/staging/ccree/ssi_driver.h +++ b/drivers/staging/ccree/ssi_driver.h @@ -27,8 +27,7 @@ /* Registers definitions from shared/hw/ree_include */ #include "dx_host.h" -#include "dx_reg_common.h" -#define CC_SUPPORT_SHA CC_DEV_SHA_MAX +#define CC_DEV_SHA_MAX 512 #include "cc_crypto_ctx.h" #include "cc_hw_queue_defs.h" #include "ssi_sram_mgr.h" @@ -44,6 +43,8 @@ extern bool cc_dump_bytes; /* Maximum DMA mask supported by IP */ #define DMA_BIT_MASK_LEN 48 +#define CC_DEV_SIGNATURE 0xDCC71200UL + #define CC_AXI_IRQ_MASK ((1 << CC_AXIM_CFG_BRESPMASK_BIT_SHIFT) | \ (1 << CC_AXIM_CFG_RRESPMASK_BIT_SHIFT) | \ (1 << CC_AXIM_CFG_INFLTMASK_BIT_SHIFT) | \