소스 검색

msm: camera: common: Increase the max tag length to 128

Currently the maximum length of tag is 64, but in some
cases, the tag length we need is lager than 64, in
this case some information will be lost, which leads
to the failure to properly parse out the required
information. We need to make sure that all the tags
are the same length so that the parsing script can
parse them correctly. We also need to make sure that
the last character in tag is ":" in order for the
parsing script to get the full tag string correctly.

CRs-Fixed: 3467258
Change-Id: Ie8107ffd902d70d88026632a2c9fadaca0c276d8
Signed-off-by: mingpan <[email protected]>
mingpan 2 년 전
부모
커밋
12f52f25db

+ 2 - 1
drivers/cam_cdm/cam_cdm_util.h

@@ -1,13 +1,14 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
  */
 
 
 #ifndef _CAM_CDM_UTIL_H_
 #ifndef _CAM_CDM_UTIL_H_
 #define _CAM_CDM_UTIL_H_
 #define _CAM_CDM_UTIL_H_
 
 
 /* Max len for tag name for header while dumping cmd buffer*/
 /* Max len for tag name for header while dumping cmd buffer*/
-#define CAM_CDM_CMD_TAG_MAX_LEN 32
+#define CAM_CDM_CMD_TAG_MAX_LEN 128
 
 
 #include <linux/types.h>
 #include <linux/types.h>
 
 

+ 1 - 1
drivers/cam_core/cam_context.h

@@ -29,7 +29,7 @@ struct cam_context;
 #define CAM_CTX_RES_MAX              20
 #define CAM_CTX_RES_MAX              20
 
 
 /* max tag  dump header string length*/
 /* max tag  dump header string length*/
-#define CAM_CTXT_DUMP_TAG_MAX_LEN 64
+#define CAM_CTXT_DUMP_TAG_MAX_LEN 128
 
 
 /* Number of words to be dumped for context*/
 /* Number of words to be dumped for context*/
 #define CAM_CTXT_DUMP_NUM_WORDS 10
 #define CAM_CTXT_DUMP_NUM_WORDS 10

+ 2 - 1
drivers/cam_cre/cam_cre_hw_mgr/cre_hw/include/cam_cre_hw_intf.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
  */
 
 
 #ifndef CAM_CRE_HW_INTF_H
 #ifndef CAM_CRE_HW_INTF_H
@@ -15,7 +16,7 @@
 
 
 #define CRE_VOTE                     640000000
 #define CRE_VOTE                     640000000
 
 
