msm: camera: Add stub function changes for all sensor modules (96ab3487) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_actuator/cam_actuator_core.c

+40 −16

Original line number	Diff line number	Diff line
		@@ -459,7 +459,8 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		CAM_ERR(CAM_ACTUATOR,
		"Inval cam_packet strut size: %zu, len_of_buff: %zu",
		sizeof(struct cam_packet), len_of_buff);
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		remain_len -= (size_t)config.offset;
		@@ -469,7 +470,8 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		if (cam_packet_util_validate_packet(csl_packet,
		remain_len)) {
		CAM_ERR(CAM_ACTUATOR, "Invalid packet params");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		CAM_DBG(CAM_ACTUATOR, "Pkt opcode: %d", csl_packet->header.op_code);
		@@ -482,6 +484,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		"reject request %lld, last request to flush %lld",
		csl_packet->header.request_id, a_ctrl->last_flush_req);
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		if (csl_packet->header.request_id > a_ctrl->last_flush_req)
		@@ -502,19 +505,20 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		&generic_ptr, &len_of_buff);
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR, "Failed to get cpu buf");
		return rc;
		goto rel_pkt_buf;
		}
		cmd_buf = (uint32_t *)generic_ptr;
		if (!cmd_buf) {
		CAM_ERR(CAM_ACTUATOR, "invalid cmd buf");
		return -EINVAL;
		goto rel_cmd_buf;
		}
		if ((len_of_buff < sizeof(struct common_header)) \|\|
		(cmd_desc[i].offset > (len_of_buff -
		sizeof(struct common_header)))) {
		CAM_ERR(CAM_ACTUATOR,
		"Invalid length for sensor cmd");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}
		remain_len = len_of_buff - cmd_desc[i].offset;
		cmd_buf += cmd_desc[i].offset / sizeof(uint32_t);
		@@ -529,7 +533,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR,
		"Failed to parse slave info: %d", rc);
		return rc;
		goto rel_cmd_buf;
		}
		break;
		case CAMERA_SENSOR_CMD_TYPE_PWR_UP:
		@@ -544,7 +548,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		CAM_ERR(CAM_ACTUATOR,
		"Failed:parse power settings: %d",
		rc);
		return rc;
		goto rel_cmd_buf;
		}
		break;
		default:
		@@ -564,10 +568,14 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		CAM_ERR(CAM_ACTUATOR,
		"Failed:parse init settings: %d",
		rc);
		return rc;
		goto rel_cmd_buf;
		}
		break;
		}
		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_ACTUATOR,
		"Failed to put cpu buf: %d",
		cmd_desc[i].mem_handle);
		}

		if (a_ctrl->cam_act_state == CAM_ACTUATOR_ACQUIRE) {
		@@ -575,7 +583,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR,
		" Actuator Power up failed");
		return rc;
		goto rel_pkt_buf;
		}
		a_ctrl->cam_act_state = CAM_ACTUATOR_CONFIG;
		}
		@@ -584,7 +592,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		&a_ctrl->i2c_data.init_settings);
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR, "Cannot apply Init settings");
		return rc;
		goto rel_pkt_buf;
		}

		/* Delete the request even if the apply is failed */
		@@ -601,7 +609,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		CAM_WARN(CAM_ACTUATOR,
		"Not in right state to move lens: %d",
		a_ctrl->cam_act_state);
		return rc;
		goto rel_pkt_buf;
		}
		a_ctrl->setting_apply_state = ACT_APPLY_SETTINGS_NOW;

		@@ -621,7 +629,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR,
		"Auto move lens parsing failed: %d", rc);
		return rc;
		goto rel_pkt_buf;
		}
		cam_actuator_update_req_mgr(a_ctrl, csl_packet);
		break;
		@@ -631,7 +639,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		CAM_WARN(CAM_ACTUATOR,
		"Not in right state to move lens: %d",
		a_ctrl->cam_act_state);
		return rc;
		goto rel_pkt_buf;
		}

		a_ctrl->setting_apply_state = ACT_APPLY_SETTINGS_LATER;
		@@ -652,7 +660,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		if (rc < 0) {
		CAM_ERR(CAM_ACTUATOR,
		"Manual move lens parsing failed: %d", rc);
		return rc;
		goto rel_pkt_buf;
		}

		cam_actuator_update_req_mgr(a_ctrl, csl_packet);
		@@ -662,16 +670,32 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl,
		CAM_WARN(CAM_ACTUATOR,
		"Received NOP packets in invalid state: %d",
		a_ctrl->cam_act_state);
		return -EINVAL;
		goto rel_pkt_buf;
		}
		cam_actuator_update_req_mgr(a_ctrl, csl_packet);
		break;
		default:
		CAM_ERR(CAM_ACTUATOR, "Wrong Opcode: %d",
		csl_packet->header.op_code & 0xFFFFFF);
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		if (cam_mem_put_cpu_buf(config.packet_handle))
		CAM_WARN(CAM_ACTUATOR, "Fail to put cmd buffer: %llu",
		config.packet_handle);

		return rc;

		rel_cmd_buf:
		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_ACTUATOR, "Fail to put cmd buffer: %d",
		cmd_desc[i].mem_handle);
		rel_pkt_buf:
		if (cam_mem_put_cpu_buf(config.packet_handle))
		CAM_WARN(CAM_ACTUATOR, "Fail to put cmd buffer: %llu",
		config.packet_handle);

		return rc;
		}

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

