Commit ff455ad9 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: ixp4xx - Fix cross-compile errors due to type mismatch 



This patch changes multiple uses of u32s to dma_addr_t where the
physical address is used.  This fixes COMPILE_TEST errors on 64-bit
platforms.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ff9f902c

drivers/crypto/ixp4xx_crypto.c

+8 −7
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct buffer_desc { 
	u16 pkt_len;

	u16 buf_len;

#endif

	u32 phys_addr;

	dma_addr_t phys_addr;

	u32 __reserved[4];

	struct buffer_desc *next;

	enum dma_data_direction dir;
@@ -121,9 +121,9 @@ struct crypt_ctl { 
	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;

	dma_addr_t icv_rev_aes;	/* icv or rev aes */

	dma_addr_t src_buf;

	dma_addr_t dst_buf;

#ifdef __ARMEB__

	u16 auth_offs;		/* Authentication start offset */

	u16 auth_len;		/* Authentication data length */
@@ -324,7 +324,8 @@ static struct crypt_ctl *get_crypt_desc_emerg(void) 
	}

}



static void free_buf_chain(struct device *dev, struct buffer_desc *buf,u32 phys)

static void free_buf_chain(struct device *dev, struct buffer_desc *buf,

			   dma_addr_t phys)

{

	while (buf) {

		struct buffer_desc *buf1;
@@ -606,7 +607,7 @@ static int register_chain_var(struct crypto_tfm *tfm, u8 xpad, u32 target, 
	struct buffer_desc *buf;

	int i;

	u8 *pad;

	u32 pad_phys, buf_phys;

	dma_addr_t pad_phys, buf_phys;



	BUILD_BUG_ON(NPE_CTX_LEN < HMAC_PAD_BLOCKLEN);

	pad = dma_pool_alloc(ctx_pool, GFP_KERNEL, &pad_phys);
@@ -791,7 +792,7 @@ static struct buffer_desc *chainup_buffers(struct device *dev, 
	for (; nbytes > 0; sg = sg_next(sg)) {

		unsigned len = min(nbytes, sg->length);

		struct buffer_desc *next_buf;

		u32 next_buf_phys;

		dma_addr_t next_buf_phys;

		void *ptr;



		nbytes -= len;

CRA Git | Maintained and supported by SUSTech CRA and CCSE