Commit 1f4e4773 authored by Sebastian Siewior's avatar Sebastian Siewior Committed by Herbert Xu

[CRYPTO] geode: relax in busy loop and care about return value

The code waits in a busy loop until the hardware finishes the encryption
or decryption process. This wants a cpu_relax() :)
The busy loop finishes either if the encryption is done or if the counter
is zero. If the latter is true than the hardware failed. Since this
should not happen, leave sith a BUG().
Signed-off-by: default avatarSebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2d506d4f
...@@ -88,9 +88,10 @@ do_crypt(void *src, void *dst, int len, u32 flags) ...@@ -88,9 +88,10 @@ do_crypt(void *src, void *dst, int len, u32 flags)
/* Start the operation */ /* Start the operation */
iowrite32(AES_CTRL_START | flags, _iobase + AES_CTRLA_REG); iowrite32(AES_CTRL_START | flags, _iobase + AES_CTRLA_REG);
do do {
status = ioread32(_iobase + AES_INTR_REG); status = ioread32(_iobase + AES_INTR_REG);
while(!(status & AES_INTRA_PENDING) && --counter); cpu_relax();
} while(!(status & AES_INTRA_PENDING) && --counter);
/* Clear the event */ /* Clear the event */
iowrite32((status & 0xFF) | AES_INTRA_PENDING, _iobase + AES_INTR_REG); iowrite32((status & 0xFF) | AES_INTRA_PENDING, _iobase + AES_INTR_REG);
...@@ -102,6 +103,7 @@ geode_aes_crypt(struct geode_aes_op *op) ...@@ -102,6 +103,7 @@ geode_aes_crypt(struct geode_aes_op *op)
{ {
u32 flags = 0; u32 flags = 0;
unsigned long iflags; unsigned long iflags;
int ret;
if (op->len == 0) if (op->len == 0)
return 0; return 0;
...@@ -130,7 +132,8 @@ geode_aes_crypt(struct geode_aes_op *op) ...@@ -130,7 +132,8 @@ geode_aes_crypt(struct geode_aes_op *op)
_writefield(AES_WRITEKEY0_REG, op->key); _writefield(AES_WRITEKEY0_REG, op->key);
} }
do_crypt(op->src, op->dst, op->len, flags); ret = do_crypt(op->src, op->dst, op->len, flags);
BUG_ON(ret);
if (op->mode == AES_MODE_CBC) if (op->mode == AES_MODE_CBC)
_readfield(AES_WRITEIV0_REG, op->iv); _readfield(AES_WRITEIV0_REG, op->iv);
......
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