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

msm: camera: utils: Add support for cesta hw client voting through mmrm

Browse Source 
This change will allow clients voting through mmrm to use the new mmrm
api and vote according to their drv_type. This change affects
registering, unregistering and setting the clk rate to sw and
hw clients.

CRs-Fixed: 3385745
Change-Id: I11f76a0de3ba0d8d969093725d4c528afef51373
Signed-off-by: Atiya Kailany <quic_akailany@quicinc.com>
This commit is contained in:
Atiya Kailany
2022-12-20 13:54:51 -08:00
committed by Camera Software Integration
parent 6d99262523
commit de76f19956
7 changed files with 126 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cam_cpas/cam_cpas_soc.c
View File

@@ -1772,14 +1772,14 @@ int cam_cpas_soc_init_resources(struct cam_hw_soc_info *soc_info,
goto free_irq_data;
}
soc_info->is_clk_drv_en = soc_private->enable_cam_clk_drv;
rc = cam_soc_util_request_platform_resource(soc_info, irq_handler, &(irq_data[0]));
if (rc) {
CAM_ERR(CAM_CPAS, "failed in request_platform_resource, rc=%d", rc);
goto free_irq_data;
}
soc_info->is_clk_drv_en = soc_private->enable_cam_clk_drv;
rc = cam_soc_util_get_option_clk_by_name(soc_info, CAM_ICP_CLK_NAME,
&soc_private->icp_clk_index);
if (rc) {

14
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_soc.c
View File

@@ -80,11 +80,21 @@ int cam_ife_csid_init_soc_resources(struct cam_hw_soc_info *soc_info,
soc_info->soc_private = soc_private;
rc = cam_ife_csid_get_dt_properties(soc_info);
if (rc < 0)
return rc;
if (rc < 0) {
CAM_ERR(CAM_ISP, "Failed in get_dt_properties, rc=%d", rc);
goto free_soc_private;
}
/* Need to see if we want post process the clock list */
if (!soc_private->is_ife_csid_lite) {
rc = cam_cpas_query_drv_enable(NULL, &soc_info->is_clk_drv_en);
if (rc) {
CAM_ERR(CAM_ISP, "Failed to query DRV enable rc:%d", rc);
goto free_soc_private;
}
}
rc = cam_ife_csid_request_platform_resource(soc_info, csid_irq_handler,
data);
if (rc < 0) {

6
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_soc.c
View File

@@ -103,6 +103,12 @@ int cam_sfe_init_soc_resources(struct cam_hw_soc_info *soc_info,
goto free_soc_private;
}
rc = cam_cpas_query_drv_enable(NULL, &soc_info->is_clk_drv_en);
if (rc) {
CAM_ERR(CAM_SFE, "Failed to query DRV enable rc:%d", rc);
goto free_soc_private;
}
rc = cam_sfe_request_platform_resource(soc_info,
irq_handler_func, irq_data);
if (rc < 0) {

8
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.c
View File

@@ -170,6 +170,14 @@ int cam_vfe_init_soc_resources(struct cam_hw_soc_info *soc_info,
goto free_soc_private;
}
if (!soc_private->is_ife_lite) {
rc = cam_cpas_query_drv_enable(NULL, &soc_info->is_clk_drv_en);
if (rc) {
CAM_ERR(CAM_ISP, "Failed to query DRV enable rc:%d", rc);
goto free_soc_private;
}
}
rc = cam_soc_util_get_option_clk_by_name(soc_info, CAM_VFE_DSP_CLK_NAME,
&soc_private->dsp_clk_index);
if (rc)

5
drivers/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c
View File

@@ -380,6 +380,11 @@ int32_t cam_csiphy_parse_dt_info(struct platform_device *pdev,
for (i = 0; i < soc_info->irq_count; i++)
irq_data[i] = csiphy_dev;
rc = cam_cpas_query_drv_enable(NULL, &soc_info->is_clk_drv_en);
if (rc) {
CAM_ERR(CAM_CSIPHY, "Failed to query DRV enable rc:%d", rc);
return rc;
}
rc = cam_soc_util_request_platform_resource(&csiphy_dev->soc_info,
cam_csiphy_irq, &(irq_data[0]));

101
drivers/cam_utils/cam_soc_util.c
View File

@@ -97,6 +97,11 @@ static LIST_HEAD(wrapper_clk_list);
const struct device *cam_cesta_crm_dev;
#if IS_ENABLED(CONFIG_QCOM_CRM) && IS_ENABLED(CONFIG_SPECTRA_USE_CLK_CRM_API)
static int cam_soc_util_set_hw_client_rate_through_mmrm(
void *mmrm_handle, long low_val, long high_val,
uint32_t num_hw_blocks, int cesta_client_idx);
#endif
#if IS_ENABLED(CONFIG_QCOM_CRM)
static inline const struct device *cam_wrapper_crm_get_device(
const char *name)
@@ -403,6 +408,23 @@ static int cam_soc_util_set_cesta_clk_rate(struct cam_hw_soc_info *soc_info,
src_clk_idx = soc_info->src_clk_idx;
clk = soc_info->clk[src_clk_idx];
if (!skip_mmrm_set_rate && soc_info->mmrm_handle) {
CAM_DBG(CAM_UTIL, "cesta mmrm hw client: set %s, high-rate %lld low-rate %lld",
soc_info->clk_name[src_clk_idx], high_val, low_val);
rc = cam_soc_util_set_hw_client_rate_through_mmrm(
soc_info->mmrm_handle, low_val, high_val, 1,
cesta_client_idx);
if (rc) {
CAM_ERR(CAM_UTIL,
"set_sw_client_rate through mmrm failed on %s clk_id %d low_val %llu high_val %llu client idx=%d",
soc_info->clk_name[src_clk_idx], soc_info->clk_id[src_clk_idx],
low_val, high_val, cesta_client_idx);
return rc;
}
goto end;
}
CAM_DBG(CAM_UTIL, "%s Requested clk rate [high low]: [%llu %llu] cesta_client_idx: %d",
soc_info->clk_name[src_clk_idx], high_val, low_val, cesta_client_idx);
@@ -424,6 +446,7 @@ static int cam_soc_util_set_cesta_clk_rate(struct cam_hw_soc_info *soc_info,
return rc;
}
end:
if (applied_high_val)
*applied_high_val = high_val;
@@ -433,6 +456,52 @@ static int cam_soc_util_set_cesta_clk_rate(struct cam_hw_soc_info *soc_info,
return rc;
}
#if IS_REACHABLE(CONFIG_MSM_MMRM)
int cam_soc_util_set_hw_client_rate_through_mmrm(
void *mmrm_handle, long low_val, long high_val,
uint32_t num_hw_blocks, int cesta_client_idx)
{
int rc = 0;
struct mmrm_client_data client_data;
client_data.num_hw_blocks = num_hw_blocks;
client_data.crm_drv_idx = cesta_client_idx;
client_data.drv_type = MMRM_CRM_HW_DRV;
client_data.pwr_st = CRM_PWR_STATE1;
client_data.flags = 0;
CAM_DBG(CAM_UTIL,
"hw client mmrm=%pK, high_val %ld, low_val %ld, num_blocks=%d, pwr_state: %u, client_idx: %d",
mmrm_handle, high_val, low_val, num_hw_blocks, CRM_PWR_STATE1, cesta_client_idx);
rc = mmrm_client_set_value((struct mmrm_client *)mmrm_handle,
&client_data, high_val);
if (rc) {
CAM_ERR(CAM_UTIL, "Set high rate failed rate %ld rc %d",
high_val, rc);
return rc;
}
/* We vote a second time for pwr_st = low */
client_data.pwr_st = CRM_PWR_STATE0;
rc = mmrm_client_set_value((struct mmrm_client *)mmrm_handle,
&client_data, low_val);
if (rc)
CAM_ERR(CAM_UTIL, "Set low rate failed rate %ld rc %d", low_val, rc);
return rc;
}
#else
int cam_soc_util_set_hw_client_rate_through_mmrm(
void *mmrm_handle, long low_val, long high_val,
uint32_t num_hw_blocks, int cesta_client_idx)
{
return 0;
}
#endif
#else
static inline int cam_soc_util_set_cesta_clk_rate(struct cam_hw_soc_info *soc_info,
uint32_t cesta_client_idx, unsigned long high_val, unsigned long low_val,
@@ -508,6 +577,16 @@ int cam_soc_util_register_mmrm_client(
desc.client_info.desc.client_id = clk_id;
desc.client_info.desc.clk = clk;
#if IS_ENABLED(CONFIG_QCOM_CRM) && IS_ENABLED(CONFIG_SPECTRA_USE_CLK_CRM_API)
if (soc_info->is_clk_drv_en) {
desc.client_info.desc.hw_drv_instances = CAM_CESTA_MAX_CLIENTS;
desc.client_info.desc.num_pwr_states = CAM_NUM_PWR_STATES;
} else {
desc.client_info.desc.hw_drv_instances = 0;
desc.client_info.desc.num_pwr_states = 0;
}
#endif
snprintf((char *)desc.client_info.desc.name,
sizeof(desc.client_info.desc.name), "%s_%s",
soc_info->dev_name, clk_name);
@@ -551,7 +630,7 @@ int cam_soc_util_unregister_mmrm_client(
return rc;
}
static int cam_soc_util_set_rate_through_mmrm(
static int cam_soc_util_set_sw_client_rate_through_mmrm(
void *mmrm_handle, bool is_nrt_dev, long min_rate,
long req_rate, uint32_t num_hw_blocks)
{
@@ -562,8 +641,12 @@ static int cam_soc_util_set_rate_through_mmrm(
client_data.num_hw_blocks = num_hw_blocks;
client_data.flags = 0;
#if IS_ENABLED(CONFIG_QCOM_CRM) && IS_ENABLED(CONFIG_SPECTRA_USE_CLK_CRM_API)
client_data.drv_type = MMRM_CRM_SW_DRV;
#endif
CAM_DBG(CAM_UTIL,
"mmrm=%pK, nrt=%d, min_rate=%ld req_rate %ld, num_blocks=%d",
"sw client mmrm=%pK, nrt=%d, min_rate=%ld req_rate %ld, num_blocks=%d",
mmrm_handle, is_nrt_dev, min_rate, req_rate, num_hw_blocks);
if (is_nrt_dev) {
@@ -606,7 +689,7 @@ int cam_soc_util_unregister_mmrm_client(
return 0;
}
static int cam_soc_util_set_rate_through_mmrm(
static int cam_soc_util_set_sw_client_rate_through_mmrm(
void *mmrm_handle, bool is_nrt_dev, long min_rate,
long req_rate, uint32_t num_hw_blocks)
{
@@ -851,7 +934,7 @@ static int cam_soc_util_clk_wrapper_set_clk_rate(
bool set_rate_finish = false;
if (!skip_mmrm_set_rate && wrapper_clk->mmrm_handle) {
rc = cam_soc_util_set_rate_through_mmrm(
rc = cam_soc_util_set_sw_client_rate_through_mmrm(
wrapper_clk->mmrm_handle,
wrapper_clk->is_nrt_dev,
wrapper_clk->min_clk_rate,
@@ -1341,16 +1424,16 @@ static int cam_soc_util_set_clk_rate(struct cam_hw_soc_info *soc_info,
uint32_t idx = soc_info->src_clk_idx;
uint32_t min_level = soc_info->lowest_clk_level;
rc = cam_soc_util_set_rate_through_mmrm(
rc = cam_soc_util_set_sw_client_rate_through_mmrm(
soc_info->mmrm_handle,
soc_info->is_nrt_dev,
soc_info->clk_rate[min_level][idx],
clk_rate_round, 1);
if (rc) {
CAM_ERR(CAM_UTIL,
"set_rate through mmrm failed on %s clk_id %d, rate=%ld",
clk_name, clk_id,
clk_rate_round);
"set_sw_client_rate through mmrm failed on %s clk_id %d, rate=%ld",
clk_name, clk_id, clk_rate_round);
return rc;
}
set_rate_finish = true;
@@ -1766,7 +1849,7 @@ int cam_soc_util_clk_disable(struct cam_hw_soc_info *soc_info, int cesta_client_
(soc_info->src_clk_idx == clk_idx)) {
CAM_DBG(CAM_UTIL, "Dev %s Disabling %s clk, set 0 rate",
soc_info->dev_name, clk_name);
cam_soc_util_set_rate_through_mmrm(
cam_soc_util_set_sw_client_rate_through_mmrm(
soc_info->mmrm_handle,
soc_info->is_nrt_dev,
0, 0, 1);

1
drivers/cam_utils/cam_soc_util.h
View File

@@ -93,6 +93,7 @@ enum cam_vote_level {
#define CAM_SOC_PINCTRL_STATE_DEFAULT "cam_default"
#define CAM_CESTA_MAX_CLIENTS 3
#define CAM_NUM_PWR_STATES 2
/**
* struct cam_soc_util_hw_client_clk_rates: Information about HW client clock vote