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

Commit 71294c88 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge commit '8f6e1ddf' into msm-4.9 - PC170"

parents 718855ec 144e7668

Documentation/devicetree/bindings/media/video/msm-cam-cpas.txt

+5 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ First Level Node - CAM CPAS device 
  Value type: <u32>

  Definition: CAM HW Version information.



- camnoc-axi-min-ib-bw

  Usage: optional

  Value type: <u64>

  Definition: Min camnoc axi bw for the given target.



- regulator-names

  Usage: required

  Value type: <string>

arch/arm64/boot/dts/qcom/sdm670-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ 
		qcom,cpas-hw-ver = <0x170110>; /* Titan v170 v1.1.0 */

		nvmem-cells = <&minor_rev>;

		nvmem-cell-names = "minor_rev";

		camnoc-axi-min-ib-bw = <3000000000>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ 
		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170100>; /* Titan v170 v1.0.0 */

		camnoc-axi-min-ib-bw = <3000000000>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

arch/arm64/boot/dts/qcom/sdm845-v2-camera.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ 
		interrupt-names = "cpas_camnoc";

		interrupts = <0 459 0>;

		qcom,cpas-hw-ver = <0x170110>; /* Titan v170 v1.1.0 */

		camnoc-axi-min-ib-bw = <3000000000>;

		regulator-names = "camss-vdd";

		camss-vdd-supply = <&titan_top_gdsc>;

		clock-names = "gcc_ahb_clk",

drivers/media/platform/msm/camera/cam_cpas/cam_cpas_hw.c

+81 −48
Original line number Diff line number Diff line
@@ -22,11 +22,6 @@ 
#include "cam_cpas_hw_intf.h"

#include "cam_cpas_soc.h"



#define CAM_CPAS_AXI_MIN_MNOC_AB_BW   (2048 * 1024)

#define CAM_CPAS_AXI_MIN_MNOC_IB_BW   (2048 * 1024)

#define CAM_CPAS_AXI_MIN_CAMNOC_AB_BW (2048 * 1024)

#define CAM_CPAS_AXI_MIN_CAMNOC_IB_BW (3000000000L)



static uint cam_min_camnoc_ib_bw;

