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

Commit 588b34be authored by Daniel Axtens's avatar Daniel Axtens Committed by Michael Ellerman
Browse files

cxl: Convert MMIO read/write macros to inline functions 



We're about to make these more complex, so make them functions
first.

Signed-off-by: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e642d11b

drivers/misc/cxl/cxl.h

+35 −16
Original line number Diff line number Diff line
@@ -537,10 +537,15 @@ static inline void __iomem *_cxl_p1_addr(struct cxl *cxl, cxl_p1_reg_t reg) 
	return cxl->p1_mmio + cxl_reg_off(reg);

}



#define cxl_p1_write(cxl, reg, val) \

	out_be64(_cxl_p1_addr(cxl, reg), val)

#define cxl_p1_read(cxl, reg) \

	in_be64(_cxl_p1_addr(cxl, reg))

static inline void cxl_p1_write(struct cxl *cxl, cxl_p1_reg_t reg, u64 val)

{

	out_be64(_cxl_p1_addr(cxl, reg), val);

}



static inline u64 cxl_p1_read(struct cxl *cxl, cxl_p1_reg_t reg)

{

	return in_be64(_cxl_p1_addr(cxl, reg));

}



static inline void __iomem *_cxl_p1n_addr(struct cxl_afu *afu, cxl_p1n_reg_t reg)

{
@@ -548,26 +553,40 @@ static inline void __iomem *_cxl_p1n_addr(struct cxl_afu *afu, cxl_p1n_reg_t reg 
	return afu->p1n_mmio + cxl_reg_off(reg);

}



#define cxl_p1n_write(afu, reg, val) \

	out_be64(_cxl_p1n_addr(afu, reg), val)

#define cxl_p1n_read(afu, reg) \

	in_be64(_cxl_p1n_addr(afu, reg))

static inline void cxl_p1n_write(struct cxl_afu *afu, cxl_p1n_reg_t reg, u64 val)

{

	out_be64(_cxl_p1n_addr(afu, reg), val);

}



static inline u64 cxl_p1n_read(struct cxl_afu *afu, cxl_p1n_reg_t reg)

{

	return in_be64(_cxl_p1n_addr(afu, reg));

}



static inline void __iomem *_cxl_p2n_addr(struct cxl_afu *afu, cxl_p2n_reg_t reg)

{

	return afu->p2n_mmio + cxl_reg_off(reg);

}



#define cxl_p2n_write(afu, reg, val) \

	out_be64(_cxl_p2n_addr(afu, reg), val)

#define cxl_p2n_read(afu, reg) \

	in_be64(_cxl_p2n_addr(afu, reg))

static inline void cxl_p2n_write(struct cxl_afu *afu, cxl_p2n_reg_t reg, u64 val)

{

	out_be64(_cxl_p2n_addr(afu, reg), val);

}



static inline u64 cxl_p2n_read(struct cxl_afu *afu, cxl_p2n_reg_t reg)

{

	return in_be64(_cxl_p2n_addr(afu, reg));

}



#define cxl_afu_cr_read64(afu, cr, off) \

	in_le64((afu)->afu_desc_mmio + (afu)->crs_offset + ((cr) * (afu)->crs_len) + (off))

#define cxl_afu_cr_read32(afu, cr, off) \

	in_le32((afu)->afu_desc_mmio + (afu)->crs_offset + ((cr) * (afu)->crs_len) + (off))

static inline u64 cxl_afu_cr_read64(struct cxl_afu *afu, int cr, u64 off)

{

	return in_le64((afu)->afu_desc_mmio + (afu)->crs_offset + ((cr) * (afu)->crs_len) + (off));

}



static inline u32 cxl_afu_cr_read32(struct cxl_afu *afu, int cr, u64 off)

{

	return in_le32((afu)->afu_desc_mmio + (afu)->crs_offset + ((cr) * (afu)->crs_len) + (off));

}

u16 cxl_afu_cr_read16(struct cxl_afu *afu, int cr, u64 off);

u8 cxl_afu_cr_read8(struct cxl_afu *afu, int cr, u64 off);