[RAMEN9610-9963][COMMON] lib: dss: split to define reserve memory for user/eng

Change-Id: I66fb5689f214391f56e54a4fc1e62370d9f9aaee
Signed-off-by: Hosung Kim <hosung0.kim@samsung.com>

diff --git a/include/dt-bindings/soc/samsung/debug-snapshot-table.h b/include/dt-bindings/soc/samsung/debug-snapshot-table.h
index a93502484fda90ea5ed1d157adaf1aee384b1a25..7f99cce2a9cf8e6d04c55022613d536526a0ec5f 100644 (file)
--- a/include/dt-bindings/soc/samsung/debug-snapshot-table.h
+++ b/include/dt-bindings/soc/samsung/debug-snapshot-table.h
@@ -53,6 +53,8 @@
 
 #define DSS_START_ADDR                 0xF9000000
 #define DSS_HEADER_SIZE                        SZ_64K
+
+/* ENG MODE Configuration */
 #define DSS_LOG_KERNEL_SIZE            (2 * SZ_1M)
 #define DSS_LOG_PLATFORM_SIZE          (4 * SZ_1M)
 #define DSS_LOG_SFR_SIZE               (2 * SZ_1M)
@@ -85,4 +87,36 @@
 #define DSS_LOG_PSTORE_ADDR            (DSS_START_ADDR + DSS_LOG_PSTORE_OFFSET)
 #define DSS_LOG_KEVENTS_ADDR           (DSS_START_ADDR + DSS_LOG_KEVENTS_OFFSET)
 
+/* USER, USERDEBUG MODE Configuration */
+#define DSS_LOG_KERNEL_SIZE_USER       (2 * SZ_1M)
+#define DSS_LOG_PLATFORM_SIZE_USER     (2 * SZ_1M)
+#define DSS_LOG_SFR_SIZE_USER          (0)
+#define DSS_LOG_S2D_SIZE_USER          (0)
+#define DSS_LOG_CACHEDUMP_SIZE_USER    (0)
+#define DSS_LOG_ETM_SIZE_USER          (0)
+#define DSS_LOG_BCM_SIZE_USER          (0)
+#define DSS_LOG_PSTORE_SIZE_USER       (SZ_512K)
+#define DSS_LOG_KEVENTS_SIZE_USER      (3 * SZ_1M)
+
+#define DSS_LOG_KERNEL_OFFSET_USER     (DSS_HEADER_OFFSET + DSS_HEADER_SIZE)
+#define DSS_LOG_PLATFORM_OFFSET_USER   (DSS_LOG_KERNEL_OFFSET_USER + DSS_LOG_KERNEL_SIZE_USER)
+#define DSS_LOG_SFR_OFFSET_USER                (DSS_LOG_PLATFORM_OFFSET_USER + DSS_LOG_PLATFORM_SIZE_USER)
+#define DSS_LOG_S2D_OFFSET_USER                (DSS_LOG_SFR_OFFSET_USER + DSS_LOG_SFR_SIZE_USER)
+#define DSS_LOG_CACHEDUMP_OFFSET_USER  (DSS_LOG_S2D_OFFSET_USER + DSS_LOG_S2D_SIZE_USER)
+#define DSS_LOG_ETM_OFFSET_USER                (DSS_LOG_CACHEDUMP_OFFSET_USER + DSS_LOG_CACHEDUMP_SIZE_USER)
+#define DSS_LOG_BCM_OFFSET_USER                (DSS_LOG_ETM_OFFSET_USER + DSS_LOG_ETM_SIZE_USER)
+#define DSS_LOG_PSTORE_OFFSET_USER     (DSS_LOG_BCM_OFFSET_USER + DSS_LOG_BCM_SIZE_USER)
+#define DSS_LOG_KEVENTS_OFFSET_USER    (DSS_LOG_PSTORE_OFFSET_USER + DSS_LOG_PSTORE_SIZE_USER)
+
+#define DSS_HEADER_ADDR_USER           (DSS_START_ADDR + DSS_HEADER_OFFSET_USER)
+#define DSS_LOG_KERNEL_ADDR_USER       (DSS_START_ADDR + DSS_LOG_KERNEL_OFFSET_USER)
+#define DSS_LOG_PLATFORM_ADDR_USER     (DSS_START_ADDR + DSS_LOG_PLATFORM_OFFSET_USER)
+#define DSS_LOG_SFR_ADDR_USER          (DSS_START_ADDR + DSS_LOG_SFR_OFFSET_USER)
+#define DSS_LOG_S2D_ADDR_USER          (DSS_START_ADDR + DSS_LOG_S2D_OFFSET_USER)
+#define DSS_LOG_CACHEDUMP_ADDR_USER    (DSS_START_ADDR + DSS_LOG_CACHEDUMP_OFFSET_USER)
+#define DSS_LOG_ETM_ADDR_USER          (DSS_START_ADDR + DSS_LOG_ETM_OFFSET_USER)
+#define DSS_LOG_BCM_ADDR_USER          (DSS_START_ADDR + DSS_LOG_BCM_OFFSET_USER)
+#define DSS_LOG_PSTORE_ADDR_USER       (DSS_START_ADDR + DSS_LOG_PSTORE_OFFSET_USER)
+#define DSS_LOG_KEVENTS_ADDR_USER      (DSS_START_ADDR + DSS_LOG_KEVENTS_OFFSET_USER)
+
 #endif

diff --git a/lib/debug-snapshot.c b/lib/debug-snapshot.c
index f7dbf3c3dbca07863ed1ea914f2bac460cbca4ab..a5006839f77f2a11058102fba500da79a35960ad 100644 (file)
--- a/lib/debug-snapshot.c
+++ b/lib/debug-snapshot.c
@@ -495,6 +495,7 @@ static int __init dbg_snapshot_item_reserved_mem_setup(struct reserved_mem *reme
 #define DECLARE_DBG_SNAPSHOT_RESERVED_REGION(compat, name) \
 RESERVEDMEM_OF_DECLARE(name, compat#name, dbg_snapshot_item_reserved_mem_setup)
 
+#if !defined(CONFIG_DEBUG_SNAPSHOT_USER_MODE)
 DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", header);
 DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_kernel);
 DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_platform);
@@ -505,6 +506,18 @@ DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_etm);
 DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_bcm);
 DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_pstore);
 DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_kevents);
+#else
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", header);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_kernel_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_platform_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_sfr_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_s2d_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_cachedump_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_etm_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_bcm_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_pstore_user);
+DECLARE_DBG_SNAPSHOT_RESERVED_REGION("debug-snapshot,", log_kevents_user);
+#endif
 #endif
 
 /*