Merge "msm: camera: tpg: fix issue when create debugfs for tpg" into camera-kernel.qclinux.1.0

Author: Camera Software Integration

camera/drivers/cam_sensor_module/cam_tpg/cam_tpg_dev.c

@@ -252,6 +252,32 @@ static int tpg_register_cpas_client(struct cam_tpg_device *tpg_dev,
 	return rc;
 }
 
+static int cam_tpg_hw_queue_init(struct cam_tpg_device *tpg_dev)
+{
+	/* Initialize only the essential components needed for safe operation */
+
+	/* Initialize locks */
+	spin_lock_init(&tpg_dev->tpg_hw.hw_state_lock);
+	mutex_init(&tpg_dev->tpg_hw.mutex);
+
+	/* Set TPG initial state */
+	tpg_dev->tpg_hw.state = TPG_HW_STATE_HW_DISABLED;
+
+	/* Initialize completion */
+	init_completion(&tpg_dev->tpg_hw.complete_rup);
+
+	/* Initialize queues */
+	INIT_LIST_HEAD(&(tpg_dev->tpg_hw.waiting_request_q));
+	INIT_LIST_HEAD(&(tpg_dev->tpg_hw.active_request_q));
+	tpg_dev->tpg_hw.waiting_request_q_depth = 0;
+	tpg_dev->tpg_hw.active_request_q_depth = 0;
+	tpg_dev->tpg_hw.settings_update = 0;
+	tpg_dev->tpg_hw.tpg_clock = 0;
+
+	return 0;
+}
+
+
 static int cam_tpg_hw_layer_init(struct cam_tpg_device *tpg_dev,
 		struct device *dev)
 {
@@ -270,17 +296,8 @@ static int cam_tpg_hw_layer_init(struct cam_tpg_device *tpg_dev,
 	tpg_dev->tpg_hw.hw_info  = (struct tpg_hw_info *)match_dev->data;
 	tpg_dev->tpg_hw.soc_info = &tpg_dev->soc_info;
 	tpg_dev->tpg_hw.cpas_handle = tpg_dev->cpas_handle;
-	spin_lock_init(&tpg_dev->tpg_hw.hw_state_lock);
-	tpg_dev->tpg_hw.state = TPG_HW_STATE_HW_DISABLED;
-	mutex_init(&tpg_dev->tpg_hw.mutex);
-	init_completion(&tpg_dev->tpg_hw.complete_rup);
-	/*Initialize the waiting queue and active queues*/
-	INIT_LIST_HEAD(&(tpg_dev->tpg_hw.waiting_request_q));
-	INIT_LIST_HEAD(&(tpg_dev->tpg_hw.active_request_q));
-	tpg_dev->tpg_hw.waiting_request_q_depth = 0;
-	tpg_dev->tpg_hw.active_request_q_depth  = 0;
-	tpg_dev->tpg_hw.settings_update         = 0;
-	tpg_dev->tpg_hw.tpg_clock               = 0;
+
+	/* Call layer_init */
 	tpg_dev->tpg_hw.hw_info->layer_init(&tpg_dev->tpg_hw);
 	return 0;
 }
@@ -305,9 +322,9 @@ static int cam_tpg_component_bind(struct device *dev,
 	tpg_dev->tpg_subdev.pdev = pdev;
 	tpg_dev->state = CAM_TPG_STATE_INIT;
 
-	rc = cam_tpg_hw_layer_init(tpg_dev, dev);
+	rc = cam_tpg_hw_queue_init(tpg_dev);
 	if (rc < 0) {
-		CAM_ERR(CAM_TPG, "Hw layer init failed");
+		CAM_ERR(CAM_TPG, "Mutex and queue init failed");
 		goto bind_error_exit;
 	}
 
@@ -328,8 +345,15 @@ static int cam_tpg_component_bind(struct device *dev,
 		CAM_ERR(CAM_TPG, "cpas register failed");
 		goto release_subdev;
 	}
+
 	tpg_crm_intf_init(tpg_dev);
 
+	rc = cam_tpg_hw_layer_init(tpg_dev, dev);
+	if (rc < 0) {
+		CAM_ERR(CAM_TPG, "Hw layer init failed");
+		goto release_subdev;
+	}
+
 	platform_set_drvdata(pdev, tpg_dev);
 
 	return rc;
@@ -354,6 +378,9 @@ static void cam_tpg_component_unbind(struct device *dev,
 		return;
 	}
 
+	/* Clean up debugfs entries */
+	tpg_hw_debugfs_cleanup(&tpg_dev->tpg_hw);
+
 	CAM_INFO(CAM_TPG, "Unbind TPG component");
 	cam_cpas_unregister_client(tpg_dev->cpas_handle);
 	cam_soc_util_release_platform_resource(&tpg_dev->soc_info);

camera/drivers/cam_sensor_module/cam_tpg/tpg_hw/tpg_hw.c

@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
  * Copyright (c) 2021-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 
 #include "tpg_hw.h"
@@ -1454,3 +1455,19 @@ int tpg_hw_add_stream_v3(
 	return rc;
 }
 
+int tpg_hw_debugfs_cleanup(struct tpg_hw *hw)
+{
+	if (!hw) {
+		CAM_ERR(CAM_TPG, "Invalid hw pointer");
+		return -EINVAL;
+	}
+
+	if (hw->debugfs_root) {
+		CAM_INFO(CAM_TPG, "Removing debugfs directory for tpg%d", hw->hw_idx);
+		debugfs_remove_recursive(hw->debugfs_root);
+		hw->debugfs_root = NULL;
+	}
+
+	return 0;
+}
+

camera/drivers/cam_sensor_module/cam_tpg/tpg_hw/tpg_hw.h

@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2021, The Linux Foundation. All rights reserved.
  * Copyright (c) 2021-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 
 #ifndef __TPG_HW_H__
@@ -204,6 +205,8 @@ struct tpg_hw {
 	uint32_t                     active_request_q_depth;
 	uint32_t                     waiting_request_q_depth;
 	uint32_t                     settings_update;
+	/* debugfs root directory */
+	struct dentry                *debugfs_root;
 };
 
 /**
@@ -533,4 +536,13 @@ int tpg_hw_request_set_opcode(
  */
 int tpg_hw_copy_settings_config(struct tpg_hw *hw, struct tpg_settings_config_t *settings);
 
+/**
+ * @brief : cleanup debugfs entries for tpg hw
+ *
+ * @param hw: tpg hw instance
+ *
+ * @return : 0 on success
+ */
+int tpg_hw_debugfs_cleanup(struct tpg_hw *hw);
+
 #endif

camera/drivers/cam_sensor_module/cam_tpg/tpg_hw/tpg_hw_v_1_3/tpg_hw_v_1_3.c

@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  * Copyright (c) 2021-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 
 #include "tpg_hw_v_1_3.h"
@@ -864,27 +865,31 @@ DEFINE_SIMPLE_ATTRIBUTE(tpg_1_3_shdr_line_offset1,
 int tpg_1_3_layer_init(struct tpg_hw *hw)
 {
 	int rc = 0;
-	struct dentry *dbgfileptr_parent = NULL;
 	char dir_name[160];
 
 	snprintf(dir_name, sizeof(dir_name), "tpg%d",
 		hw->hw_idx);
 
-	dbgfileptr_parent = debugfs_create_dir(dir_name, NULL);
-	if (!dbgfileptr_parent) {
-		CAM_ERR(CAM_TPG, "Debug fs could not create directory");
-		rc = -ENOENT;
+	/* Store the debugfs root directory */
+	hw->debugfs_root = debugfs_create_dir(dir_name, NULL);
+	if (!hw->debugfs_root) {
+		CAM_ERR(CAM_TPG, "Debugfs could not create directory '%s'", dir_name);
+		return -ENOENT;
 	}
+
+    /* Create debugfs entries */
 	debugfs_create_file("tpg_xcfa_test", 0644,
-		dbgfileptr_parent, hw, &tpg_1_3_xcfa_test);
+		hw->debugfs_root, hw, &tpg_1_3_xcfa_test);
 	debugfs_create_file("tpg_shdr_overlap_test", 0644,
-		dbgfileptr_parent, hw, &tpg_1_3_shdr_overlap_test);
+		hw->debugfs_root, hw, &tpg_1_3_shdr_overlap_test);
 	debugfs_create_file("tpg_shdr_offset_num_batch", 0644,
-		dbgfileptr_parent, hw, &tpg_1_3_shdr_offset_num_batch);
+		hw->debugfs_root, hw, &tpg_1_3_shdr_offset_num_batch);
 	debugfs_create_file("tpg_shdr_line_offset0", 0644,
-		dbgfileptr_parent, hw, &tpg_1_3_shdr_line_offset0);
+		hw->debugfs_root, hw, &tpg_1_3_shdr_line_offset0);
 	debugfs_create_file("tpg_shdr_line_offset1", 0644,
-		dbgfileptr_parent, hw, &tpg_1_3_shdr_line_offset1);
+		hw->debugfs_root, hw, &tpg_1_3_shdr_line_offset1);
+
 	CAM_INFO(CAM_TPG, "Layer init called");
