| Message ID | 1439340500-18610-2-git-send-email-dja@axtens.net (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Wed, 12 Aug 2015 10:48:10 +1000 Daniel Axtens <dja@axtens.net> wrote: > We're about to make these more complex, so make them functions > first. > Reviewed-by: Cyril Bur <cyrilbur@gmail.com> > Signed-off-by: Daniel Axtens <dja@axtens.net> > --- > drivers/misc/cxl/cxl.h | 51 ++++++++++++++++++++++++++++++++++---------------- > 1 file changed, 35 insertions(+), 16 deletions(-) > > diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h > index 4fd66cabde1e..6a93bfbcd826 100644 > --- a/drivers/misc/cxl/cxl.h > +++ b/drivers/misc/cxl/cxl.h > @@ -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); >
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h index 4fd66cabde1e..6a93bfbcd826 100644 --- a/drivers/misc/cxl/cxl.h +++ b/drivers/misc/cxl/cxl.h @@ -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);
We're about to make these more complex, so make them functions first. Signed-off-by: Daniel Axtens <dja@axtens.net> --- drivers/misc/cxl/cxl.h | 51 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 16 deletions(-)