Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6

* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
  IXP4xx: Fix LL debugging on little-endian CPU.
  IXP4xx: Fix sparse warnings in I/O primitives.
  IXP4xx: Make mdio_bus struct static in the Ethernet driver.
  IXP4xx: Fix ixp4xx_crypto little-endian operation.
  IXP4xx: Prevent HSS transmitter lockup by disabling FRaMe signals.
  ixp4xx/vulcan: add PCI support
  ixp4xx: base support for Arcom Vulcan

1 files changed, 21 insertions, 0 deletions

diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index f17ddf37a1ed..0d662213c066 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -97,8 +97,13 @@
 
 struct buffer_desc {
         u32 phys_next;
+#ifdef __ARMEB__
         u16 buf_len;
         u16 pkt_len;
+#else
+        u16 pkt_len;
+        u16 buf_len;
+#endif
         u32 phys_addr;
         u32 __reserved[4];
         struct buffer_desc *next;
@@ -106,17 +111,30 @@ struct buffer_desc {
 };
 
 struct crypt_ctl {
+#ifdef __ARMEB__
         u8 mode;                /* NPE_OP_*  operation mode */
         u8 init_len;
         u16 reserved;
+#else
+        u16 reserved;
+        u8 init_len;
+        u8 mode;                /* NPE_OP_*  operation mode */
+#endif
         u8 iv[MAX_IVLEN];       /* IV for CBC mode or CTR IV for CTR mode */
         u32 icv_rev_aes;        /* icv or rev aes */
         u32 src_buf;
         u32 dst_buf;
+#ifdef __ARMEB__
         u16 auth_offs;          /* Authentication start offset */
         u16 auth_len;           /* Authentication data length */
         u16 crypt_offs;         /* Cryption start offset */
         u16 crypt_len;          /* Cryption data length */
+#else
+        u16 auth_len;           /* Authentication data length */
+        u16 auth_offs;          /* Authentication start offset */
+        u16 crypt_len;          /* Cryption data length */
+        u16 crypt_offs;         /* Cryption start offset */
+#endif
         u32 aadAddr;            /* Additional Auth Data Addr for CCM mode */
         u32 crypto_ctx;         /* NPE Crypto Param structure address */
 
@@ -652,6 +670,9 @@ static int setup_auth(struct crypto_tfm *tfm, int encrypt, unsigned authsize,
 
         /* write cfg word to cryptinfo */
         cfgword = algo->cfgword | ( authsize << 6); /* (authsize/4) << 8 */
+#ifndef __ARMEB__
+        cfgword ^= 0xAA000000; /* change the "byte swap" flags */
+#endif
         *(u32*)cinfo = cpu_to_be32(cfgword);
         cinfo += sizeof(cfgword);