浏览代码

Merge "msm: ipa3: Adding support to save ipc logs in minidump"

qctecmdr 2 年之前
父节点
当前提交
6ac7530788

+ 1 - 1
drivers/platform/msm/gsi/gsi.c

@@ -5862,7 +5862,7 @@ static int msm_gsi_probe(struct platform_device *pdev)
 	}
 
 	gsi_ctx->ipc_logbuf = ipc_log_context_create(GSI_IPC_LOG_PAGES,
-		"gsi", 0);
+		"gsi", MINIDUMP_MASK);
 	if (gsi_ctx->ipc_logbuf == NULL)
 		GSIERR("failed to create IPC log, continue...\n");
 

+ 1 - 0
drivers/platform/msm/gsi/gsi.h

@@ -34,6 +34,7 @@
 #define GSI_NO_EVT_ERINDEX 255
 #define GSI_ISR_CACHE_MAX 20
 #define MAX_CHANNELS_SHARING_EVENT_RING 2
+#define MINIDUMP_MASK 0x10000
 
 #define GSI_IPC_LOGGING(buf, fmt, args...) \
 	do { \

+ 1 - 1
drivers/platform/msm/gsi/gsi_dbg.c

@@ -573,7 +573,7 @@ static ssize_t gsi_enable_ipc_low(struct file *file,
 		if (!gsi_ipc_logbuf_low) {
 			gsi_ipc_logbuf_low =
 				ipc_log_context_create(GSI_IPC_LOG_PAGES,
-					"gsi_low", 0);
+					"gsi_low", MINIDUMP_MASK);
 			if (gsi_ipc_logbuf_low == NULL)
 				TERR("failed to get ipc_logbuf_low\n");
 		}

+ 1 - 1
drivers/platform/msm/ipa/ipa_clients/ecm_ipa.c

@@ -1610,7 +1610,7 @@ static int __init ecm_ipa_init_module(void)
 	ECM_IPA_LOG_ENTRY();
 	pr_info("ecm driver init\n");
 	ipa_ecm_logbuf = ipc_log_context_create(IPA_ECM_IPC_LOG_PAGES,
-			"ipa_ecm", 0);
+			"ipa_ecm", MINIDUMP_MASK);
 	if (ipa_ecm_logbuf == NULL)
 		ECM_IPA_DEBUG("failed to create IPC log, continue...\n");
 	ECM_IPA_LOG_EXIT();

+ 1 - 1
drivers/platform/msm/ipa/ipa_clients/rndis_ipa.c

@@ -2558,7 +2558,7 @@ static ssize_t rndis_ipa_debugfs_atomic_read
 static int __init rndis_ipa_init_module(void)
 {
 	ipa_rndis_logbuf = ipc_log_context_create(IPA_RNDIS_IPC_LOG_PAGES,
-		"ipa_rndis", 0);
+		"ipa_rndis", MINIDUMP_MASK);
 	if (ipa_rndis_logbuf == NULL)
 		RNDIS_IPA_ERROR("failed to create IPC log, continue...\n");
 

+ 1 - 0
drivers/platform/msm/ipa/ipa_common_i.h

@@ -198,6 +198,7 @@ do {\
 #define STR_RNDIS_IFACE "rndis"
 #define STR_ECM_IFACE "ecm"
 
+#define MINIDUMP_MASK 0x10000
 /**
  * qmap_hdr -
  * @next_hdr: 1 - there is a qmap extension header, 0 - opposite

+ 2 - 2
drivers/platform/msm/ipa/ipa_v3/ipa.c

@@ -9127,11 +9127,11 @@ static int ipa3_pre_init(const struct ipa3_plat_drv_res *resource_p,
 		ipa3_ctx->fw_load_data.state = IPA_FW_LOAD_STATE_INIT;
 	mutex_init(&ipa3_ctx->fw_load_data.lock);
 
-	ipa3_ctx->logbuf = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa", 0);
+	ipa3_ctx->logbuf = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa", MINIDUMP_MASK);
 	if (ipa3_ctx->logbuf == NULL)
 		IPADBG("failed to create IPC log, continue...\n");
 
-	ipa3_ctx->logbuf_clk = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa_clk", 0);
+	ipa3_ctx->logbuf_clk = ipc_log_context_create(IPA_IPC_LOG_PAGES, "ipa_clk", MINIDUMP_MASK);
 	if (ipa3_ctx->logbuf_clk == NULL)
 		IPADBG("failed to create IPC ipa_clk log, continue...\n");
 

+ 1 - 1
drivers/platform/msm/ipa/ipa_v3/ipa_debugfs.c

@@ -3141,7 +3141,7 @@ static ssize_t ipa3_enable_ipc_low(struct file *file,
 		if (!ipa_ipc_low_buff) {
 			ipa_ipc_low_buff =
 				ipc_log_context_create(IPA_IPC_LOG_PAGES,
-					"ipa_low", 0);
+					"ipa_low", MINIDUMP_MASK);
 		}
 			if (ipa_ipc_low_buff == NULL)
 				IPADBG("failed to get logbuf_low\n");

+ 1 - 1
drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal.c

@@ -2607,7 +2607,7 @@ int ipahal_init(enum ipa_hw_type ipa_hw_type, void __iomem *base,
 
 	/* create an IPC buffer for the registers dump */
 	ipahal_ctx->regdumpbuf = ipc_log_context_create(IPAHAL_IPC_LOG_PAGES,
-		"ipa_regs", 0);
+		"ipa_regs", MINIDUMP_MASK);
 	if (ipahal_ctx->regdumpbuf == NULL)
 		IPAHAL_ERR("failed to create IPA regdump log, continue...\n");