mvebu: Pretty prints

Improve debug prints in iob/iow/gwin/ccu drivers

Change-Id: Id62a107c538a8d2453961794b9147260c2f47088
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/49695
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Igal Liberman <igall@marvell.com>

5 files changed, 18 insertions, 7 deletions

diff --git a/drivers/marvell/amb_adec.c b/drivers/marvell/amb_adec.c
index bc8dd824..9413888e 100644
--- a/drivers/marvell/amb_adec.c
+++ b/drivers/marvell/amb_adec.c
@@ -118,6 +118,7 @@ static void dump_amb_adec(void)
 	uint32_t size, size_count;
 
 	/* Dump all AMB windows */
+	printf("============= AMB @ 0x%012lx ==============\n", amb_base - MVEBU_AMB_ADEC_OFFSET);
 	printf("bank  attribute     base          size\n");
 	printf("--------------------------------------------\n");
 	for (win_id = 0; win_id < AMB_MAX_WIN_ID; win_id++) {
@@ -130,6 +131,7 @@ static void dump_amb_adec(void)
 			printf("amb   0x%04x        0x%08x    0x%08x\n", attr, base, size);
 		}
 	}
+	printf("============= AMB @ 0x%012lx ==============\n", amb_base - MVEBU_AMB_ADEC_OFFSET);
 
 	return;
 }
diff --git a/drivers/marvell/ccu.c b/drivers/marvell/ccu.c
index 12904b47..62f3ec2a 100644
--- a/drivers/marvell/ccu.c
+++ b/drivers/marvell/ccu.c
@@ -66,24 +66,28 @@ static void dump_ccu(int ap_index)
 	uint64_t start, end;
 
 	/* Dump all AP windows */
+	printf("==================== AP-%d  CCU =====================\n", ap_index);
 	printf("bank  id target   start		     end\n");
 	printf("----------------------------------------------------\n");
 	for (win_id = 0; win_id < MVEBU_CCU_MAX_WINS; win_id++) {
 		win_cr = mmio_read_32(CCU_WIN_CR_OFFSET(ap_index, win_id));
-		printf("Win %d: 0x%x: 0x%x\n", win_id, CCU_WIN_CR_OFFSET(ap_index, win_id), win_cr);
+		/*printf("Win %d: 0x%x: 0x%x\n", win_id, CCU_WIN_CR_OFFSET(ap_index, win_id), win_cr);*/
+		printf("ccu   %02x", win_id);
 		if (win_cr & WIN_ENABLE_BIT) {
-			printf("\tWin %d: Enabled\n", win_id);
+			/*printf("\tWin %d: Enabled\n", win_id);*/
 			target_id = (win_cr >> CCU_TARGET_ID_OFFSET) & CCU_TARGET_ID_MASK;
 			alr = mmio_read_32(CCU_WIN_ALR_OFFSET(ap_index, win_id));
 			ahr = mmio_read_32(CCU_WIN_AHR_OFFSET(ap_index, win_id));
 			start = ((uint64_t)alr << ADDRESS_SHIFT);
 			end = (((uint64_t)ahr + 0x10) << ADDRESS_SHIFT);
-			printf("ccu   %02x %x  0x%016lx 0x%016lx\n", win_id, target_id, start, end);
-		}
+			printf(" %02x  0x%016lx 0x%016lx\n", target_id, start, end);
+		} else
+			printf("     D I S A B L E D\n");
 	}
 	win_cr = mmio_read_32(CCU_WIN_GCR_OFFSET(ap_index));
 	target_id = (win_cr >> CCU_GCR_TARGET_OFFSET) & CCU_GCR_TARGET_MASK;
 	printf("ccu   GCR %d - all other transactions\n", target_id);
+	printf("==================== AP-%d  CCU =====================\n", ap_index);
 
 	return;
 }
diff --git a/drivers/marvell/gwin.c b/drivers/marvell/gwin.c
index 8ba8c7f0..3675aba2 100644
--- a/drivers/marvell/gwin.c
+++ b/drivers/marvell/gwin.c
@@ -169,7 +169,7 @@ static void dump_gwin(int ap_index)
 	uint32_t win_num;
 
 	/* Dump all GWIN windows */
-	printf("GWIN for AP%d\n", ap_index);
+	printf("==================== AP-%d  GWIN ====================\n", ap_index);
 	printf("win\ttarget\tstart\t\t\tend\n");
 	printf("----------------------------------------------------\n");
 	for (win_num = 0; win_num < MVEBU_GWIN_MAX_WINS; win_num++) {
@@ -187,8 +187,9 @@ static void dump_gwin(int ap_index)
 			ahr = (ahr >> ADDRESS_LSHIFT) << ADDRESS_RSHIFT;
 			printf("0x%016lx 0x%016lx\n", alr, ahr);
 		} else
-			printf("\t Disabled\n");
+			printf("\t D I S A B L E D\n");
 	}
+	printf("==================== AP-%d  GWIN ====================\n", ap_index);
 	return;
 }
 #endif
diff --git a/drivers/marvell/io_win.c b/drivers/marvell/io_win.c
index 00203906..5c27d6d2 100644
--- a/drivers/marvell/io_win.c
+++ b/drivers/marvell/io_win.c
@@ -172,6 +172,7 @@ static void dump_io_win(int ap_index)
 	uint64_t start, end;
 
 	/* Dump all IO windows */
+	printf("==================== AP-%d  IOW =====================\n", ap_index);
 	printf("bank  target     start              end\n");
 	printf("----------------------------------------------------\n");
 	for (win_id = 0; win_id < MVEBU_IO_WIN_MAX_WINS; win_id++) {
@@ -186,6 +187,7 @@ static void dump_io_win(int ap_index)
 		}
 	}
 	printf("io-win gcr is %x\n", mmio_read_32(MVEBU_IO_WIN_BASE(ap_index) + MVEBU_IO_WIN_GCR_OFFSET));
+	printf("==================== AP-%d  IOW =====================\n", ap_index);
 
 	return;
 }
diff --git a/drivers/marvell/iob.c b/drivers/marvell/iob.c
index cc32ec25..8436237b 100644
--- a/drivers/marvell/iob.c
+++ b/drivers/marvell/iob.c
@@ -112,10 +112,11 @@ static void dump_iob(void)
 	uint32_t win_id, win_cr, alr, ahr;
 	uint8_t target_id;
 	uint64_t start, end;
-	char *iob_target_name[IOB_MAX_TID] = {"CONFIG", "MCI0 ", "PEX1 ", "PEX2 ",
+	char *iob_target_name[IOB_MAX_TID] = {"CFG  ", "MCI0 ", "PEX1 ", "PEX2 ",
 					      "PEX0 ", "NAND ", "RUNIT", "MCI1 "};
 
 	/* Dump all IOB windows */
+	printf("============= IOB @ 0x%012lx ==============\n", iob_base - MVEBU_IOB_OFFSET);
 	printf("bank  id target  start              end\n");
 	printf("----------------------------------------------------\n");
 	for (win_id = 0; win_id < MVEBU_IOB_MAX_WINS; win_id++) {
@@ -136,6 +137,7 @@ static void dump_iob(void)
 					, win_id, iob_target_name[target_id], start, end);
 		}
 	}
+	printf("============= IOB @ 0x%012lx ==============\n", iob_base - MVEBU_IOB_OFFSET);
 
 	return;
 }