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 <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56543
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
diff --git a/src/soc/mediatek/mt8195/dptx_hal.c b/src/soc/mediatek/mt8195/dptx_hal.c
index 6c6143a..cc96cc8 100644
--- a/src/soc/mediatek/mt8195/dptx_hal.c
+++ b/src/soc/mediatek/mt8195/dptx_hal.c
@@ -9,6 +9,7 @@
#include <soc/dptx_reg.h>
#include <string.h>
#include <timer.h>
+#include <types.h>
#define REG_OFFSET_LIMIT 0x8000
@@ -173,21 +174,21 @@
{
/* MISC0 */
mtk_dp_write_byte(mtk_dp, REG_3034_DP_ENCODER0_P0,
- out_format << 0x1, MASKBIT(2, 1));
+ out_format << 0x1, GENMASK(2, 1));
switch (out_format) {
case DP_COLOR_FORMAT_RGB_444:
case DP_COLOR_FORMAT_YUV_444:
mtk_dp_write_byte(mtk_dp, REG_303C_DP_ENCODER0_P0 + 1,
- 0, MASKBIT(6, 4));
+ 0, GENMASK(6, 4));
break;
case DP_COLOR_FORMAT_YUV_422:
mtk_dp_write_byte(mtk_dp, REG_303C_DP_ENCODER0_P0 + 1,
- BIT(4), MASKBIT(6, 4));
+ BIT(4), GENMASK(6, 4));
break;
case DP_COLOR_FORMAT_YUV_420:
mtk_dp_write_byte(mtk_dp, REG_303C_DP_ENCODER0_P0 + 1, BIT(5),
- MASKBIT(6, 4));
+ GENMASK(6, 4));
break;
default:
break;
@@ -592,15 +593,15 @@
{
/* [7]:int, [6]:Con, [5]DisCon, [4]No-Use: UnMASK HPD Port */
mtk_dp_write_byte(mtk_dp, REG_3418_DP_TRANS_P0,
- enable ? 0 : MASKBIT(7, 5), MASKBIT(7, 5));
+ enable ? 0 : GENMASK(7, 5), GENMASK(7, 5));
}
void dptx_hal_hpd_detect_setting(struct mtk_dp *mtk_dp)
{
mtk_dp_write_byte(mtk_dp, REG_3410_DP_TRANS_P0,
- 0x8, MASKBIT(3, 0));
+ 0x8, GENMASK(3, 0));
mtk_dp_write_byte(mtk_dp, REG_3410_DP_TRANS_P0,
- 0xa << 4, MASKBIT(7, 4));
+ 0xa << 4, GENMASK(7, 4));
DP_WRITE1BYTE(mtk_dp, REG_3410_DP_TRANS_P0 + 1, 0x55);
DP_WRITE1BYTE(mtk_dp, REG_3430_DP_TRANS_P0, 0x2);
@@ -643,14 +644,14 @@
void dptx_hal_ssc_en(struct mtk_dp *mtk_dp, bool enable)
{
- mtk_dp_mask(mtk_dp, 0x2000, BIT(0), MASKBIT(1, 0));
+ mtk_dp_mask(mtk_dp, 0x2000, BIT(0), GENMASK(1, 0));
if (enable)
mtk_dp_mask(mtk_dp, 0x1014, BIT(3), BIT(3));
else
mtk_dp_mask(mtk_dp, 0x1014, 0x0, BIT(3));
- mtk_dp_mask(mtk_dp, 0x2000, MASKBIT(1, 0), MASKBIT(1, 0));
+ mtk_dp_mask(mtk_dp, 0x2000, GENMASK(1, 0), GENMASK(1, 0));
mdelay(1);
}
@@ -666,7 +667,7 @@
DP_WRITE1BYTE(mtk_dp, REG_3634_AUX_TX_P0 + 1, 0x19);
/* 0xd for 26M */
mtk_dp_write_byte(mtk_dp, REG_3614_AUX_TX_P0,
- 0xd, MASKBIT(6, 0));
+ 0xd, GENMASK(6, 0));
mtk_dp_mask(mtk_dp, REG_37C8_AUX_TX_P0,
0x01 << MTK_ATOP_EN_AUX_TX_P0_FLDMASK_POS,
MTK_ATOP_EN_AUX_TX_P0_FLDMASK);
@@ -681,7 +682,7 @@
dptx_hal_set_color_depth(mtk_dp, DP_COLOR_DEPTH_8BIT);
mtk_dp_write_byte(mtk_dp, REG_3368_DP_ENCODER1_P0 + 1,
- BIT(4), MASKBIT(5, 4));
+ BIT(4), GENMASK(5, 4));
/* DPtx encoder reset all sw. */
mtk_dp_write_byte(mtk_dp, REG_3004_DP_ENCODER0_P0 + 1, BIT(1), BIT(1));
@@ -758,7 +759,7 @@
dptx_hal_phy_setidlepattern(mtk_dp, false);
mtk_dp_write_byte(mtk_dp, REG_3400_DP_TRANS_P0 + 1,
- value, MASKBIT(7, 4));
+ value, GENMASK(7, 4));
}
void dptx_hal_phy_setidlepattern(struct mtk_dp *mtk_dp, bool enable)