Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09b1fe7b authored by Haritha Chintalapati's avatar Haritha Chintalapati Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I2680a98d,I9af73cc2 into camera-kernel.lnx.4.0 

* changes:
  msm: camera: icp: Rename debugfs entries to be proc hw agnostic
  msm: camera: icp: Generalize proc references within hw manager
parents 64f7c57d f1d47bfd

drivers/cam_icp/fw_inc/hfi_intf.h

+2 −2
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ void hfi_send_system_cmd(uint32_t type, uint64_t data, uint32_t size); 
void cam_hfi_deinit(void);

/**

 * hfi_set_debug_level() - set debug level

 * @a5_dbg_type: 1 for debug_q & 2 for qdss

 * @icp_dbg_type: 1 for debug_q & 2 for qdss

 * @lvl: FW debug message level

 */

int hfi_set_debug_level(u64 a5_dbg_type, uint32_t lvl);

int hfi_set_debug_level(u64 icp_dbg_type, uint32_t lvl);



/**

 * hfi_set_fw_dump_level() - set firmware dump level

drivers/cam_icp/hfi.c

+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ int hfi_enable_ipe_bps_pc(bool enable, uint32_t core_info) 
	return 0;

}



int hfi_set_debug_level(u64 a5_dbg_type, uint32_t lvl)

int hfi_set_debug_level(u64 icp_dbg_type, uint32_t lvl)

{

	uint8_t *prop;

	struct hfi_cmd_prop *dbg_prop;
@@ -413,7 +413,7 @@ int hfi_set_debug_level(u64 a5_dbg_type, uint32_t lvl) 
	dbg_prop->num_prop = 1;

	dbg_prop->prop_data[0] = HFI_PROP_SYS_DEBUG_CFG;

	dbg_prop->prop_data[1] = lvl;

	dbg_prop->prop_data[2] = a5_dbg_type;

	dbg_prop->prop_data[2] = icp_dbg_type;

	hfi_write_cmd(prop);



	kfree(prop);

drivers/cam_icp/icp_hw/a5_hw/a5_core.c

+15 −15
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 
		return -EINVAL;

	}



	if (cmd_type >= CAM_ICP_A5_CMD_MAX) {

	if (cmd_type >= CAM_ICP_CMD_MAX) {

		CAM_ERR(CAM_ICP, "Invalid command : %x", cmd_type);

		return -EINVAL;

	}
@@ -559,16 +559,16 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 
	hw_info = core_info->a5_hw_info;



	switch (cmd_type) {

	case CAM_ICP_A5_CMD_FW_DOWNLOAD:

	case CAM_ICP_CMD_FW_DOWNLOAD:

		rc = cam_a5_download_fw(device_priv);

		break;

	case CAM_ICP_A5_CMD_POWER_COLLAPSE:

	case CAM_ICP_CMD_POWER_COLLAPSE:

		rc = cam_a5_power_collapse(a5_dev);

		break;

	case CAM_ICP_A5_CMD_POWER_RESUME:

	case CAM_ICP_CMD_POWER_RESUME:

		rc = cam_a5_power_resume(a5_dev, *((bool *)cmd_args));

		break;

	case CAM_ICP_A5_CMD_SET_FW_BUF: {

	case CAM_ICP_CMD_SET_FW_BUF: {

		struct cam_icp_a5_set_fw_buf_info *fw_buf_info = cmd_args;



		if (!cmd_args) {
@@ -585,8 +585,8 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 
			core_info->fw_buf_len);

		break;

	}

	case CAM_ICP_A5_SET_IRQ_CB: {

		struct cam_icp_a5_set_irq_cb *irq_cb = cmd_args;

	case CAM_ICP_SET_IRQ_CB: {

		struct cam_icp_set_irq_cb *irq_cb = cmd_args;



		if (!cmd_args) {

			CAM_ERR(CAM_ICP, "cmd args NULL");
@@ -600,15 +600,15 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 
		break;

	}



	case CAM_ICP_A5_SEND_INIT:

	case CAM_ICP_SEND_INIT:

		hfi_send_system_cmd(HFI_CMD_SYS_INIT, 0, 0);

		break;



	case CAM_ICP_A5_CMD_PC_PREP:

	case CAM_ICP_CMD_PC_PREP:

		hfi_send_system_cmd(HFI_CMD_SYS_PC_PREP, 0, 0);

		break;



	case CAM_ICP_A5_CMD_VOTE_CPAS: {

	case CAM_ICP_CMD_VOTE_CPAS: {

		struct cam_icp_cpas_vote *cpas_vote = cmd_args;



		if (!cmd_args) {
@@ -620,7 +620,7 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 
		break;

	}



	case CAM_ICP_A5_CMD_CPAS_START: {

	case CAM_ICP_CMD_CPAS_START: {

		struct cam_icp_cpas_vote *cpas_vote = cmd_args;



		if (!cmd_args) {
@@ -637,13 +637,13 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 
		break;

	}



	case CAM_ICP_A5_CMD_CPAS_STOP:

	case CAM_ICP_CMD_CPAS_STOP:

		if (core_info->cpas_start) {

			cam_cpas_stop(core_info->cpas_handle);

			core_info->cpas_start = false;

		}

		break;

	case CAM_ICP_A5_CMD_UBWC_CFG: {

	case CAM_ICP_CMD_UBWC_CFG: {

		struct a5_ubwc_cfg_ext *ubwc_cfg_ext = NULL;



		a5_soc = soc_info->soc_private;
@@ -676,7 +676,7 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 


		break;

	}

	case CAM_ICP_A5_CMD_CLK_UPDATE: {

	case CAM_ICP_CMD_CLK_UPDATE: {

		int32_t clk_level = 0;

		struct cam_ahb_vote ahb_vote;
@@ -700,7 +700,7 @@ int cam_a5_process_cmd(void *device_priv, uint32_t cmd_type, 
			core_info->cpas_handle, &ahb_vote);

		break;

	}

	case CAM_ICP_A5_CMD_HW_DUMP: {

	case CAM_ICP_CMD_HW_DUMP: {

		struct cam_icp_hw_dump_args *dump_args = cmd_args;



		rc = cam_a5_fw_dump(dump_args, core_info);

drivers/cam_icp/icp_hw/a5_hw/a5_core.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct cam_a5_device_core_info { 
	uint64_t fw_buf_len;

	struct cam_icp_a5_query_cap query_cap;

	struct cam_icp_a5_acquire_dev a5_acquire[8];

	struct cam_icp_a5_set_irq_cb irq_cb;

	struct cam_icp_set_irq_cb irq_cb;

	uint32_t cpas_handle;

	bool cpas_start;

};

drivers/cam_icp/icp_hw/bps_hw/bps_core.c

+1 −2
Original line number Diff line number Diff line
@@ -411,8 +411,7 @@ int cam_bps_process_cmd(void *device_priv, uint32_t cmd_type, 
		rc = cam_bps_handle_resume(bps_dev);

		break;

	case CAM_ICP_BPS_CMD_UPDATE_CLK: {

		struct cam_a5_clk_update_cmd *clk_upd_cmd =

			(struct cam_a5_clk_update_cmd *)cmd_args;

		struct cam_icp_clk_update_cmd *clk_upd_cmd = cmd_args;

		struct cam_ahb_vote ahb_vote;

		uint32_t clk_rate = clk_upd_cmd->curr_clk_rate;

		int32_t clk_level  = 0, err = 0;