From patchwork Thu Dec 14 14:02:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 121960 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp6844539qgn; Thu, 14 Dec 2017 06:03:38 -0800 (PST) X-Google-Smtp-Source: ACJfBour3Zg6oQWFMUtNjrC+GV3y1kl1mosoV3NJMk4pTAGw82kKlHgI80MFOLbWg5qAhLx7BWpt X-Received: by 10.101.90.199 with SMTP id d7mr8503209pgt.265.1513260218031; Thu, 14 Dec 2017 06:03:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513260218; cv=none; d=google.com; s=arc-20160816; b=PZ03T821q1eJA6t6firBO034RZtfWhDswIrYsESdCJo2PqokTpa2AU5npHZnhWjuOc I6FWQFGZycA8QfsEJgzQdDIzYbNLf0DsMh1Wb4zV7z02K7YJLoK3kqVbjdnK6izAztQE IjUeP09f356gz8glGQgrIRR43ApwpAfkqyjaG7ouqB75W70uzd/nXagpjRrVbrtnmxkl zUTU0ow0WwDdm2L1smRjLW7BnC1Ls2kO2AarjOK7SyZzdztm0aiBX3pqSkWdH4OFgpPK g19/giJ9YPLM2fm6J9GOr7LB4fJaISWP009+53haNSY9zzd05iLv1f/3gVZD8IZ54fPe 2Uaw== 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=jMqWUWLB+gr6pWmM2ogU3C+K9FR8w7+k3zhdv64N+uk=; b=GIEezx7NAElwrJ6RU+A1AZxlY0PmigeM3Gr3/u49ZpIFsP3kIfY7dL3V0qPZelVz+L jz9OLdhixq+Q0QxQKMKcQsXY6RN65PT4CZ7u6HL+1Ioh/NMfLRmokZHMrMzwZ4/NrQw4 6XzVUS4XZE2QvFxUPaS1p/t6BHL9Y5CnjM4aNPHEZG0RTjacQIZ5kCXuaWqsvkE6soem poJ2W3og4GIPOTCk8Xn0Pw8f9W9wx+FVAlt0xUe7xoIsmU4BgUcHgybzylMdr66VntSG NfLJgOp/+T3ZhpPB0h+k9qB5EKooRoYq5m+Ft04zJKoG1KzbRX0FWNg9go6i6BQbvpo/ 50fw== 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 r1si2928886pgp.308.2017.12.14.06.03.37; Thu, 14 Dec 2017 06:03:38 -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 S1752888AbdLNODe (ORCPT + 20 others); Thu, 14 Dec 2017 09:03:34 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:42198 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752547AbdLNODa (ORCPT ); Thu, 14 Dec 2017 09:03: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 849351435; Thu, 14 Dec 2017 06:03:30 -0800 (PST) Received: from sugar.kfn.arm.com (unknown [10.45.48.196]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C277F3F246; Thu, 14 Dec 2017 06:03:28 -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 06/10] staging: ccree: remove useless debug code Date: Thu, 14 Dec 2017 14:02:43 +0000 Message-Id: <1513260170-26346-7-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513260170-26346-1-git-send-email-gilad@benyossef.com> References: <1513260170-26346-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 Remove a bunch of useless debug code ifdef'ed out Signed-off-by: Gilad Ben-Yossef --- drivers/staging/ccree/ssi_aead.c | 45 --------------------------------- drivers/staging/ccree/ssi_config.h | 3 --- drivers/staging/ccree/ssi_driver.c | 13 ---------- drivers/staging/ccree/ssi_request_mgr.c | 23 ----------------- 4 files changed, 84 deletions(-) -- 2.7.4 diff --git a/drivers/staging/ccree/ssi_aead.c b/drivers/staging/ccree/ssi_aead.c index dde6797..ce26e68 100644 --- a/drivers/staging/ccree/ssi_aead.c +++ b/drivers/staging/ccree/ssi_aead.c @@ -1834,51 +1834,6 @@ static int cc_gcm(struct aead_request *req, struct cc_hw_desc desc[], return 0; } -#ifdef CC_DEBUG -static void cc_dump_gcm(const char *title, struct aead_request *req) -{ - struct crypto_aead *tfm = crypto_aead_reqtfm(req); - struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); - struct aead_req_ctx *req_ctx = aead_request_ctx(req); - - if (ctx->cipher_mode != DRV_CIPHER_GCTR) - return; - - if (title) { - dev_dbg(dev, "----------------------------------------------------------------------------------"); - dev_dbg(dev, "%s\n", title); - } - - dev_dbg(dev, "cipher_mode %d, authsize %d, enc_keylen %d, assoclen %d, cryptlen %d\n", - ctx->cipher_mode, ctx->authsize, ctx->enc_keylen, - req->assoclen, req_ctx->cryptlen); - - if (ctx->enckey) - dump_byte_array("mac key", ctx->enckey, 16); - - dump_byte_array("req->iv", req->iv, AES_BLOCK_SIZE); - - dump_byte_array("gcm_iv_inc1", req_ctx->gcm_iv_inc1, AES_BLOCK_SIZE); - - dump_byte_array("gcm_iv_inc2", req_ctx->gcm_iv_inc2, AES_BLOCK_SIZE); - - dump_byte_array("hkey", req_ctx->hkey, AES_BLOCK_SIZE); - - dump_byte_array("mac_buf", req_ctx->mac_buf, AES_BLOCK_SIZE); - - dump_byte_array("gcm_len_block", req_ctx->gcm_len_block.len_a, - AES_BLOCK_SIZE); - - if (req->src && req->cryptlen) - dump_byte_array("req->src", sg_virt(req->src), - req->cryptlen + req->assoclen); - - if (req->dst) - dump_byte_array("req->dst", sg_virt(req->dst), - req->cryptlen + ctx->authsize + req->assoclen); -} -#endif - static int config_gcm_context(struct aead_request *req) { struct crypto_aead *tfm = crypto_aead_reqtfm(req); diff --git a/drivers/staging/ccree/ssi_config.h b/drivers/staging/ccree/ssi_config.h index e809103..b530974 100644 --- a/drivers/staging/ccree/ssi_config.h +++ b/drivers/staging/ccree/ssi_config.h @@ -23,11 +23,8 @@ #include -//#define FLUSH_CACHE_ALL -//#define COMPLETION_DELAY //#define CC_DUMP_DESCS // #define CC_DUMP_BYTES -// #define CC_DEBUG /* was 32 bit, but for juno's sake it was enlarged to 48 bit */ #define DMA_BIT_MASK_LEN 48 diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c index 6158794..dbca241 100644 --- a/drivers/staging/ccree/ssi_driver.c +++ b/drivers/staging/ccree/ssi_driver.c @@ -446,19 +446,6 @@ static int cc7x_probe(struct platform_device *plat_dev) { int rc; struct device *dev = &plat_dev->dev; -#if defined(CONFIG_ARM) && defined(CC_DEBUG) - u32 ctr, cacheline_size; - - asm volatile("mrc p15, 0, %0, c0, c0, 1" : "=r" (ctr)); - cacheline_size = 4 << ((ctr >> 16) & 0xf); - dev_dbg(dev, "CP15(L1_CACHE_BYTES) = %u , Kconfig(L1_CACHE_BYTES) = %u\n", - cacheline_size, L1_CACHE_BYTES); - - asm volatile("mrc p15, 0, %0, c0, c0, 0" : "=r" (ctr)); - dev_dbg(dev, "Main ID register (MIDR): Implementer 0x%02X, Arch 0x%01X, Part 0x%03X, Rev r%dp%d\n", - (ctr >> 24), (ctr >> 16) & 0xF, (ctr >> 4) & 0xFFF, - (ctr >> 20) & 0xF, ctr & 0xF); -#endif /* Map registers space */ rc = init_cc_resources(plat_dev); diff --git a/drivers/staging/ccree/ssi_request_mgr.c b/drivers/staging/ccree/ssi_request_mgr.c index 07b9404..f6374b0 100644 --- a/drivers/staging/ccree/ssi_request_mgr.c +++ b/drivers/staging/ccree/ssi_request_mgr.c @@ -20,9 +20,6 @@ #include #include #include -#ifdef FLUSH_CACHE_ALL -#include -#endif #include #include "ssi_driver.h" #include "ssi_buffer_mgr.h" @@ -359,9 +356,6 @@ int send_request(struct cc_drvdata *drvdata, struct cc_crypto_req *cc_req, dev_dbg(dev, "Enqueue request head=%u\n", req_mgr_h->req_queue_head); -#ifdef FLUSH_CACHE_ALL - flush_cache_all(); -#endif /* * We are about to push command to the HW via the command registers * that may refernece hsot memory. We need to issue a memory barrier @@ -493,23 +487,6 @@ static void proc_completions(struct cc_drvdata *drvdata) cc_req = &request_mgr_handle->req_queue[*tail]; -#ifdef FLUSH_CACHE_ALL - flush_cache_all(); -#endif - -#ifdef COMPLETION_DELAY - /* Delay */ - { - u32 axi_err; - int i; - - dev_info(dev, "Delay\n"); - for (i = 0; i < 1000000; i++) - axi_err = cc_ioread(drvdata, - CC_REG(AXIM_MON_ERR)); - } -#endif /* COMPLETION_DELAY */ - if (cc_req->user_cb) cc_req->user_cb(dev, cc_req->user_arg); *tail = (*tail + 1) & (MAX_REQUEST_QUEUE_SIZE - 1);