+16 −4

Original line number	Diff line number	Diff line
		@@ -187,7 +187,8 @@ int32_t cam_cmd_buf_parser(struct csiphy_device *csiphy_dev,
		CAM_ERR(CAM_CSIPHY,
		"Inval cam_packet strut size: %zu, len_of_buff: %zu",
		sizeof(struct cam_packet), len);
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		remain_len -= (size_t)cfg_dev->offset;
		@@ -197,7 +198,8 @@ int32_t cam_cmd_buf_parser(struct csiphy_device *csiphy_dev,
		if (cam_packet_util_validate_packet(csl_packet,
		remain_len)) {
		CAM_ERR(CAM_CSIPHY, "Invalid packet params");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		cmd_desc = (struct cam_cmd_buf_desc *)
		@@ -209,14 +211,15 @@ int32_t cam_cmd_buf_parser(struct csiphy_device *csiphy_dev,
		if (rc < 0) {
		CAM_ERR(CAM_CSIPHY,
		"Failed to get cmd buf Mem address : %d", rc);
		return rc;
		goto rel_pkt_buf;
		}

		if ((len < sizeof(struct cam_csiphy_info)) \|\|
		(cmd_desc->offset > (len - sizeof(struct cam_csiphy_info)))) {
		CAM_ERR(CAM_CSIPHY,
		"Not enough buffer provided for cam_cisphy_info");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		cmd_buf = (uint32_t *)generic_ptr;
		@@ -241,6 +244,15 @@ int32_t cam_cmd_buf_parser(struct csiphy_device *csiphy_dev,
		cam_csiphy_update_secure_info(csiphy_dev,
		cam_cmd_csiphy_info, cfg_dev);

		if (cam_mem_put_cpu_buf(cmd_desc->mem_handle))
		CAM_WARN(CAM_CSIPHY, "Failed to put cmd buffer: %d",
		cmd_desc->mem_handle);

		rel_pkt_buf:
		if (cam_mem_put_cpu_buf((int32_t) cfg_dev->packet_handle))
		CAM_WARN(CAM_CSIPHY, "Failed to put packet Mem address: %llu",
		cfg_dev->packet_handle);

		return rc;
		}

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_eeprom/cam_eeprom_core.c

+56 −14

Original line number	Diff line number	Diff line
		@@ -590,28 +590,32 @@ static int32_t cam_eeprom_init_pkt_parser(struct cam_eeprom_ctrl_t *e_ctrl,
		cmd_buf = (uint32_t *)generic_pkt_addr;
		if (!cmd_buf) {
		CAM_ERR(CAM_EEPROM, "invalid cmd buf");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}

		if ((pkt_len < sizeof(struct common_header)) \|\|
		(cmd_desc[i].offset > (pkt_len -
		sizeof(struct common_header)))) {
		CAM_ERR(CAM_EEPROM, "Not enough buffer");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}
		remain_len = pkt_len - cmd_desc[i].offset;
		cmd_buf += cmd_desc[i].offset / sizeof(uint32_t);

		if (total_cmd_buf_in_bytes > remain_len) {
		CAM_ERR(CAM_EEPROM, "Not enough buffer for command");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}
		/* Loop through multiple cmd formats in one cmd buffer */
		while (processed_cmd_buf_in_bytes < total_cmd_buf_in_bytes) {
		if ((remain_len - processed_cmd_buf_in_bytes) <
		sizeof(struct common_header)) {
		CAM_ERR(CAM_EEPROM, "Not enough buf");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}
		cmm_hdr = (struct common_header *)cmd_buf;
		switch (cmm_hdr->cmd_type) {
		@@ -620,7 +624,8 @@ static int32_t cam_eeprom_init_pkt_parser(struct cam_eeprom_ctrl_t *e_ctrl,
		if ((remain_len - processed_cmd_buf_in_bytes) <
		sizeof(struct cam_cmd_i2c_info)) {
		CAM_ERR(CAM_EEPROM, "Not enough buf");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}
		/* Configure the following map slave address */
		map[num_map + 1].saddr = i2c_info->slave_addr;
		@@ -646,7 +651,7 @@ static int32_t cam_eeprom_init_pkt_parser(struct cam_eeprom_ctrl_t *e_ctrl,
		sizeof(uint32_t);
		if (rc) {
		CAM_ERR(CAM_EEPROM, "Failed");
		return rc;
		goto rel_cmd_buf;
		}
		break;
		case CAMERA_SENSOR_CMD_TYPE_I2C_RNDM_WR:
		@@ -668,7 +673,18 @@ static int32_t cam_eeprom_init_pkt_parser(struct cam_eeprom_ctrl_t *e_ctrl,
		}
		}
		e_ctrl->cal_data.num_map = num_map + 1;
		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_EEPROM, "Failed to put cpu buf: %d",
		cmd_desc[i].mem_handle);
		}

		return rc;

		rel_cmd_buf:
		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_EEPROM, "Failed to put cpu buf: %d",
		cmd_desc[i].mem_handle);

		return rc;
		}

		@@ -710,7 +726,8 @@ static int32_t cam_eeprom_get_cal_data(struct cam_eeprom_ctrl_t *e_ctrl,
		}
		if (buf_size <= io_cfg->offsets[0]) {
		CAM_ERR(CAM_EEPROM, "Not enough buffer");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}

		remain_len = buf_size - io_cfg->offsets[0];
		@@ -721,26 +738,38 @@ static int32_t cam_eeprom_get_cal_data(struct cam_eeprom_ctrl_t *e_ctrl,
		if (!read_buffer) {
		CAM_ERR(CAM_EEPROM,
		"invalid buffer to copy data");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}
		read_buffer += io_cfg->offsets[0];

		if (remain_len < e_ctrl->cal_data.num_data) {
		CAM_ERR(CAM_EEPROM,
		"failed to copy, Invalid size");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}

		CAM_DBG(CAM_EEPROM, "copy the data, len:%d",
		e_ctrl->cal_data.num_data);
		memcpy(read_buffer, e_ctrl->cal_data.mapdata,
		e_ctrl->cal_data.num_data);

		if (cam_mem_put_cpu_buf(io_cfg->mem_handle[0]))
		CAM_WARN(CAM_EEPROM, "Fail in put buffer: 0x%x",
		io_cfg->mem_handle[0]);
		} else {
		CAM_ERR(CAM_EEPROM, "Invalid direction");
		rc = -EINVAL;
		}
		}

		return rc;

		rel_cmd_buf:
		if (cam_mem_put_cpu_buf(io_cfg->mem_handle[0]))
		CAM_WARN(CAM_EEPROM, "Fail in put buffer : %d",
		io_cfg->mem_handle[0]);

		return rc;
		}

		@@ -785,7 +814,8 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t e_ctrl, void arg)
		CAM_ERR(CAM_EEPROM,
		"Inval cam_packet strut size: %zu, len_of_buff: %zu",
		sizeof(struct cam_packet), pkt_len);
		return -EINVAL;
		rc = -EINVAL;
		goto release_buf;
		}

		remain_len -= (size_t)dev_config.offset;
		@@ -795,7 +825,8 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t e_ctrl, void arg)
		if (cam_packet_util_validate_packet(csl_packet,
		remain_len)) {
		CAM_ERR(CAM_EEPROM, "Invalid packet params");
		return -EINVAL;
		rc = -EINVAL;
		goto release_buf;
		}

		switch (csl_packet->header.op_code & 0xFFFFFF) {
		@@ -805,7 +836,7 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t e_ctrl, void arg)
		e_ctrl->soc_info.dev->of_node, e_ctrl);
		if (rc < 0) {
		CAM_ERR(CAM_EEPROM, "Failed: rc : %d", rc);
		return rc;
		goto release_buf;
		}
		rc = cam_eeprom_get_cal_data(e_ctrl, csl_packet);
		vfree(e_ctrl->cal_data.mapdata);
		@@ -820,7 +851,7 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t e_ctrl, void arg)
		if (rc) {
		CAM_ERR(CAM_EEPROM,
		"Failed in parsing the pkt");
		return rc;
		goto release_buf;
		}

		e_ctrl->cal_data.mapdata =
		@@ -863,7 +894,13 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t e_ctrl, void arg)
		default:
		break;
		}

		if (cam_mem_put_cpu_buf(dev_config.packet_handle))
		CAM_WARN(CAM_EEPROM, "Put cpu buffer failed : %llu",
		dev_config.packet_handle);

		return rc;

		power_down:
		cam_eeprom_power_down(e_ctrl);
		memdata_free:
		@@ -877,6 +914,11 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t e_ctrl, void arg)
		e_ctrl->cal_data.num_data = 0;
		e_ctrl->cal_data.num_map = 0;
		e_ctrl->cam_eeprom_state = CAM_EEPROM_INIT;
		release_buf:
		if (cam_mem_put_cpu_buf(dev_config.packet_handle))
		CAM_WARN(CAM_EEPROM, "Put cpu buffer failed : %llu",
		dev_config.packet_handle);

		return rc;
		}

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_ois/cam_ois_core.c

