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

Commit 50e83233 authored by Sureshnaidu Laveti's avatar Sureshnaidu Laveti Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: sensor: Support for read operation 



Supporting read operation for sensor and
sub modules OIS and actuator.

CRs-Fixed: 2538801
Change-Id: I83ad154dd577d5a664c4d68792a90489e725fbfd
Signed-off-by: default avatarJigarkumar Zala <jzala@codeaurora.org>
Signed-off-by: default avatarSureshnaidu Laveti <lsuresh@codeaurora.org>
parent dd1ac7b7

drivers/cam_sensor_module/cam_actuator/cam_actuator_core.c

+65 −3
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl, 
				rc = cam_sensor_i2c_command_parser(

					&a_ctrl->io_master_info,

					i2c_reg_settings,

					&cmd_desc[i], 1);

					&cmd_desc[i], 1, NULL);

				if (rc < 0) {

					CAM_ERR(CAM_ACTUATOR,

					"Failed:parse init settings: %d",
@@ -612,7 +612,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl, 
		rc = cam_sensor_i2c_command_parser(

			&a_ctrl->io_master_info,

			i2c_reg_settings,

			cmd_desc, 1);

			cmd_desc, 1, NULL);

		if (rc < 0) {

			CAM_ERR(CAM_ACTUATOR,

				"Auto move lens parsing failed: %d", rc);
@@ -643,7 +643,7 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl, 
		rc = cam_sensor_i2c_command_parser(

			&a_ctrl->io_master_info,

			i2c_reg_settings,

			cmd_desc, 1);

			cmd_desc, 1, NULL);

		if (rc < 0) {

			CAM_ERR(CAM_ACTUATOR,

				"Manual move lens parsing failed: %d", rc);
@@ -662,6 +662,68 @@ int32_t cam_actuator_i2c_pkt_parse(struct cam_actuator_ctrl_t *a_ctrl, 
		}

		cam_actuator_update_req_mgr(a_ctrl, csl_packet);

		break;

	case CAM_ACTUATOR_PACKET_OPCODE_READ: {

		struct cam_buf_io_cfg *io_cfg;

		struct i2c_settings_array i2c_read_settings;



		if (a_ctrl->cam_act_state < CAM_ACTUATOR_CONFIG) {

			rc = -EINVAL;

			CAM_WARN(CAM_ACTUATOR,

				"Not in right state to read actuator: %d",

				a_ctrl->cam_act_state);

			goto end;

		}

		CAM_DBG(CAM_ACTUATOR, "number of I/O configs: %d:",

			csl_packet->num_io_configs);

		if (csl_packet->num_io_configs == 0) {

			CAM_ERR(CAM_ACTUATOR, "No I/O configs to process");

			rc = -EINVAL;

			goto end;

		}



		INIT_LIST_HEAD(&(i2c_read_settings.list_head));



		io_cfg = (struct cam_buf_io_cfg *) ((uint8_t *)

			&csl_packet->payload +

			csl_packet->io_configs_offset);



		if (io_cfg == NULL) {

			CAM_ERR(CAM_ACTUATOR, "I/O config is invalid(NULL)");

			rc = -EINVAL;

			goto end;

		}



		offset = (uint32_t *)&csl_packet->payload;

		offset += (csl_packet->cmd_buf_offset / sizeof(uint32_t));

		cmd_desc = (struct cam_cmd_buf_desc *)(offset);

		i2c_read_settings.is_settings_valid = 1;

		i2c_read_settings.request_id = 0;

		rc = cam_sensor_i2c_command_parser(&a_ctrl->io_master_info,

			&i2c_read_settings,

			cmd_desc, 1, io_cfg);

		if (rc < 0) {

			CAM_ERR(CAM_ACTUATOR,

				"actuator read pkt parsing failed: %d", rc);

			goto end;

		}



		rc = cam_sensor_i2c_read_data(

			&i2c_read_settings,

			&a_ctrl->io_master_info);

		if (rc < 0) {

			CAM_ERR(CAM_ACTUATOR, "cannot read data, rc:%d", rc);

			delete_request(&i2c_read_settings);

			goto end;

		}



		rc = delete_request(&i2c_read_settings);

		if (rc < 0) {

			CAM_ERR(CAM_ACTUATOR,

				"Failed in deleting the read settings");

			goto end;

		}

		break;

		}

	default:

		CAM_ERR(CAM_ACTUATOR, "Wrong Opcode: %d",

			csl_packet->header.op_code & 0xFFFFFF);

drivers/cam_sensor_module/cam_flash/cam_flash_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
				rc = cam_sensor_i2c_command_parser(

					&fctrl->io_master_info,

					i2c_reg_settings,

					&cmd_desc[i], 1);

					&cmd_desc[i], 1, NULL);

				if (rc < 0) {

					CAM_ERR(CAM_FLASH,

					"pkt parsing failed: %d", rc);
@@ -1150,7 +1150,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
		cmd_desc = (struct cam_cmd_buf_desc *)(offset);

		rc = cam_sensor_i2c_command_parser(

			&fctrl->io_master_info,

			i2c_reg_settings, cmd_desc, 1);

			i2c_reg_settings, cmd_desc, 1, NULL);

		if (rc) {

			CAM_ERR(CAM_FLASH,

			"Failed in parsing i2c packets");
@@ -1181,7 +1181,7 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg) 
		cmd_desc = (struct cam_cmd_buf_desc *)(offset);

		rc = cam_sensor_i2c_command_parser(

			&fctrl->io_master_info,

			i2c_reg_settings, cmd_desc, 1);

			i2c_reg_settings, cmd_desc, 1, NULL);

		if (rc) {

			CAM_ERR(CAM_FLASH,

			"Failed in parsing i2c NRT packets");

drivers/cam_sensor_module/cam_ois/cam_ois_core.c

+64 −3
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t *o_ctrl, void *arg) 
				rc = cam_sensor_i2c_command_parser(

					&o_ctrl->io_master_info,

					i2c_reg_settings,

					&cmd_desc[i], 1);

					&cmd_desc[i], 1, NULL);

				if (rc < 0) {

					CAM_ERR(CAM_OIS,

					"init parsing failed: %d", rc);
@@ -557,7 +557,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t *o_ctrl, void *arg) 
				rc = cam_sensor_i2c_command_parser(

					&o_ctrl->io_master_info,

					i2c_reg_settings,

					&cmd_desc[i], 1);

					&cmd_desc[i], 1, NULL);

				if (rc < 0) {

					CAM_ERR(CAM_OIS,

						"Calib parsing failed: %d", rc);
@@ -629,7 +629,7 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t *o_ctrl, void *arg) 
		i2c_reg_settings->request_id = 0;

		rc = cam_sensor_i2c_command_parser(&o_ctrl->io_master_info,

			i2c_reg_settings,

			cmd_desc, 1);

			cmd_desc, 1, NULL);

		if (rc < 0) {

			CAM_ERR(CAM_OIS, "OIS pkt parsing failed: %d", rc);

			return rc;
@@ -648,6 +648,67 @@ static int cam_ois_pkt_parse(struct cam_ois_ctrl_t *o_ctrl, void *arg) 
			return rc;

		}

		break;

	case CAM_OIS_PACKET_OPCODE_READ: {

		struct cam_buf_io_cfg *io_cfg;

		struct i2c_settings_array i2c_read_settings;



		if (o_ctrl->cam_ois_state < CAM_OIS_CONFIG) {

			rc = -EINVAL;

			CAM_WARN(CAM_OIS,

				"Not in right state to read OIS: %d",

				o_ctrl->cam_ois_state);

			return rc;

		}

		CAM_DBG(CAM_OIS, "number of I/O configs: %d:",

			csl_packet->num_io_configs);

		if (csl_packet->num_io_configs == 0) {

			CAM_ERR(CAM_OIS, "No I/O configs to process");

			rc = -EINVAL;

			return rc;

		}



		INIT_LIST_HEAD(&(i2c_read_settings.list_head));



		io_cfg = (struct cam_buf_io_cfg *) ((uint8_t *)

			&csl_packet->payload +

			csl_packet->io_configs_offset);



		if (io_cfg == NULL) {

			CAM_ERR(CAM_OIS, "I/O config is invalid(NULL)");

			rc = -EINVAL;

			return rc;

		}



		offset = (uint32_t *)&csl_packet->payload;

		offset += (csl_packet->cmd_buf_offset / sizeof(uint32_t));

		cmd_desc = (struct cam_cmd_buf_desc *)(offset);

		i2c_read_settings.is_settings_valid = 1;

		i2c_read_settings.request_id = 0;

		rc = cam_sensor_i2c_command_parser(&o_ctrl->io_master_info,

			&i2c_read_settings,

			cmd_desc, 1, io_cfg);

		if (rc < 0) {

			CAM_ERR(CAM_OIS, "OIS read pkt parsing failed: %d", rc);

			return rc;

		}



		rc = cam_sensor_i2c_read_data(

			&i2c_read_settings,

			&o_ctrl->io_master_info);

		if (rc < 0) {

			CAM_ERR(CAM_OIS, "cannot read data rc: %d", rc);

			delete_request(&i2c_read_settings);

			return rc;

		}



		rc = delete_request(&i2c_read_settings);

		if (rc < 0) {

			CAM_ERR(CAM_OIS,

				"Failed in deleting the read settings");

			return rc;

		}

		break;

	}

	default:

		CAM_ERR(CAM_OIS, "Invalid Opcode: %d",

			(csl_packet->header.op_code & 0xFFFFFF));

drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c

+41 −1
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl, 
	struct cam_control *ioctl_ctrl = NULL;

	struct cam_packet *csl_packet = NULL;

	struct cam_cmd_buf_desc *cmd_desc = NULL;

	struct cam_buf_io_cfg *io_cfg = NULL;

	struct i2c_settings_array *i2c_reg_settings = NULL;

	size_t len_of_buff = 0;

	size_t remain_len = 0;
@@ -187,7 +188,28 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl, 
		i2c_reg_settings->is_settings_valid = 1;

		break;

	}

	case CAM_SENSOR_PACKET_OPCODE_SENSOR_READ: {

		i2c_reg_settings = &(i2c_data->read_settings);

		i2c_reg_settings->request_id = 0;

		i2c_reg_settings->is_settings_valid = 1;



		CAM_DBG(CAM_SENSOR, "number of IO configs: %d:",

			csl_packet->num_io_configs);

		if (csl_packet->num_io_configs == 0) {

			CAM_ERR(CAM_SENSOR, "No I/O configs to process");

			goto end;

		}



		io_cfg = (struct cam_buf_io_cfg *) ((uint8_t *)

			&csl_packet->payload +

			csl_packet->io_configs_offset);



		if (io_cfg == NULL) {

			CAM_ERR(CAM_SENSOR, "I/O config is invalid(NULL)");

			goto end;

		}

		break;

	}

	case CAM_SENSOR_PACKET_OPCODE_SENSOR_UPDATE: {

		if ((s_ctrl->sensor_state == CAM_SENSOR_INIT) ||

			(s_ctrl->sensor_state == CAM_SENSOR_ACQUIRE)) {
@@ -239,7 +261,7 @@ static int32_t cam_sensor_i2c_pkt_parse(struct cam_sensor_ctrl_t *s_ctrl, 
	cmd_desc = (struct cam_cmd_buf_desc *)(offset);



	rc = cam_sensor_i2c_command_parser(&s_ctrl->io_master_info,

			i2c_reg_settings, cmd_desc, 1);

			i2c_reg_settings, cmd_desc, 1, io_cfg);

	if (rc < 0) {

		CAM_ERR(CAM_SENSOR, "Fail parsing I2C Pkt: %d", rc);

		goto end;
@@ -951,6 +973,24 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl, 
			}

			s_ctrl->sensor_state = CAM_SENSOR_CONFIG;

		}



		if (s_ctrl->i2c_data.read_settings.is_settings_valid) {

			rc = cam_sensor_i2c_read_data(

				&s_ctrl->i2c_data.read_settings,

				&s_ctrl->io_master_info);

			if (rc < 0) {

				CAM_ERR(CAM_SENSOR, "cannot read data: %d", rc);

				delete_request(&s_ctrl->i2c_data.read_settings);

				goto release_mutex;

			}

			rc = delete_request(

				&s_ctrl->i2c_data.read_settings);

			if (rc < 0) {

				CAM_ERR(CAM_SENSOR,

					"Fail in deleting the read settings");

				goto release_mutex;

			}

		}

	}

		break;

	default:

drivers/cam_sensor_module/cam_sensor/cam_sensor_dev.c

+3 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 */



#include "cam_sensor_dev.h"
@@ -179,6 +179,7 @@ static int32_t cam_sensor_driver_i2c_probe(struct i2c_client *client, 
	INIT_LIST_HEAD(&(s_ctrl->i2c_data.config_settings.list_head));

	INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamon_settings.list_head));

	INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamoff_settings.list_head));

	INIT_LIST_HEAD(&(s_ctrl->i2c_data.read_settings.list_head));



	for (i = 0; i < MAX_PER_FRAME_ARRAY; i++)

		INIT_LIST_HEAD(&(s_ctrl->i2c_data.per_frame[i].list_head));
@@ -314,6 +315,7 @@ static int32_t cam_sensor_driver_platform_probe( 
	INIT_LIST_HEAD(&(s_ctrl->i2c_data.config_settings.list_head));

	INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamon_settings.list_head));

	INIT_LIST_HEAD(&(s_ctrl->i2c_data.streamoff_settings.list_head));

	INIT_LIST_HEAD(&(s_ctrl->i2c_data.read_settings.list_head));



	for (i = 0; i < MAX_PER_FRAME_ARRAY; i++)

		INIT_LIST_HEAD(&(s_ctrl->i2c_data.per_frame[i].list_head));