2011-11-09 01:35:57

by Kim Phillips

Subject: [PATCH] crypto: talitos - fix descriptor buffer access code

commit 3e721ae (crypto: talitos - handle descriptor not found in
error path) used the wrong offset method to access a channel's
descriptor buffer registers - the TALITOS_DESCBUF macro
doesn't take a channel argument. Fix it to use the
base chan[x].reg offset instead.

Signed-off-by: Kim Phillips <[email protected]>
---
drivers/crypto/talitos.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index dbe76b5..98ffcc1 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -444,7 +444,7 @@ static void report_eu_error(struct device *dev, int ch, u32 desc_hdr)
int i;

if (!desc_hdr)
- desc_hdr = in_be32(priv->reg + TALITOS_DESCBUF(ch));
+ desc_hdr = in_be32(priv->chan[ch].reg + TALITOS_DESCBUF);

switch (desc_hdr & DESC_HDR_SEL0_MASK) {
case DESC_HDR_SEL0_AFEU:
--
1.7.7

2011-11-09 01:41:14

by Kim Phillips

Subject: Re: [PATCH] crypto: talitos - fix descriptor buffer access code

On Tue, 8 Nov 2011 19:34:57 -0600
Kim Phillips <[email protected]> wrote:

> commit 3e721ae (crypto: talitos - handle descriptor not found in
> error path) used the wrong offset method to access a channel's
> descriptor buffer registers - the TALITOS_DESCBUF macro
> doesn't take a channel argument. Fix it to use the
> base chan[x].reg offset instead.
>
> Signed-off-by: Kim Phillips <[email protected]>
> ---

scratch this - I got confused working on a merge branch.

existing code is fine - ignore me.

Kim