Commit f8de55b6 authored by Herbert Xu's avatar Herbert Xu

crypto: tcrypt - Use unsigned long for mb ahash cycle counter

For the timescales we are working against there is no need to
go beyond unsigned long.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f83f5b12
...@@ -584,7 +584,7 @@ char result[8][64]; ...@@ -584,7 +584,7 @@ char result[8][64];
struct ahash_request *req[8]; struct ahash_request *req[8];
struct tcrypt_result tresult[8]; struct tcrypt_result tresult[8];
char *xbuf[8][XBUFSIZE]; char *xbuf[8][XBUFSIZE];
cycles_t start[8], end[8], mid; unsigned long start[8], end[8], mid;
static void test_mb_ahash_speed(const char *algo, unsigned int sec, static void test_mb_ahash_speed(const char *algo, unsigned int sec,
struct hash_speed *speed) struct hash_speed *speed)
...@@ -593,6 +593,7 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec, ...@@ -593,6 +593,7 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec,
void *hash_buff; void *hash_buff;
int ret = -ENOMEM; int ret = -ENOMEM;
struct crypto_ahash *tfm; struct crypto_ahash *tfm;
unsigned long cycles;
tfm = crypto_alloc_ahash(algo, 0, 0); tfm = crypto_alloc_ahash(algo, 0, 0);
if (IS_ERR(tfm)) { if (IS_ERR(tfm)) {
...@@ -667,10 +668,9 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec, ...@@ -667,10 +668,9 @@ static void test_mb_ahash_speed(const char *algo, unsigned int sec,
end[k] = get_cycles(); end[k] = get_cycles();
} }
printk("\nBlock: %lld cycles (%lld cycles/byte), %d bytes\n", cycles = end[7] - start[0];
(s64) (end[7]-start[0])/1, printk("\nBlock: %6lu cycles (%4lu cycles/byte)\n",
(s64) (end[7]-start[0])/(8*speed[i].blen), cycles, cycles / (8 * speed[i].blen));
8*speed[i].blen);
} }
ret = 0; ret = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment