From: Hosung Kim Date: Wed, 26 Dec 2018 11:44:56 +0000 (+0900) Subject: [RAMEN9610-9963][COMMON] lib: dss: split to define reserve memory for user/eng X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=650e293ac81e29180c181249e7fea19e5b14fb1b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [RAMEN9610-9963][COMMON] lib: dss: split to define reserve memory for user/eng Change-Id: I66fb5689f214391f56e54a4fc1e62370d9f9aaee Signed-off-by: Hosung Kim --- diff --git a/include/dt-bindings/soc/samsung/debug-snapshot-table.h b/include/dt-bindings/soc/samsung/debug-snapshot-table.h index a93502484fda..7f99cce2a9cf 100644 --- 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 f7dbf3c3dbca..a5006839f77f 100644 --- 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 /*