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 --- tests/commonlib/bsd/helpers-test.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tests') diff --git a/tests/commonlib/bsd/helpers-test.c b/tests/commonlib/bsd/helpers-test.c index ec3f98bed17a..324c901b127f 100644 --- a/tests/commonlib/bsd/helpers-test.c +++ b/tests/commonlib/bsd/helpers-test.c @@ -8,6 +8,19 @@ static void func(void) function_called(); } +static void test_genmask(void **state) +{ + assert_int_equal(GENMASK(4, 4), 0x10); + assert_int_equal(GENMASK(4, 3), 0x18); + assert_int_equal(GENMASK(4, 0), 0x1f); + /* Edge cases */ + assert_int_equal(GENMASK(0, 0), 1); + assert_int_equal(GENMASK(31, 31), 0x80000000); + assert_int_equal(GENMASK(31, 0), 0xffffffff); + assert_int_equal(GENMASK(63, 63), 0x8000000000000000); + assert_int_equal(GENMASK(63, 0), 0xffffffffffffffff); +} + static void test_retry(void **state) { int count; @@ -34,6 +47,7 @@ static void test_retry(void **state) int main(void) { const struct CMUnitTest tests[] = { + cmocka_unit_test(test_genmask), cmocka_unit_test(test_retry), }; -- cgit v1.2.3