Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (29 commits)
  crypto: sha512-s390 - Add missing block size
  hwrng: timeriomem - Breaks an allyesconfig build on s390:
  nlattr: Fix build error with NET off
  crypto: testmgr - add zlib test
  crypto: zlib - New zlib crypto module, using pcomp
  crypto: testmgr - Add support for the pcomp interface
  crypto: compress - Add pcomp interface
  netlink: Move netlink attribute parsing support to lib
  crypto: Fix dead links
  hwrng: timeriomem - New driver
  crypto: chainiv - Use kcrypto_wq instead of keventd_wq
  crypto: cryptd - Per-CPU thread implementation based on kcrypto_wq
  crypto: api - Use dedicated workqueue for crypto subsystem
  crypto: testmgr - Test skciphers with no IVs
  crypto: aead - Avoid infinite loop when nivaead fails selftest
  crypto: skcipher - Avoid infinite loop when cipher fails selftest
  crypto: api - Fix crypto_alloc_tfm/create_create_tfm return convention
  crypto: api - crypto_alg_mod_lookup either tested or untested
  crypto: amcc - Add crypt4xx driver
  crypto: ansi_cprng - Add maintainer
  ...

1 files changed, 108 insertions, 0 deletions

diff --git a/drivers/crypto/amcc/crypto4xx_sa.c b/drivers/crypto/amcc/crypto4xx_sa.c
new file mode 100644
index 000000000000..466fd94cd4a3
--- /dev/null
+++ b/drivers/crypto/amcc/crypto4xx_sa.c
@@ -0,0 +1,108 @@
+/**
+ * AMCC SoC PPC4xx Crypto Driver
+ *
+ * Copyright (c) 2008 Applied Micro Circuits Corporation.
+ * All rights reserved. James Hsiao <jhsiao@amcc.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * @file crypto4xx_sa.c
+ *
+ * This file implements the security context
+ * assoicate format.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/mod_devicetable.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock_types.h>
+#include <linux/highmem.h>
+#include <linux/scatterlist.h>
+#include <linux/crypto.h>
+#include <crypto/algapi.h>
+#include <crypto/des.h>
+#include "crypto4xx_reg_def.h"
+#include "crypto4xx_sa.h"
+#include "crypto4xx_core.h"
+
+u32 get_dynamic_sa_offset_iv_field(struct crypto4xx_ctx *ctx)
+{
+        u32 offset;
+        union dynamic_sa_contents cts;
+
+        if (ctx->direction == DIR_INBOUND)
+                cts.w = ((struct dynamic_sa_ctl *)(ctx->sa_in))->sa_contents;
+        else
+                cts.w = ((struct dynamic_sa_ctl *)(ctx->sa_out))->sa_contents;
+        offset = cts.bf.key_size
+                + cts.bf.inner_size
+                + cts.bf.outer_size
+                + cts.bf.spi
+                + cts.bf.seq_num0
+                + cts.bf.seq_num1
+                + cts.bf.seq_num_mask0
+                + cts.bf.seq_num_mask1
+                + cts.bf.seq_num_mask2
+                + cts.bf.seq_num_mask3;
+
+        return sizeof(struct dynamic_sa_ctl) + offset * 4;
+}
+
+u32 get_dynamic_sa_offset_state_ptr_field(struct crypto4xx_ctx *ctx)
+{
+        u32 offset;
+        union dynamic_sa_contents cts;
+
+        if (ctx->direction == DIR_INBOUND)
+                cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents;
+        else
+                cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents;
+        offset = cts.bf.key_size
+                + cts.bf.inner_size
+                + cts.bf.outer_size
+                + cts.bf.spi
+                + cts.bf.seq_num0
+                + cts.bf.seq_num1
+                + cts.bf.seq_num_mask0
+                + cts.bf.seq_num_mask1
+                + cts.bf.seq_num_mask2
+                + cts.bf.seq_num_mask3
+                + cts.bf.iv0
+                + cts.bf.iv1
+                + cts.bf.iv2
+                + cts.bf.iv3;
+
+        return sizeof(struct dynamic_sa_ctl) + offset * 4;
+}
+
+u32 get_dynamic_sa_iv_size(struct crypto4xx_ctx *ctx)
+{
+        union dynamic_sa_contents cts;
+
+        if (ctx->direction == DIR_INBOUND)
+                cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents;
+        else
+                cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents;
+        return (cts.bf.iv0 + cts.bf.iv1 + cts.bf.iv2 + cts.bf.iv3) * 4;
+}
+
+u32 get_dynamic_sa_offset_key_field(struct crypto4xx_ctx *ctx)
+{
+        union dynamic_sa_contents cts;
+
+        if (ctx->direction == DIR_INBOUND)
+                cts.w = ((struct dynamic_sa_ctl *) ctx->sa_in)->sa_contents;
+        else
+                cts.w = ((struct dynamic_sa_ctl *) ctx->sa_out)->sa_contents;
+
+        return sizeof(struct dynamic_sa_ctl);
+}