Skip to contentSkip to conversation

driver/fsl_debug_server: Fix the DDR hide logic for LS2085a

PATCH Superseded Prabhakar Kushwaha 2 participants 2 messages May 18, 2015 – May 26, 2015

Subsystems (2)
Network drivers Char and misc drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Prabhakar Kushwaha

author
#0 lore raw

PATCH 17/20 driver/fsl_debug_server: Fix the DDR hide logic for LS2085a

From: Bhupesh Sharma <[email protected]>

This patch fixes the DDR hide logic for LS2085a, correcting the way the Debug Server FW and MC FW images are placed on the top of system DDR and how the rest of the system DDR space is made visibile to Linux.

Signed-off-by Bhupesh Sharma <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
---
 drivers/misc/fsl_debug_server.c | 5 +++++
 drivers/net/fsl-mc/mc.c         | 8 --------
 2 files changed, 5 insertions(+), 8 deletions(-)
drivers/misc/fsl_debug_server.c +5 -0
index e080fe6..44cd9b9 100644
@@ -10,6 +10,7 @@
 #include <asm/system.h>
 #include <asm/arch-fsl-lsch3/immap_lsch3.h>
 
+#include <fsl-mc/fsl_mc.h>
 #include <fsl_debug_server.h>
 
 DECLARE_GLOBAL_DATA_PTR;

@@ -151,6 +152,10 @@ int debug_server_init(void)
 		debug_server_ram_addr =
 			gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;
 
+#ifdef CONFIG_FSL_MC_ENET
+	debug_server_ram_addr += mc_get_dram_block_size();
+#endif
+
 	error = debug_server_parse_firmware_fit_image(&raw_image_addr,
 							&raw_image_size);
 	if (error != 0)
drivers/net/fsl-mc/mc.c +0 -8
index c5c44bc..f4a050a 100644
@@ -9,7 +9,6 @@
 #include <fsl-mc/fsl_mc_sys.h>
 #include <fsl-mc/fsl_mc_private.h>
 #include <fsl-mc/fsl_dpmng.h>
-#include <fsl_debug_server.h>
 #include <fsl-mc/fsl_dprc.h>
 #include <fsl-mc/fsl_dpio.h>
 #include <fsl-mc/fsl_qbman_portal.h>

@@ -403,13 +402,6 @@ int mc_init(void)
 			gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;
 	}
 
-#ifdef CONFIG_FSL_DEBUG_SERVER
-	/*
-	 * FIXME: I don't think this is right. See get_dram_size_to_hide()
-	 */
-		mc_ram_addr -= debug_server_get_dram_block_size();
-#endif
-
 	error = calculate_mc_private_ram_params(mc_ram_addr,
 						mc_ram_size,
 						&mc_ram_aligned_base_addr,
Signature · 1 line
1.9.1
#1 lore raw

PATCH 17/20 driver/fsl_debug_server: Fix the DDR hide logic for LS2085a

Quoted 9 lines · Prabhakar Kushwaha

From: Bhupesh Sharma <[email protected]>

This patch fixes the DDR hide logic for LS2085a, correcting the way the Debug Server FW and MC FW images are placed on the top of system DDR and how the rest of the system DDR space is made visibile to Linux.

Signed-off-by Bhupesh Sharma <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>

---

It would be nice to add some description in SoC README file.

York