Messages in this thread Patch in this message | | | From | Logan Gunthorpe <> | Date | Tue, 3 Jul 2018 18:02:53 -0600 | Subject | Re: [PATCH v18 6/7] crypto: caam: cleanup CONFIG_64BIT ifdefs when using io{read|write}64 |
| |
On 03/07/18 05:57 PM, Logan Gunthorpe wrote: > To confirm, can you try the patch below?
Actually, scratch that: try this patch as I forgot the read side on the previous one.
Logan
--
diff --git a/drivers/crypto/caam/regs.h b/drivers/crypto/caam/regs.h index 5826acd9194e..796ff764dcbf 100644 --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h @@ -138,18 +138,26 @@ static inline void clrsetbits_32(void __iomem *reg, u32 clear, u32 set) */ static inline void wr_reg64(void __iomem *reg, u64 data) { - if (!caam_imx && caam_little_end) + if (caam_imx && caam_little_end) { + iowrite32(data >> 32, reg); + iowrite32(data, reg + sizeof(u32)); + } else if (caam_little_end) { iowrite64(data, reg); - else + } else { iowrite64be(data, reg); + } }
static inline u64 rd_reg64(void __iomem *reg) { - if (!caam_imx && caam_little_end) + if (caam_imx && caam_little_end) { + return ((u64)ioread32(reg) << 32) | + (u64)ioread32(reg + sizeof(u32)); + } else if (caam_little_end) { return ioread64(reg); - else + } else { return ioread64be(reg); + } }
static inline u64 cpu_to_caam_dma64(dma_addr_t value)
| |