module_param(cam_min_camnoc_ib_bw, uint, 0644);
@@ -82,8 +77,8 @@ static int cam_cpas_util_vote_bus_client_level( 
	if (level == bus_client->curr_vote_level)

		return 0;



	CAM_DBG(CAM_CPAS, "Bus client[%d] index[%d]", bus_client->client_id,

		level);

	CAM_DBG(CAM_CPAS, "Bus client=[%d][%s] index[%d]",

		bus_client->client_id, bus_client->name, level);

	msm_bus_scale_client_update_request(bus_client->client_id, level);

	bus_client->curr_vote_level = level;
@@ -152,8 +147,8 @@ static int cam_cpas_util_vote_bus_client_bw( 
	path->vectors[0].ab = ab;

	path->vectors[0].ib = ib;



	CAM_DBG(CAM_CPAS, "Bus client[%d] :ab[%llu] ib[%llu], index[%d]",

		bus_client->client_id, ab, ib, idx);

	CAM_DBG(CAM_CPAS, "Bus client=[%d][%s] :ab[%llu] ib[%llu], index[%d]",

		bus_client->client_id, bus_client->name, ab, ib, idx);

	msm_bus_scale_client_update_request(bus_client->client_id, idx);



	return 0;
@@ -208,10 +203,12 @@ static int cam_cpas_util_register_bus_client( 
	bus_client->num_paths = pdata->usecase[0].num_paths;

	bus_client->curr_vote_level = 0;

	bus_client->valid = true;

	bus_client->name = pdata->name;

	mutex_init(&bus_client->lock);



	CAM_DBG(CAM_CPAS, "Bus Client : src=%d, dst=%d, bus_client=%d",

		bus_client->src, bus_client->dst, bus_client->client_id);

	CAM_DBG(CAM_CPAS, "Bus Client=[%d][%s] : src=%d, dst=%d",

		bus_client->client_id, bus_client->name,

		bus_client->src, bus_client->dst);



	return 0;

fail_unregister_client:
@@ -463,6 +460,7 @@ static int cam_cpas_hw_reg_write(struct cam_hw_info *cpas_hw, 
{

	struct cam_hw_soc_info *soc_info = &cpas_hw->soc_info;

	struct cam_cpas *cpas_core = (struct cam_cpas *) cpas_hw->core_info;

	struct cam_cpas_client *cpas_client = NULL;

	int reg_base_index = cpas_core->regbase_index[reg_base];

	uint32_t client_indx = CAM_CPAS_GET_CLIENT_IDX(client_handle);

	int rc = 0;
@@ -478,9 +476,12 @@ static int cam_cpas_hw_reg_write(struct cam_hw_info *cpas_hw, 
		return -EINVAL;



	mutex_lock(&cpas_core->client_mutex[client_indx]);

	cpas_client = cpas_core->cpas_client[client_indx];



	if (!CAM_CPAS_CLIENT_STARTED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "client has not started%d", client_indx);

		CAM_ERR(CAM_CPAS, "client=[%d][%s][%d] has not started",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto unlock_client;

	}
@@ -503,6 +504,7 @@ static int cam_cpas_hw_reg_read(struct cam_hw_info *cpas_hw, 
{

	struct cam_hw_soc_info *soc_info = &cpas_hw->soc_info;

	struct cam_cpas *cpas_core = (struct cam_cpas *) cpas_hw->core_info;

	struct cam_cpas_client *cpas_client = NULL;

	int reg_base_index = cpas_core->regbase_index[reg_base];

	uint32_t reg_value;

	uint32_t client_indx = CAM_CPAS_GET_CLIENT_IDX(client_handle);
@@ -522,9 +524,12 @@ static int cam_cpas_hw_reg_read(struct cam_hw_info *cpas_hw, 
		return -EINVAL;



	mutex_lock(&cpas_core->client_mutex[client_indx]);

	cpas_client = cpas_core->cpas_client[client_indx];



	if (!CAM_CPAS_CLIENT_STARTED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "client has not started%d", client_indx);

		CAM_ERR(CAM_CPAS, "client=[%d][%s][%d] has not started",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto unlock_client;

	}
@@ -580,8 +585,9 @@ static int cam_cpas_util_set_camnoc_axi_clk_rate( 
			soc_private->camnoc_axi_clk_bw_margin) / 100;



		if ((required_camnoc_bw > 0) &&

			(required_camnoc_bw < CAM_CPAS_AXI_MIN_CAMNOC_IB_BW))

			required_camnoc_bw = CAM_CPAS_AXI_MIN_CAMNOC_IB_BW;

			(required_camnoc_bw <

			soc_private->camnoc_axi_min_ib_bw))

			required_camnoc_bw = soc_private->camnoc_axi_min_ib_bw;



		clk_rate = required_camnoc_bw / soc_private->camnoc_bus_width;
@@ -695,6 +701,7 @@ static int cam_cpas_hw_update_axi_vote(struct cam_hw_info *cpas_hw, 
{

	struct cam_axi_vote axi_vote;

	struct cam_cpas *cpas_core = (struct cam_cpas *) cpas_hw->core_info;

	struct cam_cpas_client *cpas_client = NULL;

	uint32_t client_indx = CAM_CPAS_GET_CLIENT_IDX(client_handle);

	int rc = 0;
@@ -719,16 +726,20 @@ static int cam_cpas_hw_update_axi_vote(struct cam_hw_info *cpas_hw, 


	mutex_lock(&cpas_hw->hw_mutex);

	mutex_lock(&cpas_core->client_mutex[client_indx]);

	cpas_client = cpas_core->cpas_client[client_indx];



	if (!CAM_CPAS_CLIENT_STARTED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "client has not started %d", client_indx);

		CAM_ERR(CAM_CPAS, "client=[%d][%s][%d] has not started",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto unlock_client;

	}



	CAM_DBG(CAM_CPAS,

		"Client[%d] Requested compressed[%llu], uncompressed[%llu]",

		client_indx, axi_vote.compressed_bw,

		"Client=[%d][%s][%d] Requested compressed[%llu], uncompressed[%llu]",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index, axi_vote.compressed_bw,

		axi_vote.uncompressed_bw);



	rc = cam_cpas_util_apply_client_axi_vote(cpas_hw,
@@ -809,7 +820,8 @@ static int cam_cpas_util_apply_client_ahb_vote(struct cam_hw_info *cpas_hw, 
	mutex_lock(&ahb_bus_client->lock);

	cpas_client->ahb_level = required_level;



	CAM_DBG(CAM_CPAS, "Clients required level[%d], curr_level[%d]",

	CAM_DBG(CAM_CPAS, "Client=[%d][%s] required level[%d], curr_level[%d]",

		ahb_bus_client->client_id, ahb_bus_client->name,

		required_level, ahb_bus_client->curr_vote_level);



	if (required_level == ahb_bus_client->curr_vote_level)
@@ -853,6 +865,7 @@ static int cam_cpas_hw_update_ahb_vote(struct cam_hw_info *cpas_hw, 
{

	struct cam_ahb_vote ahb_vote;

	struct cam_cpas *cpas_core = (struct cam_cpas *) cpas_hw->core_info;

	struct cam_cpas_client *cpas_client = NULL;

	uint32_t client_indx = CAM_CPAS_GET_CLIENT_IDX(client_handle);

	int rc = 0;
@@ -875,17 +888,21 @@ static int cam_cpas_hw_update_ahb_vote(struct cam_hw_info *cpas_hw, 


	mutex_lock(&cpas_hw->hw_mutex);

	mutex_lock(&cpas_core->client_mutex[client_indx]);

	cpas_client = cpas_core->cpas_client[client_indx];



	if (!CAM_CPAS_CLIENT_STARTED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "client has not started %d", client_indx);

		CAM_ERR(CAM_CPAS, "client=[%d][%s][%d] has not started",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto unlock_client;

	}



	CAM_DBG(CAM_CPAS,

		"client[%d] : type[%d], level[%d], freq[%ld], applied[%d]",

		client_indx, ahb_vote.type, ahb_vote.vote.level,

		ahb_vote.vote.freq,

		"client=[%d][%s][%d] : type[%d], level[%d], freq[%ld], applied[%d]",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index, ahb_vote.type,

		ahb_vote.vote.level, ahb_vote.vote.freq,

		cpas_core->cpas_client[client_indx]->ahb_level);



	rc = cam_cpas_util_apply_client_ahb_vote(cpas_hw,
@@ -948,32 +965,37 @@ static int cam_cpas_hw_start(void *hw_priv, void *start_args, 


	mutex_lock(&cpas_hw->hw_mutex);

	mutex_lock(&cpas_core->client_mutex[client_indx]);

	cpas_client = cpas_core->cpas_client[client_indx];



	if (!CAM_CPAS_CLIENT_REGISTERED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "client is not registered %d", client_indx);

		CAM_ERR(CAM_CPAS, "client=[%d] is not registered",

			client_indx);

		rc = -EPERM;

		goto done;

	}



	if (CAM_CPAS_CLIENT_STARTED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "Client %d is in start state", client_indx);

		CAM_ERR(CAM_CPAS, "client=[%d][%s][%d] is in start state",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto done;

	}



	cpas_client = cpas_core->cpas_client[client_indx];



	CAM_DBG(CAM_CPAS, "AHB :client[%d] type[%d], level[%d], applied[%d]",

		client_indx, ahb_vote->type, ahb_vote->vote.level,

		cpas_client->ahb_level);

	CAM_DBG(CAM_CPAS,

		"AHB :client=[%d][%s][%d] type[%d], level[%d], applied[%d]",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index,

		ahb_vote->type, ahb_vote->vote.level, cpas_client->ahb_level);

	rc = cam_cpas_util_apply_client_ahb_vote(cpas_hw, cpas_client,

		ahb_vote, &applied_level);

	if (rc)

		goto done;



	CAM_DBG(CAM_CPAS,

		"AXI client[%d] compressed_bw[%llu], uncompressed_bw[%llu]",

		client_indx, axi_vote->compressed_bw,

		"AXI client=[%d][%s][%d] compressed_bw[%llu], uncompressed_bw[%llu]",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index, axi_vote->compressed_bw,

		axi_vote->uncompressed_bw);

	rc = cam_cpas_util_apply_client_axi_vote(cpas_hw,

		cpas_client, axi_vote);
@@ -1010,9 +1032,9 @@ static int cam_cpas_hw_start(void *hw_priv, void *start_args, 
	cpas_client->started = true;

	cpas_core->streamon_clients++;



	CAM_DBG(CAM_CPAS, "client=%s, streamon_clients=%d",

		soc_private->client_name[client_indx],

		cpas_core->streamon_clients);

	CAM_DBG(CAM_CPAS, "client=[%d][%s][%d] streamon_clients=%d",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index, cpas_core->streamon_clients);

done:

	mutex_unlock(&cpas_core->client_mutex[client_indx]);

	mutex_unlock(&cpas_hw->hw_mutex);
@@ -1062,18 +1084,20 @@ static int cam_cpas_hw_stop(void *hw_priv, void *stop_args, 


	mutex_lock(&cpas_hw->hw_mutex);

	mutex_lock(&cpas_core->client_mutex[client_indx]);

	cpas_client = cpas_core->cpas_client[client_indx];



	CAM_DBG(CAM_CPAS, "client=%s, streamon_clients=%d",

		soc_private->client_name[client_indx],

		cpas_core->streamon_clients);

	CAM_DBG(CAM_CPAS, "Client=[%d][%s][%d] streamon_clients=%d",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index, cpas_core->streamon_clients);



	if (!CAM_CPAS_CLIENT_STARTED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "Client %d is not started", client_indx);

		CAM_ERR(CAM_CPAS, "Client=[%d][%s][%d] is not started",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto done;

	}



	cpas_client = cpas_core->cpas_client[client_indx];

	cpas_client->started = false;

	cpas_core->streamon_clients--;
@@ -1207,8 +1231,9 @@ static int cam_cpas_hw_register_client(struct cam_hw_info *cpas_hw, 
		cpas_client, client_indx);

	if (rc) {

		CAM_ERR(CAM_CPAS,

			"axi_port_insert failed client_indx=%d, rc=%d",

			client_indx, rc);

			"axi_port_insert failed Client=[%d][%s][%d], rc=%d",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index, rc);

		kfree(cpas_client);

		mutex_unlock(&cpas_hw->hw_mutex);

		return -EINVAL;
@@ -1223,8 +1248,9 @@ static int cam_cpas_hw_register_client(struct cam_hw_info *cpas_hw, 


	mutex_unlock(&cpas_hw->hw_mutex);



	CAM_DBG(CAM_CPAS, "client_indx=%d, registered_clients=%d",

		client_indx, cpas_core->registered_clients);

	CAM_DBG(CAM_CPAS, "client=[%d][%s][%d], registered_clients=%d",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index, cpas_core->registered_clients);



	return 0;

}
@@ -1233,6 +1259,7 @@ static int cam_cpas_hw_unregister_client(struct cam_hw_info *cpas_hw, 
	uint32_t client_handle)

{

	struct cam_cpas *cpas_core = (struct cam_cpas *) cpas_hw->core_info;

	struct cam_cpas_client *cpas_client = NULL;

	uint32_t client_indx = CAM_CPAS_GET_CLIENT_IDX(client_handle);

	int rc = 0;
@@ -1241,15 +1268,20 @@ static int cam_cpas_hw_unregister_client(struct cam_hw_info *cpas_hw, 


	mutex_lock(&cpas_hw->hw_mutex);

	mutex_lock(&cpas_core->client_mutex[client_indx]);

	cpas_client = cpas_core->cpas_client[client_indx];



	if (!CAM_CPAS_CLIENT_REGISTERED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "client not registered %d", client_indx);

		CAM_ERR(CAM_CPAS, "Client=[%d][%s][%d] not registered",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto done;

	}



	if (CAM_CPAS_CLIENT_STARTED(cpas_core, client_indx)) {

		CAM_ERR(CAM_CPAS, "Client %d is not stopped", client_indx);

		CAM_ERR(CAM_CPAS, "Client=[%d][%s][%d] is not stopped",

			client_indx, cpas_client->data.identifier,

			cpas_client->data.cell_index);

		rc = -EPERM;

		goto done;

	}
@@ -1257,8 +1289,9 @@ static int cam_cpas_hw_unregister_client(struct cam_hw_info *cpas_hw, 
	cam_cpas_util_remove_client_from_axi_port(

		cpas_core->cpas_client[client_indx]);



	CAM_DBG(CAM_CPAS, "client_indx=%d, registered_clients=%d",

		client_indx, cpas_core->registered_clients);

	CAM_DBG(CAM_CPAS, "client=[%d][%s][%d], registered_clients=%d",

		client_indx, cpas_client->data.identifier,

		cpas_client->data.cell_index, cpas_core->registered_clients);



	kfree(cpas_core->cpas_client[client_indx]);

	cpas_core->cpas_client[client_indx] = NULL;