-#define CAM_CRE_HW_DUMP_TAG_MAX_LEN 32
+#define CAM_CRE_HW_DUMP_TAG_MAX_LEN 128
 #define CAM_CRE_HW_DUMP_NUM_WORDS   5
 #define CAM_CRE_HW_DUMP_NUM_WORDS   5
 
 
 struct cam_cre_set_irq_cb {
 struct cam_cre_set_irq_cb {

+ 2 - 1
drivers/cam_fd/fd_hw_mgr/fd_hw/cam_fd_hw_intf.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
  */
 
 
 #ifndef _CAM_FD_HW_INTF_H_
 #ifndef _CAM_FD_HW_INTF_H_
@@ -24,7 +25,7 @@
 
 
 #define CAM_FD_MAX_IO_BUFFERS        5
 #define CAM_FD_MAX_IO_BUFFERS        5
 #define CAM_FD_MAX_HW_ENTRIES        5
 #define CAM_FD_MAX_HW_ENTRIES        5
-#define CAM_FD_HW_DUMP_TAG_MAX_LEN   32
+#define CAM_FD_HW_DUMP_TAG_MAX_LEN   128
 #define CAM_FD_HW_DUMP_NUM_WORDS     5
 #define CAM_FD_HW_DUMP_NUM_WORDS     5
 
 
 /**
 /**

+ 1 - 1
drivers/cam_icp/icp_hw/include/cam_icp_hw_mgr_intf.h

@@ -34,7 +34,7 @@
 #define CAM_ICP_DEFAULT_AXI_PATH    CAM_AXI_PATH_DATA_ALL
 #define CAM_ICP_DEFAULT_AXI_PATH    CAM_AXI_PATH_DATA_ALL
 #define CAM_ICP_DEFAULT_AXI_TRANSAC CAM_AXI_TRANSACTION_READ
 #define CAM_ICP_DEFAULT_AXI_TRANSAC CAM_AXI_TRANSACTION_READ
 
 
-#define CAM_ICP_DUMP_TAG_MAX_LEN 64
+#define CAM_ICP_DUMP_TAG_MAX_LEN 128
 #define CAM_ICP_DUMP_NUM_WORDS   5
 #define CAM_ICP_DUMP_NUM_WORDS   5
 
 
 enum cam_icp_subdev_id {
 enum cam_icp_subdev_id {

+ 1 - 1
drivers/cam_isp/cam_isp_context.c

@@ -5209,7 +5209,7 @@ hw_dump:
 
 
 	/* Dump time info */
 	/* Dump time info */
 	rc = cam_common_user_dump_helper(&dump_args, cam_isp_ctx_user_dump_timer,
 	rc = cam_common_user_dump_helper(&dump_args, cam_isp_ctx_user_dump_timer,
-		req, sizeof(uint64_t), "ISP_CTX_DUMP:.%c", req_type);
+		req, sizeof(uint64_t), "ISP_CTX_DUMP.%c:", req_type);
 	if (rc) {
 	if (rc) {
 		CAM_ERR(CAM_ISP, "Time dump fail %lld, rc: %d, ctx_idx: %u, link: 0x%x",
 		CAM_ERR(CAM_ISP, "Time dump fail %lld, rc: %d, ctx_idx: %u, link: 0x%x",
 			req->request_id, rc, ctx->ctx_id, ctx->link_hdl);
 			req->request_id, rc, ctx->ctx_id, ctx->link_hdl);

+ 1 - 1
drivers/cam_isp/cam_isp_context.h

@@ -54,7 +54,7 @@
 #define CAM_ISP_CTX_EVENT_RECORD_MAX_ENTRIES   8
 #define CAM_ISP_CTX_EVENT_RECORD_MAX_ENTRIES   8
 
 
 /* Maximum length of tag while dumping */
 /* Maximum length of tag while dumping */
-#define CAM_ISP_CONTEXT_DUMP_TAG_MAX_LEN 64
+#define CAM_ISP_CONTEXT_DUMP_TAG_MAX_LEN 128
 
 
 /* AEB error count threshold */
 /* AEB error count threshold */
 #define CAM_ISP_CONTEXT_AEB_ERROR_CNT_MAX 6
 #define CAM_ISP_CONTEXT_AEB_ERROR_CNT_MAX 6

+ 1 - 1
drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_isp_hw.h

@@ -17,7 +17,7 @@
 #include "cam_hw_mgr_intf.h"
 #include "cam_hw_mgr_intf.h"
 
 
 /* Maximum length of tag while dumping */
 /* Maximum length of tag while dumping */
-#define CAM_ISP_HW_DUMP_TAG_MAX_LEN 64
+#define CAM_ISP_HW_DUMP_TAG_MAX_LEN 128
 /* Max isp hw pid values number */
 /* Max isp hw pid values number */
 #define CAM_ISP_HW_MAX_PID_VAL      4
 #define CAM_ISP_HW_MAX_PID_VAL      4
 /* Maximum number of output ports that map to an architecture specific input path */
 /* Maximum number of output ports that map to an architecture specific input path */

+ 2 - 2
drivers/cam_jpeg/jpeg_hw/include/cam_jpeg_hw_intf.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
  */
 
 
 #ifndef CAM_JPEG_HW_INTF_H
 #ifndef CAM_JPEG_HW_INTF_H
@@ -16,7 +16,7 @@
 
 
 #define JPEG_VOTE                     640000000
 #define JPEG_VOTE                     640000000
 
 
-#define CAM_JPEG_HW_DUMP_TAG_MAX_LEN 32
+#define CAM_JPEG_HW_DUMP_TAG_MAX_LEN 128
 #define CAM_JPEG_HW_DUMP_NUM_WORDS   5
 #define CAM_JPEG_HW_DUMP_NUM_WORDS   5
 #define CAM_JPEG_HW_MAX_NUM_PID      2
 #define CAM_JPEG_HW_MAX_NUM_PID      2
 #define CAM_JPEG_CAMNOC_MISR_VAL_ROW 2
 #define CAM_JPEG_CAMNOC_MISR_VAL_ROW 2

+ 2 - 1
drivers/cam_lrme/lrme_hw_mgr/lrme_hw/cam_lrme_hw_core.h

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
  */
 
 
 #ifndef _CAM_LRME_HW_CORE_H_
 #ifndef _CAM_LRME_HW_CORE_H_
@@ -36,7 +37,7 @@
 #define CAM_LRME_MAX_REG_PAIR_NUM 60
 #define CAM_LRME_MAX_REG_PAIR_NUM 60
 
 
 #define CAM_LRME_RESPONSE_TIME_THRESHOLD 100000
 #define CAM_LRME_RESPONSE_TIME_THRESHOLD 100000
-#define CAM_LRME_HW_DUMP_TAG_MAX_LEN     32
+#define CAM_LRME_HW_DUMP_TAG_MAX_LEN     128
 #define CAM_LRME_HW_DUMP_NUM_WORDS       5
 #define CAM_LRME_HW_DUMP_NUM_WORDS       5
 
 
 /**
 /**

+ 1 - 1
drivers/cam_req_mgr/cam_req_mgr_core.h

@@ -54,7 +54,7 @@
 #define CAM_CRM_DUMP_EVENT_NUM_WORDS  6
 #define CAM_CRM_DUMP_EVENT_NUM_WORDS  6
 
 
 /* Maximum length of tag while dumping */
 /* Maximum length of tag while dumping */
-#define CAM_CRM_DUMP_TAG_MAX_LEN 64
+#define CAM_CRM_DUMP_TAG_MAX_LEN 128
 
 
 /* Number of headers in dumping req state info function*/
 /* Number of headers in dumping req state info function*/
 #define CAM_CRM_DUMP_EVENT_NUM_HEADERS  2
 #define CAM_CRM_DUMP_EVENT_NUM_HEADERS  2

+ 1 - 1
drivers/cam_utils/cam_common_util.h

@@ -20,7 +20,7 @@
 #define CAM_COMMON_MINI_DUMP_DEV_NAME_LEN 16
 #define CAM_COMMON_MINI_DUMP_DEV_NAME_LEN 16
 #define CAM_COMMON_MINI_DUMP_SIZE         10 * 1024 * 1024
 #define CAM_COMMON_MINI_DUMP_SIZE         10 * 1024 * 1024
 
 
-#define CAM_COMMON_HW_DUMP_TAG_MAX_LEN 64
+#define CAM_COMMON_HW_DUMP_TAG_MAX_LEN 128
 #define CAM_MAX_NUM_CCI_PAYLOAD_BYTES     11
 #define CAM_MAX_NUM_CCI_PAYLOAD_BYTES     11
 
 
 #define CAM_COMMON_EVT_INJECT_MODULE_PARAM_MAX_LENGTH 4096
 #define CAM_COMMON_EVT_INJECT_MODULE_PARAM_MAX_LENGTH 4096

+ 1 - 1
drivers/cam_utils/cam_soc_util.h

@@ -58,7 +58,7 @@
 #define DDR_TYPE_LPDDR5X       9
 #define DDR_TYPE_LPDDR5X       9
 
 
 /* Maximum length of tag while dumping */
 /* Maximum length of tag while dumping */
-#define CAM_SOC_HW_DUMP_TAG_MAX_LEN 32
+#define CAM_SOC_HW_DUMP_TAG_MAX_LEN 128
 
 
 /* Client index to be used to vote clk frequency through sw client */
 /* Client index to be used to vote clk frequency through sw client */
 #define CAM_CLK_SW_CLIENT_IDX -1
 #define CAM_CLK_SW_CLIENT_IDX -1