diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-08-13 15:29:29 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-08-30 09:22:15 +0100 |
| commit | b9f68dfbfe51e417bb60e7b6db64281da545537f (patch) | |
| tree | bffe44c5c11d3b3a7c24fb1ce057216e9bea352b /drivers | |
| parent | 2a7c9e15c23b376121747ccae78bef91db6225ba (diff) | |
| download | platform_external_arm-trusted-firmware-b9f68dfbfe51e417bb60e7b6db64281da545537f.tar.gz platform_external_arm-trusted-firmware-b9f68dfbfe51e417bb60e7b6db64281da545537f.tar.bz2 platform_external_arm-trusted-firmware-b9f68dfbfe51e417bb60e7b6db64281da545537f.zip | |
gic v3: Turn macros into static inline functions
Change-Id: Ib587f12f36810fc7d4f4b8f575195554299b8ed4
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/gic/v3/gicv3_private.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h index e1c0775f7..357a76f90 100644 --- a/drivers/arm/gic/v3/gicv3_private.h +++ b/drivers/arm/gic/v3/gicv3_private.h @@ -27,20 +27,28 @@ * GICD_IROUTER. Bits[31:24] in the MPIDR are cleared as they are not relevant * to GICv3. */ -#define gicd_irouter_val_from_mpidr(_mpidr, _irm) \ - ((_mpidr & ~(0xff << 24)) | \ - (_irm & IROUTER_IRM_MASK) << IROUTER_IRM_SHIFT) +static inline u_register_t gicd_irouter_val_from_mpidr(u_register_t mpidr, + unsigned int irm) +{ + return (mpidr & ~(U(0xff) << 24)) | + ((irm & IROUTER_IRM_MASK) << IROUTER_IRM_SHIFT); +} /* * Macro to convert a GICR_TYPER affinity value into a MPIDR value. Bits[31:24] * are zeroes. */ #ifdef AARCH32 -#define mpidr_from_gicr_typer(_typer_val) (((_typer_val) >> 32) & 0xffffff) +static inline u_register_t mpidr_from_gicr_typer(uint64_t typer_val) +{ + return (((typer_val) >> 32) & U(0xffffff)); +} #else -#define mpidr_from_gicr_typer(_typer_val) \ - (((((_typer_val) >> 56) & MPIDR_AFFLVL_MASK) << MPIDR_AFF3_SHIFT) | \ - (((_typer_val) >> 32) & 0xffffff)) +static inline u_register_t mpidr_from_gicr_typer(uint64_t typer_val) +{ + return (((typer_val >> 56) & MPIDR_AFFLVL_MASK) << MPIDR_AFF3_SHIFT) | + ((typer_val >> 32) & U(0xffffff)); +} #endif /******************************************************************************* |