+
 	return rc;
 }

camera/drivers/cam_sensor_module/cam_tpg/tpg_hw/tpg_hw_v_1_4/tpg_hw_v_1_4.c

@@ -2,6 +2,7 @@
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  * Copyright (c) 2021-2024, Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
  */
 
 #include "tpg_hw_v_1_4.h"
@@ -931,28 +932,31 @@ DEFINE_SIMPLE_ATTRIBUTE(tpg_1_4_shdr_line_offset1,
 int tpg_1_4_layer_init(struct tpg_hw *hw)
 {
 	int rc = 0;
-	struct dentry *dbgfileptr_parent = NULL;
 	char dir_name[160];
 
 	snprintf(dir_name, sizeof(dir_name), "tpg%d",
 		hw->hw_idx);
 
-	dbgfileptr_parent = debugfs_create_dir(dir_name, NULL);
-	if (!dbgfileptr_parent) {
-		CAM_ERR(CAM_TPG, "Debug fs could not create directory");
-		rc = -ENOENT;
-		return rc;
+	/* Store the debugfs root directory */
+	hw->debugfs_root = debugfs_create_dir(dir_name, NULL);
+	if (!hw->debugfs_root) {
+		CAM_ERR(CAM_TPG, "Debugfs could not create directory '%s'", dir_name);
+		return -ENOENT;
 	}
+
+	/* Create debugfs entries */
 	debugfs_create_file("tpg_xcfa_test", 0644,
-		dbgfileptr_parent, hw, &tpg_1_4_xcfa_test);
+		hw->debugfs_root, hw, &tpg_1_4_xcfa_test);
 	debugfs_create_file("tpg_shdr_overlap_test", 0644,
-		dbgfileptr_parent, hw, &tpg_1_4_shdr_overlap_test);
+		hw->debugfs_root, hw, &tpg_1_4_shdr_overlap_test);
 	debugfs_create_file("tpg_shdr_offset_num_batch", 0644,
-		dbgfileptr_parent, hw, &tpg_1_4_shdr_offset_num_batch);
+		hw->debugfs_root, hw, &tpg_1_4_shdr_offset_num_batch);
 	debugfs_create_file("tpg_shdr_line_offset0", 0644,
-		dbgfileptr_parent, hw, &tpg_1_4_shdr_line_offset0);
+		hw->debugfs_root, hw, &tpg_1_4_shdr_line_offset0);
 	debugfs_create_file("tpg_shdr_line_offset1", 0644,
-		dbgfileptr_parent, hw, &tpg_1_4_shdr_line_offset1);
+		hw->debugfs_root, hw, &tpg_1_4_shdr_line_offset1);
+
 	CAM_INFO(CAM_TPG, "Layer init called");
+
 	return rc;
 }