Commit 509da8fd authored by Victoria Milhoan's avatar Victoria Milhoan Committed by Herbert Xu
Browse files

crypto: caam - Add setbits32/clrbits32/clrsetbits primitives for ARM compatibility 



Add set/clear 32-bit primitives for compatibility with ARM devices since
the primitives were previously only defined for the Power architecture.

Signed-off-by: default avatarVictoria Milhoan <vicki.milhoan@freescale.com>
Tested-by: default avatarHoria Geantă <horia.geanta@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e7472422

drivers/crypto/caam/ctrl.c

+3 −3
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static int caam_probe(struct platform_device *pdev) 
	 * Enable DECO watchdogs and, if this is a PHYS_ADDR_T_64BIT kernel,

	 * long pointers in master configuration register

	 */

	clrsetbits_be32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH |

	clrsetbits_32(&ctrl->mcr, MCFGR_AWCACHE_MASK, MCFGR_AWCACHE_CACH |

		      MCFGR_WDENABLE | (sizeof(dma_addr_t) == sizeof(u64) ?

					MCFGR_LONG_PTR : 0));

drivers/crypto/caam/regs.h

+23 −0
Original line number Diff line number Diff line
@@ -65,9 +65,31 @@ 
 *

 */



#ifdef CONFIG_ARM

/* These are common macros for Power, put here for ARM */

#define setbits32(_addr, _v) writel((readl(_addr) | (_v)), (_addr))

#define clrbits32(_addr, _v) writel((readl(_addr) & ~(_v)), (_addr))



#define out_arch(type, endian, a, v)	__raw_write##type(cpu_to_##endian(v), a)

#define in_arch(type, endian, a)	endian##_to_cpu(__raw_read##type(a))



#define out_le32(a, v)	out_arch(l, le32, a, v)

#define in_le32(a)	in_arch(l, le32, a)



#define out_be32(a, v)	out_arch(l, be32, a, v)

#define in_be32(a)	in_arch(l, be32, a)



#define clrsetbits(type, addr, clear, set) \

	out_##type((addr), (in_##type(addr) & ~(clear)) | (set))



#define clrsetbits_be32(addr, clear, set) clrsetbits(be32, addr, clear, set)

#define clrsetbits_le32(addr, clear, set) clrsetbits(le32, addr, clear, set)

#endif



#ifdef __BIG_ENDIAN

#define wr_reg32(reg, data) out_be32(reg, data)

#define rd_reg32(reg) in_be32(reg)

#define clrsetbits_32(addr, clear, set) clrsetbits_be32(addr, clear, set)

#ifdef CONFIG_64BIT

#define wr_reg64(reg, data) out_be64(reg, data)

#define rd_reg64(reg) in_be64(reg)
@@ -76,6 +98,7 @@ 
#ifdef __LITTLE_ENDIAN

#define wr_reg32(reg, data) __raw_writel(data, reg)

#define rd_reg32(reg) __raw_readl(reg)

#define clrsetbits_32(addr, clear, set) clrsetbits_le32(addr, clear, set)

#ifdef CONFIG_64BIT

#define wr_reg64(reg, data) __raw_writeq(data, reg)

#define rd_reg64(reg) __raw_readq(reg)