+39 −16

Original line number	Diff line number	Diff line
		@@ -463,7 +463,8 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		CAM_ERR(CAM_OIS,
		"Inval cam_packet strut size: %zu, len_of_buff: %zu",
		sizeof(struct cam_packet), pkt_len);
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt;
		}

		remain_len -= (size_t)dev_config.offset;
		@@ -473,9 +474,11 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		if (cam_packet_util_validate_packet(csl_packet,
		remain_len)) {
		CAM_ERR(CAM_OIS, "Invalid packet params");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt;
		}


		switch (csl_packet->header.op_code & 0xFFFFFF) {
		case CAM_OIS_PACKET_OPCODE_INIT:
		offset = (uint32_t *)&csl_packet->payload;
		@@ -493,12 +496,13 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		if (rc < 0) {
		CAM_ERR(CAM_OIS, "Failed to get cpu buf : 0x%x",
		cmd_desc[i].mem_handle);
		return rc;
		goto rel_pkt;
		}
		cmd_buf = (uint32_t *)generic_ptr;
		if (!cmd_buf) {
		CAM_ERR(CAM_OIS, "invalid cmd buf");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}

		if ((len_of_buff < sizeof(struct common_header)) \|\|
		@@ -506,7 +510,8 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		sizeof(struct common_header)))) {
		CAM_ERR(CAM_OIS,
		"Invalid length for sensor cmd");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_cmd_buf;
		}
		remain_len = len_of_buff - cmd_desc[i].offset;
		cmd_buf += cmd_desc[i].offset / sizeof(uint32_t);
		@@ -519,7 +524,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		if (rc < 0) {
		CAM_ERR(CAM_OIS,
		"Failed in parsing slave info");
		return rc;
		goto rel_cmd_buf;
		}
		break;
		case CAMERA_SENSOR_CMD_TYPE_PWR_UP:
		@@ -533,7 +538,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		if (rc) {
		CAM_ERR(CAM_OIS,
		"Failed: parse power settings");
		return rc;
		goto rel_cmd_buf;
		}
		break;
		default:
		@@ -551,7 +556,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		if (rc < 0) {
		CAM_ERR(CAM_OIS,
		"init parsing failed: %d", rc);
		return rc;
		goto rel_cmd_buf;
		}
		} else if ((o_ctrl->is_ois_calib != 0) &&
		(o_ctrl->i2c_calib_data.is_settings_valid ==
		@@ -568,18 +573,21 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		if (rc < 0) {
		CAM_ERR(CAM_OIS,
		"Calib parsing failed: %d", rc);
		return rc;
		goto rel_cmd_buf;
		}
		}
		break;
		}
		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_OIS, "Failed to put cpu buf: %d",
		cmd_desc[i].mem_handle);
		}

		if (o_ctrl->cam_ois_state != CAM_OIS_CONFIG) {
		rc = cam_ois_power_up(o_ctrl);
		if (rc) {
		CAM_ERR(CAM_OIS, " OIS Power up failed");
		return rc;
		goto rel_pkt;
		}
		o_ctrl->cam_ois_state = CAM_OIS_CONFIG;
		}
		@@ -626,7 +634,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		CAM_WARN(CAM_OIS,
		"Not in right state to control OIS: %d",
		o_ctrl->cam_ois_state);
		return rc;
		goto rel_pkt;
		}
		offset = (uint32_t *)&csl_packet->payload;
		offset += (csl_packet->cmd_buf_offset / sizeof(uint32_t));
		@@ -639,28 +647,43 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t o_ctrl, void arg)
		cmd_desc, 1);
		if (rc < 0) {
		CAM_ERR(CAM_OIS, "OIS pkt parsing failed: %d", rc);
		return rc;
		goto rel_pkt;
		}

		rc = cam_ois_apply_settings(o_ctrl, i2c_reg_settings);
		if (rc < 0) {
		CAM_ERR(CAM_OIS, "Cannot apply mode settings");
		return rc;
		goto rel_pkt;
		}

		rc = delete_request(i2c_reg_settings);
		if (rc < 0) {
		CAM_ERR(CAM_OIS,
		"Fail deleting Mode data: rc: %d", rc);
		return rc;
		goto rel_pkt;
		}
		break;
		default:
		break;
		CAM_ERR(CAM_OIS, "Invalid Opcode: %d",
		(csl_packet->header.op_code & 0xFFFFFF));
		rc = -EINVAL;
		goto rel_pkt;
		}
		return rc;

		if (!rc)
		goto rel_pkt;

		rel_cmd_buf:
		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_OIS, "Failed to put cpu buf: %d",
		cmd_desc[i].mem_handle);
		pwr_dwn:
		cam_ois_power_down(o_ctrl);
		rel_pkt:
		if (cam_mem_put_cpu_buf(dev_config.packet_handle))
		CAM_WARN(CAM_OIS, "Fail in put buffer: %llu",
		dev_config.packet_handle);

		return rc;
		}

drivers/media/platform/msm/camera_v3/cam_sensor_module/cam_sensor/cam_sensor_core.c

+57 −21

Original line number	Diff line number	Diff line
		@@ -129,7 +129,8 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		CAM_ERR(CAM_SENSOR,
		"Inval cam_packet strut size: %zu, len_of_buff: %zu",
		sizeof(struct cam_packet), len_of_buff);
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		remain_len -= (size_t)config.offset;
		@@ -139,7 +140,8 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		if (cam_packet_util_validate_packet(csl_packet,
		remain_len)) {
		CAM_ERR(CAM_SENSOR, "Invalid packet params");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;

		}

		@@ -147,10 +149,11 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		CAM_SENSOR_PACKET_OPCODE_SENSOR_INITIAL_CONFIG &&
		csl_packet->header.request_id <= s_ctrl->last_flush_req
		&& s_ctrl->last_flush_req != 0) {
		CAM_DBG(CAM_SENSOR,
		"reject request %lld, last request to flush %lld",
		CAM_ERR(CAM_SENSOR,
		"reject request %lld, last request to flush %u",
		csl_packet->header.request_id, s_ctrl->last_flush_req);
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		if (csl_packet->header.request_id > s_ctrl->last_flush_req)
		@@ -173,7 +176,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		}
		case CAM_SENSOR_PACKET_OPCODE_SENSOR_STREAMON: {
		if (s_ctrl->streamon_count > 0)
		return 0;
		goto rel_pkt_buf;

		s_ctrl->streamon_count = s_ctrl->streamon_count + 1;
		i2c_reg_settings = &i2c_data->streamon_settings;
		@@ -183,7 +186,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		}
		case CAM_SENSOR_PACKET_OPCODE_SENSOR_STREAMOFF: {
		if (s_ctrl->streamoff_count > 0)
		return 0;
		goto rel_pkt_buf;

		s_ctrl->streamoff_count = s_ctrl->streamoff_count + 1;
		i2c_reg_settings = &i2c_data->streamoff_settings;
		@@ -197,7 +200,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		(s_ctrl->sensor_state == CAM_SENSOR_ACQUIRE)) {
		CAM_WARN(CAM_SENSOR,
		"Rxed Update packets without linking");
		return 0;
		goto rel_pkt_buf;
		}

		i2c_reg_settings =
		@@ -217,7 +220,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		* fix it.
		*/
		cam_sensor_update_req_mgr(s_ctrl, csl_packet);
		return 0;
		goto rel_pkt_buf;
		}
		break;
		}
		@@ -226,15 +229,16 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		(s_ctrl->sensor_state == CAM_SENSOR_ACQUIRE)) {
		CAM_WARN(CAM_SENSOR,
		"Rxed NOP packets without linking");
		return 0;
		goto rel_pkt_buf;
		}

		cam_sensor_update_req_mgr(s_ctrl, csl_packet);
		return 0;
		goto rel_pkt_buf;
		}
		default:
		CAM_ERR(CAM_SENSOR, "Invalid Packet Header");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		offset = (uint32_t *)&csl_packet->payload;
		@@ -245,7 +249,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		i2c_reg_settings, cmd_desc, 1);
		if (rc < 0) {
		CAM_ERR(CAM_SENSOR, "Fail parsing I2C Pkt: %d", rc);
		return rc;
		goto rel_pkt_buf;
		}

		if ((csl_packet->header.op_code & 0xFFFFFF) ==
		@@ -255,6 +259,11 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl,
		cam_sensor_update_req_mgr(s_ctrl, csl_packet);
		}

		rel_pkt_buf:
		if (cam_mem_put_cpu_buf(config.packet_handle))
		CAM_WARN(CAM_SENSOR, "Failed in put the buffer: %llu",
		config.packet_handle);

		return rc;
		}

		@@ -446,25 +455,29 @@ int32_t cam_handle_mem_ptr(uint64_t handle, struct cam_sensor_ctrl_t *s_ctrl)
		pkt = (struct cam_packet *)packet;
		if (pkt == NULL) {
		CAM_ERR(CAM_SENSOR, "packet pos is invalid");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		if ((len < sizeof(struct cam_packet)) \|\|
		(pkt->cmd_buf_offset >= (len - sizeof(struct cam_packet)))) {
		CAM_ERR(CAM_SENSOR, "Not enough buf provided");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		cmd_desc = (struct cam_cmd_buf_desc *)
		((uint32_t *)&pkt->payload + pkt->cmd_buf_offset/4);
		if (cmd_desc == NULL) {
		CAM_ERR(CAM_SENSOR, "command descriptor pos is invalid");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}
		if (pkt->num_cmd_buf != 2) {
		CAM_ERR(CAM_SENSOR, "Expected More Command Buffers : %d",
		pkt->num_cmd_buf);
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}

		for (i = 0; i < pkt->num_cmd_buf; i++) {
		@@ -475,18 +488,20 @@ int32_t cam_handle_mem_ptr(uint64_t handle, struct cam_sensor_ctrl_t *s_ctrl)
		if (rc < 0) {
		CAM_ERR(CAM_SENSOR,
		"Failed to parse the command Buffer Header");
		return rc;
		goto rel_pkt_buf;
		}
		if (cmd_desc[i].offset >= len) {
		CAM_ERR(CAM_SENSOR,
		"offset past length of buffer");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}
		remain_len = len - cmd_desc[i].offset;
		if (cmd_desc[i].length > remain_len) {
		CAM_ERR(CAM_SENSOR,
		"Not enough buffer provided for cmd");
		return -EINVAL;
		rc = -EINVAL;
		goto rel_pkt_buf;
		}
		cmd_buf = (uint32_t *)cmd_buf1;
		cmd_buf += cmd_desc[i].offset/4;
		@@ -497,9 +512,30 @@ int32_t cam_handle_mem_ptr(uint64_t handle, struct cam_sensor_ctrl_t *s_ctrl)
		if (rc < 0) {
		CAM_ERR(CAM_SENSOR,
		"Failed to parse the command Buffer Header");
		return rc;
		goto rel_cmd_buf;
		}

		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_SENSOR,
		"Failed to put command Buffer : %d",
		cmd_desc[i].mem_handle);
		}

		if (cam_mem_put_cpu_buf(handle))
		CAM_WARN(CAM_SENSOR, "Failed to put the command Buffer: %llu",
		handle);

		return rc;

		rel_cmd_buf:
		if (cam_mem_put_cpu_buf(cmd_desc[i].mem_handle))
		CAM_WARN(CAM_SENSOR, "Failed to put command Buffer : 0x%x",
		cmd_desc[i].mem_handle);
		rel_pkt_buf:
		if (cam_mem_put_cpu_buf(handle))
		CAM_WARN(CAM_SENSOR, "Failed to put the command Buffer: %llu",
		handle);

		return rc;
		}