Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c42cbc2 authored by Patrick McHardy's avatar Patrick McHardy Committed by Herbert Xu
Browse files

[HIFN]: Endianess fixes 


    
HIFN uses little-endian by default, move cpu_to_le32 conversion to hifn_write_0/
hifn_write_1, add sparse annotations and fix an invalid endian conversion in
hifn_setup_src_desc.
    
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Acked-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b10c1706

drivers/crypto/hifn_795x.c

+30 −30
Original line number Diff line number Diff line
@@ -535,10 +535,10 @@ struct hifn_crypt_command 
 */

struct hifn_mac_command

{

	volatile u16 		masks;

	volatile u16 		header_skip;

	volatile u16 		source_count;

	volatile u16 		reserved;

	volatile __le16 	masks;

	volatile __le16 	header_skip;

	volatile __le16 	source_count;

	volatile __le16 	reserved;

};



#define	HIFN_MAC_CMD_ALG_MASK		0x0001
@@ -564,10 +564,10 @@ struct hifn_mac_command 


struct hifn_comp_command

{

	volatile u16 		masks;

	volatile u16 		header_skip;

	volatile u16 		source_count;

	volatile u16 		reserved;

	volatile __le16 	masks;

	volatile __le16 	header_skip;

	volatile __le16 	source_count;

	volatile __le16 	reserved;

};



#define	HIFN_COMP_CMD_SRCLEN_M		0xc000
@@ -583,10 +583,10 @@ struct hifn_comp_command 


struct hifn_base_result

{

	volatile u16 		flags;

	volatile u16 		session;

	volatile u16 		src_cnt;		/* 15:0 of source count */

	volatile u16 		dst_cnt;		/* 15:0 of dest count */

	volatile __le16 	flags;

	volatile __le16 	session;

	volatile __le16 	src_cnt;		/* 15:0 of source count */

	volatile __le16 	dst_cnt;		/* 15:0 of dest count */

};



#define	HIFN_BASE_RES_DSTOVERRUN	0x0200	/* destination overrun */
@@ -597,8 +597,8 @@ struct hifn_base_result 


struct hifn_comp_result

{

	volatile u16 		flags;

	volatile u16 		crc;

	volatile __le16		flags;

	volatile __le16		crc;

};



#define	HIFN_COMP_RES_LCB_M		0xff00	/* longitudinal check byte */
@@ -609,8 +609,8 @@ struct hifn_comp_result 


struct hifn_mac_result

{

	volatile u16 		flags;

	volatile u16 		reserved;

	volatile __le16 	flags;

	volatile __le16 	reserved;

	/* followed by 0, 6, 8, or 10 u16's of the MAC, then crypt */

};
@@ -619,8 +619,8 @@ struct hifn_mac_result 


struct hifn_crypt_result

{

	volatile u16 		flags;

	volatile u16 		reserved;

	volatile __le16		flags;

	volatile __le16		reserved;

};



#define	HIFN_CRYPT_RES_SRC_NOTZERO	0x0001	/* source expired */
@@ -686,12 +686,12 @@ static inline u32 hifn_read_1(struct hifn_device *dev, u32 reg) 


static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)

{

	writel(val, dev->bar[0] + reg);

	writel((__force u32)cpu_to_le32(val), dev->bar[0] + reg);

}



static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)

{

	writel(val, dev->bar[1] + reg);

	writel((__force u32)cpu_to_le32(val), dev->bar[1] + reg);

}



static void hifn_wait_puc(struct hifn_device *dev)
@@ -1037,14 +1037,14 @@ static void hifn_init_registers(struct hifn_device *dev) 
	hifn_write_0(dev, HIFN_0_PUIER, HIFN_PUIER_DSTOVER);



	/* write all 4 ring address registers */

	hifn_write_1(dev, HIFN_1_DMA_CRAR, __cpu_to_le32(dptr +

				offsetof(struct hifn_dma, cmdr[0])));

	hifn_write_1(dev, HIFN_1_DMA_SRAR, __cpu_to_le32(dptr +

				offsetof(struct hifn_dma, srcr[0])));

	hifn_write_1(dev, HIFN_1_DMA_DRAR, __cpu_to_le32(dptr +

				offsetof(struct hifn_dma, dstr[0])));

	hifn_write_1(dev, HIFN_1_DMA_RRAR, __cpu_to_le32(dptr +

				offsetof(struct hifn_dma, resr[0])));

	hifn_write_1(dev, HIFN_1_DMA_CRAR, dptr +

				offsetof(struct hifn_dma, cmdr[0]));

	hifn_write_1(dev, HIFN_1_DMA_SRAR, dptr +

				offsetof(struct hifn_dma, srcr[0]));

	hifn_write_1(dev, HIFN_1_DMA_DRAR, dptr +

				offsetof(struct hifn_dma, dstr[0]));

	hifn_write_1(dev, HIFN_1_DMA_RRAR, dptr +

				offsetof(struct hifn_dma, resr[0]));



	mdelay(2);

#if 0
@@ -1178,8 +1178,8 @@ static int hifn_setup_src_desc(struct hifn_device *dev, struct page *page, 
	idx = dma->srci;



	dma->srcr[idx].p = __cpu_to_le32(addr);

	dma->srcr[idx].l = __cpu_to_le32(size) | HIFN_D_VALID |

			HIFN_D_MASKDONEIRQ | HIFN_D_NOINVALID | HIFN_D_LAST;

	dma->srcr[idx].l = __cpu_to_le32(size | HIFN_D_VALID |

			HIFN_D_MASKDONEIRQ | HIFN_D_NOINVALID | HIFN_D_LAST);



	if (++idx == HIFN_D_SRC_RSIZE) {

		dma->srcr[idx].l = __cpu_to_le32(HIFN_D_VALID |