ap810: debug: update debug prints of address decode

Change-Id: I9bf7cdd4d7566f032147843df552ea6cad2471ce
Signed-off-by: Hanna Hawa <hannah@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/51355
Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
Tested-by: iSoC Platform CI <ykjenk@marvell.com>

3 files changed, 13 insertions, 18 deletions

diff --git a/drivers/marvell/ccu.c b/drivers/marvell/ccu.c
index 6040cfd2..2ba16c3f 100644
--- a/drivers/marvell/ccu.c
+++ b/drivers/marvell/ccu.c
@@ -61,24 +61,22 @@ static void dump_ccu(int ap_index)
 	uint64_t start, end;
 
 	/* Dump all AP windows */
-	printf("bank  id target   start		     end\n");
-	printf("----------------------------------------------------\n");
+	printf("\tbank  target     start              end\n");
+	printf("\t----------------------------------------------------\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("ccu   %02x", win_id);
 		if (win_cr & WIN_ENABLE_BIT) {
 			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(" %02x  0x%016lx 0x%016lx\n", target_id, start, end);
-		} else
-			printf("     Disabled\n");
+			printf("\tccu    %02x     0x%016lx 0x%016lx\n", target_id, start, end);
+		}
 	}
 	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("\tccu   GCR %d - all other transactions\n", target_id);
 
 	return;
 }
diff --git a/drivers/marvell/gwin.c b/drivers/marvell/gwin.c
index 892b31d0..06f4c613 100644
--- a/drivers/marvell/gwin.c
+++ b/drivers/marvell/gwin.c
@@ -169,24 +169,21 @@ static void dump_gwin(int ap_index)
 	uint32_t win_num;
 
 	/* Dump all GWIN windows */
-	printf("win\ttarget\tstart\t\t\tend\n");
-	printf("----------------------------------------------------\n");
+	printf("\tbank  target     start              end\n");
+	printf("\t----------------------------------------------------\n");
 	for (win_num = 0; win_num < MVEBU_GWIN_MAX_WINS; win_num++) {
 		uint32_t cr;
 		uint64_t alr, ahr;
 
 		cr  = mmio_read_32(GWIN_CR_OFFSET(ap_index, win_num));
-		printf("%02d\t ", win_num);
 		/* Window enabled */
 		if (cr & WIN_ENABLE_BIT) {
-			printf("%02d\t ", (cr >> 8) & 0xF);
 			alr = mmio_read_32(GWIN_ALR_OFFSET(ap_index, win_num));
 			alr = (alr >> ADDRESS_LSHIFT) << ADDRESS_RSHIFT;
 			ahr = mmio_read_32(GWIN_AHR_OFFSET(ap_index, win_num));
 			ahr = (ahr >> ADDRESS_LSHIFT) << ADDRESS_RSHIFT;
-			printf("0x%016lx 0x%016lx\n", alr, ahr);
-		} else
-			printf("\t Disabled\n");
+			printf("\tgwin   %d     0x%016lx 0x%016lx\n", (cr >> 8) & 0xF, alr, ahr);
+		}
 	}
 	return;
 }
diff --git a/drivers/marvell/io_win.c b/drivers/marvell/io_win.c
index 00203906..845b7e61 100644
--- a/drivers/marvell/io_win.c
+++ b/drivers/marvell/io_win.c
@@ -172,8 +172,8 @@ static void dump_io_win(int ap_index)
 	uint64_t start, end;
 
 	/* Dump all IO windows */
-	printf("bank  target     start              end\n");
-	printf("----------------------------------------------------\n");
+	printf("\tbank  target     start              end\n");
+	printf("\t----------------------------------------------------\n");
 	for (win_id = 0; win_id < MVEBU_IO_WIN_MAX_WINS; win_id++) {
 		alr = mmio_read_32(IO_WIN_ALR_OFFSET(ap_index, win_id));
 		if (alr & WIN_ENABLE_BIT) {
@@ -182,10 +182,10 @@ static void dump_io_win(int ap_index)
 			trgt_id = mmio_read_32(IO_WIN_CR_OFFSET(ap_index, win_id));
 			start = ((uint64_t)alr << ADDRESS_SHIFT);
 			end = (((uint64_t)ahr + 0x10) << ADDRESS_SHIFT);
-			printf("io-win %d  0x%016lx 0x%016lx\n", trgt_id, start, end);
+			printf("\tio-win %d     0x%016lx 0x%016lx\n", trgt_id, start, end);
 		}
 	}
-	printf("io-win gcr is %x\n", mmio_read_32(MVEBU_IO_WIN_BASE(ap_index) + MVEBU_IO_WIN_GCR_OFFSET));
+	printf("\tio-win gcr is %x\n", mmio_read_32(MVEBU_IO_WIN_BASE(ap_index) + MVEBU_IO_WIN_GCR_OFFSET));
 
 	return;
 }