From 941db0e55ce85501bdb557bd72d8980c01b5ccd3 Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Fri, 23 Jul 2021 16:17:11 +0800 Subject: helpers: Add GENMASK macro The GENMASK is defined in multiple files (with various names such as MASKBIT), which sets certain consecutive bits to 1 and leaves the others to 0. To avoid duplicate macros, add GENMASK macro to helpers.h. GENMASK(high, low) sets bits from `high` to `low` (inclusive) to 1. For example, GENMASK(39, 21) gives us the 64-bit vector 0x000000ffffe00000. Remove duplicate macro definitions. Also utilize GENMASK for _BF_MASK in mmio.h. BUG=none TEST=make tests/commonlib/bsd/helpers-test TEST=emerge-cherry coreboot BRANCH=none Change-Id: If2e7c4827d8a7d27688534593b556a72f16f0c2b Signed-off-by: Yu-Ping Wu Reviewed-on: https://review.coreboot.org/c/coreboot/+/56543 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/include/device/mmio.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/include') diff --git a/src/include/device/mmio.h b/src/include/device/mmio.h index 9b79d79bb5..ca3dfa956e 100644 --- a/src/include/device/mmio.h +++ b/src/include/device/mmio.h @@ -4,6 +4,7 @@ #define __DEVICE_MMIO_H__ #include +#include #include #include @@ -130,7 +131,8 @@ static inline void buffer_to_fifo32(void *buffer, size_t size, void *fifo, #define DEFINE_BIT(name, bit) DEFINE_BITFIELD(name, bit, bit) #define _BF_MASK(name, value) \ - ((u32)((1ULL << name##_BITFIELD_SIZE) - 1) << name##_BITFIELD_SHIFT) + ((u32)GENMASK(name##_BITFIELD_SHIFT + name##_BITFIELD_SIZE - 1, \ + name##_BITFIELD_SHIFT)) #define _BF_VALUE(name, value) \ (((u32)(value) << name##_BITFIELD_SHIFT) & _BF_MASK(name, 0)) -- cgit v1.2.3