andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "fix(plat/marvell/a3k): fix printing info messages on output" into integration

This commit is contained in:
Madhukar Pappireddy 2021-07-19 02:58:05 +02:00 committed by TrustedFirmware Code Review
parent 384953df68 9f6d154083
commit 447e93eb81
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plat/marvell/armada/a3k/common/io_addr_dec.c
View File

@ -67,17 +67,14 @@ static void set_io_addr_dec_win(int win_id, uintptr_t base_addr,
mmio_write_32(MVEBU_DEC_WIN_CTRL_REG(dec_win->dec_reg_base, mmio_write_32(MVEBU_DEC_WIN_CTRL_REG(dec_win->dec_reg_base,
win_id, dec_win->win_offset), ctrl); win_id, dec_win->win_offset), ctrl);
INFO("set_io_addr_dec %d result: ctrl(0x%x) base(0x%x)", INFO("set_io_addr_dec %d result: ctrl(0x%x) base(0x%x) remap(0x%x)\n",
win_id, mmio_read_32(MVEBU_DEC_WIN_CTRL_REG(dec_win->dec_reg_base, win_id, mmio_read_32(MVEBU_DEC_WIN_CTRL_REG(dec_win->dec_reg_base,
win_id, dec_win->win_offset)), win_id, dec_win->win_offset)),
mmio_read_32(MVEBU_DEC_WIN_BASE_REG(dec_win->dec_reg_base, mmio_read_32(MVEBU_DEC_WIN_BASE_REG(dec_win->dec_reg_base,
win_id, dec_win->win_offset))); win_id, dec_win->win_offset)),
if (win_id < dec_win->max_remap) (win_id < dec_win->max_remap) ?
INFO(" remap(%x)\n", mmio_read_32(MVEBU_DEC_WIN_REMAP_REG(dec_win->dec_reg_base,
mmio_read_32(MVEBU_DEC_WIN_REMAP_REG(dec_win->dec_reg_base, win_id, dec_win->win_offset)) : 0);
win_id, dec_win->win_offset)));
else
INFO("\n");
} }
/* Set io decode window */ /* Set io decode window */
@ -167,12 +164,11 @@ int init_io_addr_dec(struct dram_win_map *dram_wins_map,
ERROR("Failed to set IO address decode\n"); ERROR("Failed to set IO address decode\n");
return -1; return -1;
} }
INFO("Set IO decode window successfully, base(0x%x)", INFO("Set IO decode window successfully, base(0x%x)"
io_dec_win->dec_reg_base); " win_attr(%x) max_dram_win(%d) max_remap(%d)"
INFO(" win_attr(%x) max_dram_win(%d) max_remap(%d)", " win_offset(%d)\n", io_dec_win->dec_reg_base,
io_dec_win->win_attr, io_dec_win->max_dram_win, io_dec_win->win_attr, io_dec_win->max_dram_win,
io_dec_win->max_remap); io_dec_win->max_remap, io_dec_win->win_offset);
INFO(" win_offset(%d)\n", io_dec_win->win_offset);
} }
return 0; return 0;