Yidi Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/85931?usp=email )
Change subject: soc/mediatek/common/dp: Use assert to check read/write API params ......................................................................
soc/mediatek/common/dp: Use assert to check read/write API params
With CB:85918 and CB:85930, we can clean up the TODO in mtk_dp_mask. Follow DP Phy APIs to use `assert` for the param examination.
TEST=verified on Ciri and Navi
Change-Id: I94e6ad36d190d773876cbb43eb4ebe17164f3c92 Signed-off-by: Yidi Lin yidilin@chromium.org --- M src/soc/mediatek/common/dp/dptx_hal_common.c 1 file changed, 9 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/85931/1
diff --git a/src/soc/mediatek/common/dp/dptx_hal_common.c b/src/soc/mediatek/common/dp/dptx_hal_common.c index 89da19c..257a976 100644 --- a/src/soc/mediatek/common/dp/dptx_hal_common.c +++ b/src/soc/mediatek/common/dp/dptx_hal_common.c @@ -16,11 +16,8 @@ { void *addr = mtk_dp->regs + offset;
- if (offset % 4 != 0 || offset > REG_OFFSET_LIMIT) { - printk(BIOS_ERR, "[%s] invalid offset %#x for reg %p\n", __func__, offset, - mtk_dp->regs); - return 0; - } + assert(mtk_dp->regs); + assert(offset % 4 == 0 && offset <= REG_OFFSET_LIMIT);
return read32(addr); } @@ -28,11 +25,8 @@ { void *addr = mtk_dp->regs + offset;
- if (offset % 4 != 0 || offset > REG_OFFSET_LIMIT) { - printk(BIOS_ERR, "[%s] invalid offset %#x for reg %p\n", __func__, offset, - mtk_dp->regs); - return; - } + assert(mtk_dp->regs); + assert(offset % 4 == 0 && offset <= REG_OFFSET_LIMIT);
write32(addr, val); } @@ -47,11 +41,11 @@ return; }
- /* - * TODO: modify to clrsetbits32(addr, mask, val); - * There is asserion error when testing assert((val & mask) == val). - */ - clrsetbits32(addr, mask, val & mask); + assert(mtk_dp->regs); + assert(offset % 4 == 0 && offset <= REG_OFFSET_LIMIT); + assert((val & mask) == val); + + clrsetbits32(addr, mask, val); }
void mtk_dp_write_byte(struct mtk_dp *mtk_dp, u32 addr, u8 val, u8 mask)