staging: ccree: remove unused code (b4573c90) · Commits · 戴 / test

drivers/staging/ccree/cc_bitops.h

+0 −27

Original line number	Diff line number	Diff line
		@@ -32,31 +32,4 @@
		(((new_val) & BITMASK(bit_size)) << (bit_offset)); \
		} while (0)

		/* Is val aligned to "align" ("align" must be power of 2) */
		#ifndef IS_ALIGNED
		#define IS_ALIGNED(val, align) \
		(((uintptr_t)(val) & ((align) - 1)) == 0)
		#endif

		#define SWAP_ENDIAN(word) \
		(((word) >> 24) \| (((word) & 0x00FF0000) >> 8) \| \
		(((word) & 0x0000FF00) << 8) \| (((word) & 0x000000FF) << 24))

		#ifdef BIG__ENDIAN
		#define SWAP_TO_LE(word) SWAP_ENDIAN(word)
		#define SWAP_TO_BE(word) word
		#else
		#define SWAP_TO_LE(word) word
		#define SWAP_TO_BE(word) SWAP_ENDIAN(word)
		#endif



		/* Is val a multiple of "mult" ("mult" must be power of 2) */
		#define IS_MULT(val, mult) \
		(((val) & ((mult) - 1)) == 0)

		#define IS_NULL_ADDR(adr) \
		(!(adr))

		#endif /_CC_BITOPS_H_/

drivers/staging/ccree/cc_hw_queue_defs.h

