samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: sensor: Add support to hold sensor name

Browse Source 
Add support for the new version a sensor probe
structure to hold the sensor name information
along with the existing informations.

CRs-Fixed: 2856300
Change-Id: Ib195455fbfe02b8d4035105bc6958d11c2a0faf6
Signed-off-by: Jigar Agrawal <jigar@codeaurora.org>
This commit is contained in:
Jigar Agrawal
2021-01-11 17:21:54 -08:00
parent e7f96de4c3
commit 7adee41eee
2 changed files with 91 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c
View File

@@ -1,6 +1,6 @@
// 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-2021, The Linux Foundation. All rights reserved.
*/ */
#include <linux/module.h> #include <linux/module.h>
@@ -428,23 +428,43 @@ int32_t cam_sensor_update_i2c_info(struct cam_cmd_i2c_info *i2c_info,
return rc; return rc;
} }
int32_t cam_sensor_update_slave_info(struct cam_cmd_probe *probe_info, int32_t cam_sensor_update_slave_info(void *probe_info,
struct cam_sensor_ctrl_t *s_ctrl) uint32_t cmd, struct cam_sensor_ctrl_t *s_ctrl)
{ {
int32_t rc = 0; int32_t rc = 0;
struct cam_cmd_probe *sensor_probe_info;
struct cam_cmd_probe_v2 *sensor_probe_info_v2;
if (cmd == CAM_SENSOR_PROBE_CMD) {
sensor_probe_info = (struct cam_cmd_probe *)probe_info;
s_ctrl->sensordata->slave_info.sensor_id_reg_addr = s_ctrl->sensordata->slave_info.sensor_id_reg_addr =
probe_info->reg_addr; sensor_probe_info->reg_addr;
s_ctrl->sensordata->slave_info.sensor_id = s_ctrl->sensordata->slave_info.sensor_id =
probe_info->expected_data; sensor_probe_info->expected_data;
s_ctrl->sensordata->slave_info.sensor_id_mask = s_ctrl->sensordata->slave_info.sensor_id_mask =
probe_info->data_mask; sensor_probe_info->data_mask;
/* Userspace passes the pipeline delay in reserved field */
s_ctrl->pipeline_delay = s_ctrl->pipeline_delay =
probe_info->reserved; sensor_probe_info->reserved;
s_ctrl->sensor_probe_addr_type = sensor_probe_info->addr_type;
s_ctrl->sensor_probe_data_type = sensor_probe_info->data_type;
} else if (cmd == CAM_SENSOR_PROBE_V2_CMD) {
sensor_probe_info_v2 = (struct cam_cmd_probe_v2 *)probe_info;
s_ctrl->sensordata->slave_info.sensor_id_reg_addr =
sensor_probe_info_v2->reg_addr;
s_ctrl->sensordata->slave_info.sensor_id =
sensor_probe_info_v2->expected_data;
s_ctrl->sensordata->slave_info.sensor_id_mask =
sensor_probe_info_v2->data_mask;
s_ctrl->pipeline_delay =
sensor_probe_info_v2->pipeline_delay;
s_ctrl->sensor_probe_addr_type =
sensor_probe_info_v2->addr_type;
s_ctrl->sensor_probe_data_type =
sensor_probe_info_v2->data_type;
}
s_ctrl->sensor_probe_addr_type = probe_info->addr_type;
s_ctrl->sensor_probe_data_type = probe_info->data_type;
CAM_DBG(CAM_SENSOR, CAM_DBG(CAM_SENSOR,
"Sensor Addr: 0x%x sensor_id: 0x%x sensor_mask: 0x%x sensor_pipeline_delay:0x%x", "Sensor Addr: 0x%x sensor_id: 0x%x sensor_mask: 0x%x sensor_pipeline_delay:0x%x",
s_ctrl->sensordata->slave_info.sensor_id_reg_addr, s_ctrl->sensordata->slave_info.sensor_id_reg_addr,
@@ -456,18 +476,25 @@ int32_t cam_sensor_update_slave_info(struct cam_cmd_probe *probe_info,
int32_t cam_handle_cmd_buffers_for_probe(void *cmd_buf, int32_t cam_handle_cmd_buffers_for_probe(void *cmd_buf,
struct cam_sensor_ctrl_t *s_ctrl, struct cam_sensor_ctrl_t *s_ctrl,
int32_t cmd_buf_num, uint32_t cmd_buf_length, size_t remain_len) int32_t cmd_buf_num, uint32_t cmd,
uint32_t cmd_buf_length, size_t remain_len)
{ {
int32_t rc = 0; int32_t rc = 0;
size_t required_size = 0;
switch (cmd_buf_num) { switch (cmd_buf_num) {
case 0: { case 0: {
struct cam_cmd_i2c_info *i2c_info = NULL; struct cam_cmd_i2c_info *i2c_info = NULL;
struct cam_cmd_probe *probe_info; void *probe_info;
if (remain_len < if (cmd == CAM_SENSOR_PROBE_CMD)
(sizeof(struct cam_cmd_i2c_info) + required_size = sizeof(struct cam_cmd_i2c_info) +
sizeof(struct cam_cmd_probe))) { sizeof(struct cam_cmd_probe);
else if(cmd == CAM_SENSOR_PROBE_V2_CMD)
required_size = sizeof(struct cam_cmd_i2c_info) +
sizeof(struct cam_cmd_probe_v2);
if (remain_len < required_size) {
CAM_ERR(CAM_SENSOR, CAM_ERR(CAM_SENSOR,
"not enough buffer for cam_cmd_i2c_info"); "not enough buffer for cam_cmd_i2c_info");
return -EINVAL; return -EINVAL;
@@ -478,9 +505,8 @@ int32_t cam_handle_cmd_buffers_for_probe(void *cmd_buf,
CAM_ERR(CAM_SENSOR, "Failed in Updating the i2c Info"); CAM_ERR(CAM_SENSOR, "Failed in Updating the i2c Info");
return rc; return rc;
} }
probe_info = (struct cam_cmd_probe *) probe_info = cmd_buf + sizeof(struct cam_cmd_i2c_info);
(cmd_buf + sizeof(struct cam_cmd_i2c_info)); rc = cam_sensor_update_slave_info(probe_info, cmd, s_ctrl);
rc = cam_sensor_update_slave_info(probe_info, s_ctrl);
if (rc < 0) { if (rc < 0) {
CAM_ERR(CAM_SENSOR, "Updating the slave Info"); CAM_ERR(CAM_SENSOR, "Updating the slave Info");
return rc; return rc;
@@ -506,7 +532,8 @@ int32_t cam_handle_cmd_buffers_for_probe(void *cmd_buf,
return rc; return rc;
} }
int32_t cam_handle_mem_ptr(uint64_t handle, struct cam_sensor_ctrl_t *s_ctrl) int32_t cam_handle_mem_ptr(uint64_t handle, uint32_t cmd,
struct cam_sensor_ctrl_t *s_ctrl)
{ {
int rc = 0, i; int rc = 0, i;
uint32_t *cmd_buf; uint32_t *cmd_buf;
@@ -581,7 +608,7 @@ int32_t cam_handle_mem_ptr(uint64_t handle, struct cam_sensor_ctrl_t *s_ctrl)
ptr = (void *) cmd_buf; ptr = (void *) cmd_buf;
rc = cam_handle_cmd_buffers_for_probe(ptr, s_ctrl, rc = cam_handle_cmd_buffers_for_probe(ptr, s_ctrl,
i, cmd_desc[i].length, remain_len); i, cmd, cmd_desc[i].length, remain_len);
if (rc < 0) { if (rc < 0) {
CAM_ERR(CAM_SENSOR, CAM_ERR(CAM_SENSOR,
"Failed to parse the command Buffer Header"); "Failed to parse the command Buffer Header");
@@ -725,7 +752,8 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl,
mutex_lock(&(s_ctrl->cam_sensor_mutex)); mutex_lock(&(s_ctrl->cam_sensor_mutex));
switch (cmd->op_code) { switch (cmd->op_code) {
case CAM_SENSOR_PROBE_CMD: { case CAM_SENSOR_PROBE_CMD:
case CAM_SENSOR_PROBE_V2_CMD: {
if (s_ctrl->is_probe_succeed == 1) { if (s_ctrl->is_probe_succeed == 1) {
CAM_ERR(CAM_SENSOR, CAM_ERR(CAM_SENSOR,
"Already Sensor Probed in the slot"); "Already Sensor Probed in the slot");
@@ -734,7 +762,8 @@ int32_t cam_sensor_driver_cmd(struct cam_sensor_ctrl_t *s_ctrl,
if (cmd->handle_type == if (cmd->handle_type ==
CAM_HANDLE_MEM_HANDLE) { CAM_HANDLE_MEM_HANDLE) {
rc = cam_handle_mem_ptr(cmd->handle, s_ctrl); rc = cam_handle_mem_ptr(cmd->handle, cmd->op_code,
s_ctrl);
if (rc < 0) { if (rc < 0) {
CAM_ERR(CAM_SENSOR, "Get Buffer Handle Failed"); CAM_ERR(CAM_SENSOR, "Get Buffer Handle Failed");
goto release_mutex; goto release_mutex;

36
include/uapi/camera/media/cam_sensor.h
View File

@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
/* /*
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/ */
#ifndef __UAPI_CAM_SENSOR_H__ #ifndef __UAPI_CAM_SENSOR_H__
@@ -11,9 +11,11 @@
#include <camera/media/cam_defs.h> #include <camera/media/cam_defs.h>
#define CAM_SENSOR_PROBE_CMD (CAM_COMMON_OPCODE_MAX + 1) #define CAM_SENSOR_PROBE_CMD (CAM_COMMON_OPCODE_MAX + 1)
#define CAM_SENSOR_PROBE_V2_CMD (CAM_COMMON_OPCODE_MAX + 2)
#define CAM_FLASH_MAX_LED_TRIGGERS 2 #define CAM_FLASH_MAX_LED_TRIGGERS 2
#define MAX_OIS_NAME_SIZE 32 #define MAX_OIS_NAME_SIZE 32
#define CAM_CSIPHY_SECURE_MODE_ENABLED 1 #define CAM_CSIPHY_SECURE_MODE_ENABLED 1
#define CAM_SENSOR_NAME_MAX_SIZE 32
/** /**
* struct cam_sensor_query_cap - capabilities info for sensor * struct cam_sensor_query_cap - capabilities info for sensor
* *
@@ -167,6 +169,38 @@ struct cam_cmd_probe {
__u16 reserved; __u16 reserved;
} __attribute__((packed)); } __attribute__((packed));
/**
* struct cam_cmd_probe_v2 - Contains sensor slave info version 2
*
* @data_type : Slave register data type
* @addr_type : Slave register address type
* @op_code : Don't Care
* @cmd_type : Explains type of command
* @reg_addr : Slave register address
* @expected_data : Data expected at slave register address
* @data_mask : Data mask if only few bits are valid
* @camera_id : Indicates the slot to which camera
* needs to be probed
* @pipeline_delay : Pipeline delay
* @logical_camera_id : Logical Camera ID
* @sensor_name : Sensor's name
* @reserved
*/
struct cam_cmd_probe_v2 {
__u8 data_type;
__u8 addr_type;
__u8 op_code;
__u8 cmd_type;
__u32 reg_addr;
__u32 expected_data;
__u32 data_mask;
__u16 camera_id;
__u16 pipeline_delay;
__u32 logical_camera_id;
char sensor_name[CAM_SENSOR_NAME_MAX_SIZE];
__u32 reserved[4];
} __attribute__((packed));
/** /**
* struct cam_power_settings - Contains sensor power setting info * struct cam_power_settings - Contains sensor power setting info
* *