+0 −36

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#ifndef __CC_HW_QUEUE_DEFS_H__
		#define __CC_HW_QUEUE_DEFS_H__

		#include "cc_pal_log.h"
		#include "cc_regs.h"
		#include "dx_crys_kernel.h"

		@@ -189,41 +188,6 @@ typedef enum HwDesKeySize {
		(pDesc)->word[5] = 0; \
		} while (0)

		/* HW descriptor debug functions */
		int createDetailedDump(HwDesc_s *pDesc);
		void descriptor_log(HwDesc_s *desc);

		#if defined(HW_DESCRIPTOR_LOG) \|\| defined(HW_DESC_DUMP_HOST_BUF)
		#define LOG_HW_DESC(pDesc) descriptor_log(pDesc)
		#else
		#define LOG_HW_DESC(pDesc)
		#endif

		#if (CC_PAL_MAX_LOG_LEVEL >= CC_PAL_LOG_LEVEL_TRACE) \|\| defined(OEMFW_LOG)

		#ifdef UART_PRINTF
		#define CREATE_DETAILED_DUMP(pDesc) createDetailedDump(pDesc)
		#else
		#define CREATE_DETAILED_DUMP(pDesc)
		#endif

		#define HW_DESC_DUMP(pDesc) do { \
		CC_PAL_LOG_TRACE("\n---------------------------------------------------\n"); \
		CREATE_DETAILED_DUMP(pDesc); \
		CC_PAL_LOG_TRACE("0x%08X, ", (unsigned int)(pDesc)->word[0]); \
		CC_PAL_LOG_TRACE("0x%08X, ", (unsigned int)(pDesc)->word[1]); \
		CC_PAL_LOG_TRACE("0x%08X, ", (unsigned int)(pDesc)->word[2]); \
		CC_PAL_LOG_TRACE("0x%08X, ", (unsigned int)(pDesc)->word[3]); \
		CC_PAL_LOG_TRACE("0x%08X, ", (unsigned int)(pDesc)->word[4]); \
		CC_PAL_LOG_TRACE("0x%08X\n", (unsigned int)(pDesc)->word[5]); \
		CC_PAL_LOG_TRACE("---------------------------------------------------\n\n"); \
		} while (0)

		#else
		#define HW_DESC_DUMP(pDesc) do {} while (0)
		#endif


		/*!
		* This macro indicates the end of current HW descriptors flow and release the HW engines.
		*

drivers/staging/ccree/cc_pal_log.h

deleted100644 → 0

+0 −188

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012-2017 ARM Limited or its affiliates.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, see <http://www.gnu.org/licenses/>.
		*/

		#ifndef _CC_PAL_LOG_H_
		#define _CC_PAL_LOG_H_

		#include "cc_pal_types.h"
		#include "cc_pal_log_plat.h"

		/*!
		@file
		@brief This file contains the PAL layer log definitions, by default the log is disabled.
		@defgroup cc_pal_log CryptoCell PAL logging APIs and definitions
		@{
		@ingroup cc_pal
		*/

		/* PAL log levels (to be used in CC_PAL_logLevel) */
		/! PAL log level - disabled. /
		#define CC_PAL_LOG_LEVEL_NULL (-1) /!< \internal Disable logging /
		/! PAL log level - error. /
		#define CC_PAL_LOG_LEVEL_ERR 0
		/! PAL log level - warning. /
		#define CC_PAL_LOG_LEVEL_WARN 1
		/! PAL log level - info. /
		#define CC_PAL_LOG_LEVEL_INFO 2
		/! PAL log level - debug. /
		#define CC_PAL_LOG_LEVEL_DEBUG 3
		/! PAL log level - trace. /
		#define CC_PAL_LOG_LEVEL_TRACE 4
		/! PAL log level - data. /
		#define CC_PAL_LOG_LEVEL_DATA 5

		#ifndef CC_PAL_LOG_CUR_COMPONENT
		/* Setting default component mask in case caller did not define */
		/* (a mask that is always on for every log mask value but full masking) */
		/! Default log debugged component./
		#define CC_PAL_LOG_CUR_COMPONENT 0xFFFFFFFF
		#endif
		#ifndef CC_PAL_LOG_CUR_COMPONENT_NAME
		/! Default log debugged component./
		#define CC_PAL_LOG_CUR_COMPONENT_NAME "CC"
		#endif

		/* Select compile time log level (default if not explicitly specified by caller) */
		#ifndef CC_PAL_MAX_LOG_LEVEL /* Can be overriden by external definition of this constant */
		#ifdef DEBUG
		/! Default debug log level (when debug is set to on)./
		#define CC_PAL_MAX_LOG_LEVEL CC_PAL_LOG_LEVEL_ERR /CC_PAL_LOG_LEVEL_DEBUG/
		#else /* Disable logging */
		/! Default debug log level (when debug is set to on)./
		#define CC_PAL_MAX_LOG_LEVEL CC_PAL_LOG_LEVEL_NULL
		#endif
		#endif /CC_PAL_MAX_LOG_LEVEL/
		/! Evaluate CC_PAL_MAX_LOG_LEVEL in case provided by caller /
		#define __CC_PAL_LOG_LEVEL_EVAL(level) level
		/! Maximal log level defintion./
		#define _CC_PAL_MAX_LOG_LEVEL __CC_PAL_LOG_LEVEL_EVAL(CC_PAL_MAX_LOG_LEVEL)


		#ifdef ARM_DSM
		/! Log init function. /
		#define CC_PalLogInit() do {} while (0)
		/! Log set level function - sets the level of logging in case of debug. /
		#define CC_PalLogLevelSet(setLevel) do {} while (0)
		/! Log set mask function - sets the component masking in case of debug. /
		#define CC_PalLogMaskSet(setMask) do {} while (0)
		#else
		#if _CC_PAL_MAX_LOG_LEVEL > CC_PAL_LOG_LEVEL_NULL
		/! Log init function. /
		void CC_PalLogInit(void);
		/! Log set level function - sets the level of logging in case of debug. /
		void CC_PalLogLevelSet(int setLevel);
		/! Log set mask function - sets the component masking in case of debug. /
		void CC_PalLogMaskSet(uint32_t setMask);
		/! Global variable for log level /
		extern int CC_PAL_logLevel;
		/! Global variable for log mask /
		extern uint32_t CC_PAL_logMask;
		#else /* No log */
		/! Log init function. /
		static inline void CC_PalLogInit(void) {}
		/! Log set level function - sets the level of logging in case of debug. /
		static inline void CC_PalLogLevelSet(int setLevel) {CC_UNUSED_PARAM(setLevel);}
		/! Log set mask function - sets the component masking in case of debug. /
		static inline void CC_PalLogMaskSet(uint32_t setMask) {CC_UNUSED_PARAM(setMask);}
		#endif
		#endif

		/! Filter logging based on logMask and dispatch to platform specific logging mechanism. /
		#define _CC_PAL_LOG(level, format, ...) \
		if (CC_PAL_logMask & CC_PAL_LOG_CUR_COMPONENT) \
		__CC_PAL_LOG_PLAT(CC_PAL_LOG_LEVEL_ ## level, "%s:%s: " format, CC_PAL_LOG_CUR_COMPONENT_NAME, __func__, ##__VA_ARGS__)

		#if (_CC_PAL_MAX_LOG_LEVEL >= CC_PAL_LOG_LEVEL_ERR)
		/! Log messages according to log level./
		#define CC_PAL_LOG_ERR(format, ... ) \
		_CC_PAL_LOG(ERR, format, ##__VA_ARGS__)
		#else
		/! Log messages according to log level./
		#define CC_PAL_LOG_ERR( ... ) do {} while (0)
		#endif

		#if (_CC_PAL_MAX_LOG_LEVEL >= CC_PAL_LOG_LEVEL_WARN)
		/! Log messages according to log level./
		#define CC_PAL_LOG_WARN(format, ... ) \
		if (CC_PAL_logLevel >= CC_PAL_LOG_LEVEL_WARN) \
		_CC_PAL_LOG(WARN, format, ##__VA_ARGS__)
		#else
		/! Log messages according to log level./
		#define CC_PAL_LOG_WARN( ... ) do {} while (0)
		#endif

		#if (_CC_PAL_MAX_LOG_LEVEL >= CC_PAL_LOG_LEVEL_INFO)
		/! Log messages according to log level./
		#define CC_PAL_LOG_INFO(format, ... ) \
		if (CC_PAL_logLevel >= CC_PAL_LOG_LEVEL_INFO) \
		_CC_PAL_LOG(INFO, format, ##__VA_ARGS__)
		#else
		/! Log messages according to log level./
		#define CC_PAL_LOG_INFO( ... ) do {} while (0)
		#endif

		#if (_CC_PAL_MAX_LOG_LEVEL >= CC_PAL_LOG_LEVEL_DEBUG)
		/! Log messages according to log level./
		#define CC_PAL_LOG_DEBUG(format, ... ) \
		if (CC_PAL_logLevel >= CC_PAL_LOG_LEVEL_DEBUG) \
		_CC_PAL_LOG(DEBUG, format, ##__VA_ARGS__)

		/! Log message buffer./
		#define CC_PAL_LOG_DUMP_BUF(msg, buf, size) \
		do { \
		int i; \
		uint8_t pData = (uint8_t)buf; \
		\
		PRINTF("%s (%d):\n", msg, size); \
		for (i = 0; i < size; i++) { \
		PRINTF("0x%02X ", pData[i]); \
		if ((i & 0xF) == 0xF) { \
		PRINTF("\n"); \
		} \
		} \
		PRINTF("\n"); \
		} while (0)
		#else
		/! Log debug messages./
		#define CC_PAL_LOG_DEBUG( ... ) do {} while (0)
		/! Log debug buffer./
		#define CC_PAL_LOG_DUMP_BUF(msg, buf, size) do {} while (0)
		#endif

		#if (_CC_PAL_MAX_LOG_LEVEL >= CC_PAL_LOG_LEVEL_TRACE)
		/! Log debug trace./
		#define CC_PAL_LOG_TRACE(format, ... ) \
		if (CC_PAL_logLevel >= CC_PAL_LOG_LEVEL_TRACE) \
		_CC_PAL_LOG(TRACE, format, ##__VA_ARGS__)
		#else
		/! Log debug trace./
		#define CC_PAL_LOG_TRACE(...) do {} while (0)
		#endif

		#if (_CC_PAL_MAX_LOG_LEVEL >= CC_PAL_LOG_LEVEL_TRACE)
		/! Log debug data./
		#define CC_PAL_LOG_DATA(format, ...) \
		if (CC_PAL_logLevel >= CC_PAL_LOG_LEVEL_TRACE) \
		_CC_PAL_LOG(DATA, format, ##__VA_ARGS__)
		#else
		/! Log debug data./
		#define CC_PAL_LOG_DATA( ...) do {} while (0)
		#endif
		/**
		@}
		*/

		#endif /_CC_PAL_LOG_H_/

drivers/staging/ccree/cc_pal_log_plat.h

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012-2017 ARM Limited or its affiliates.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, see <http://www.gnu.org/licenses/>.
		*/

		/* Dummy pal_log_plat for test driver in kernel */

		#ifndef _SSI_PAL_LOG_PLAT_H_
		#define _SSI_PAL_LOG_PLAT_H_

		#if defined(DEBUG)

		#define __CC_PAL_LOG_PLAT(level, format, ...) printk(level "cc7x_test::" format , ##__VA_ARGS__)

		#else /* Disable all prints */

		#define __CC_PAL_LOG_PLAT(...) do {} while (0)

		#endif

		#endif /_SASI_PAL_LOG_PLAT_H_/

drivers/staging/ccree/cc_pal_types.h

deleted100644 → 0

+0 −97

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012-2017 ARM Limited or its affiliates.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, see <http://www.gnu.org/licenses/>.
		*/

		#ifndef CC_PAL_TYPES_H
		#define CC_PAL_TYPES_H

		/*!
		@file
		@brief This file contains platform-dependent definitions and types.
		@defgroup cc_pal_types CryptoCell PAL platform dependant types
		@{
		@ingroup cc_pal

		*/

		#include "cc_pal_types_plat.h"

		/! Boolean definition./
		typedef enum {
		/! Boolean false definition./
		CC_FALSE = 0,
		/! Boolean true definition./
		CC_TRUE = 1
		} CCBool;

		/! Success definition. /
		#define CC_SUCCESS 0UL
		/! Failure definition. /
		#define CC_FAIL 1UL

		/! Defintion of 1KB in bytes. /
		#define CC_1K_SIZE_IN_BYTES 1024
		/! Defintion of number of bits in a byte. /
		#define CC_BITS_IN_BYTE 8
		/! Defintion of number of bits in a 32bits word. /
		#define CC_BITS_IN_32BIT_WORD 32
		/! Defintion of number of bytes in a 32bits word. /
		#define CC_32BIT_WORD_SIZE (sizeof(uint32_t))

		/! Success (OK) defintion. /
		#define CC_OK 0

		/! Macro that handles unused parameters in the code (to avoid compilation warnings). /
		#define CC_UNUSED_PARAM(prm) ((void)prm)

		/! Maximal uint32 value./
		#define CC_MAX_UINT32_VAL (0xFFFFFFFF)


		/* Minimum and Maximum macros */
		#ifdef min
		/! Definition for minimum. /
		#define CC_MIN(a,b) min( a , b )
		#else
		/! Definition for minimum. /
		#define CC_MIN( a , b ) ( ( (a) < (b) ) ? (a) : (b) )
		#endif

		#ifdef max
		/! Definition for maximum. /
		#define CC_MAX(a,b) max( a , b )
		#else
		/! Definition for maximum. /
		#define CC_MAX( a , b ) ( ( (a) > (b) ) ? (a) : (b) )
		#endif

		/! Macro that calculates number of full bytes from bits (i.e. 7 bits are 1 byte). /
		#define CALC_FULL_BYTES(numBits) ((numBits)/CC_BITS_IN_BYTE + (((numBits) & (CC_BITS_IN_BYTE-1)) > 0))
		/! Macro that calculates number of full 32bits words from bits (i.e. 31 bits are 1 word). /
		#define CALC_FULL_32BIT_WORDS(numBits) ((numBits)/CC_BITS_IN_32BIT_WORD + (((numBits) & (CC_BITS_IN_32BIT_WORD-1)) > 0))
		/! Macro that calculates number of full 32bits words from bytes (i.e. 3 bytes are 1 word). /
		#define CALC_32BIT_WORDS_FROM_BYTES(sizeBytes) ((sizeBytes)/CC_32BIT_WORD_SIZE + (((sizeBytes) & (CC_32BIT_WORD_SIZE-1)) > 0))
		/! Macro that round up bits to 32bits words. /
		#define ROUNDUP_BITS_TO_32BIT_WORD(numBits) (CALC_FULL_32BIT_WORDS(numBits) * CC_BITS_IN_32BIT_WORD)
		/! Macro that round up bits to bytes. /
		#define ROUNDUP_BITS_TO_BYTES(numBits) (CALC_FULL_BYTES(numBits) * CC_BITS_IN_BYTE)
		/! Macro that round up bytes to 32bits words. /
		#define ROUNDUP_BYTES_TO_32BIT_WORD(sizeBytes) (CALC_32BIT_WORDS_FROM_BYTES(sizeBytes) * CC_32BIT_WORD_SIZE)


		/**
		@}
		*/
		#endif

Admin message