Merge "msm: cpp: Ensure CPP RX fifo is empty while writing firmware" (8c6a6907) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+37 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1319,6 +1319,12 @@ static int32_t cpp_load_fw(struct cpp_device cpp_dev, char fw_name_bin)
	msm_camera_io_w(0xFFFFFFFF, cpp_dev->base +		msm_camera_io_w(0xFFFFFFFF, cpp_dev->base +
	MSM_CPP_MICRO_IRQGEN_CLR);		MSM_CPP_MICRO_IRQGEN_CLR);

			rc = msm_cpp_poll_rx_empty(cpp_dev->base);
			if (rc) {
			pr_err("%s:%d] poll rx empty failed %d",
			__func__, __LINE__, rc);
			goto end;
			}
	/Start firmware loading/		/Start firmware loading/
	msm_cpp_write(MSM_CPP_CMD_FW_LOAD, cpp_dev->base);		msm_cpp_write(MSM_CPP_CMD_FW_LOAD, cpp_dev->base);
	msm_cpp_write(cpp_dev->fw->size, cpp_dev->base);		msm_cpp_write(cpp_dev->fw->size, cpp_dev->base);
	@@ -1359,6 +1365,12 @@ static int32_t cpp_load_fw(struct cpp_device cpp_dev, char fw_name_bin)
	goto end;		goto end;
	}		}

			rc = msm_cpp_poll_rx_empty(cpp_dev->base);
			if (rc) {
			pr_err("%s:%d] poll rx empty failed %d",
			__func__, __LINE__, rc);
			goto end;
			}
	/Trigger MC to jump to start address/		/Trigger MC to jump to start address/
	msm_cpp_write(MSM_CPP_CMD_EXEC_JUMP, cpp_dev->base);		msm_cpp_write(MSM_CPP_CMD_EXEC_JUMP, cpp_dev->base);
	msm_cpp_write(MSM_CPP_JUMP_ADDRESS, cpp_dev->base);		msm_cpp_write(MSM_CPP_JUMP_ADDRESS, cpp_dev->base);
	@@ -2048,12 +2060,28 @@ static int msm_cpp_send_command_to_hardware(struct cpp_device *cpp_dev,
	uint32_t *cmd_msg, uint32_t payload_size)		uint32_t *cmd_msg, uint32_t payload_size)
	{		{
	uint32_t i;		uint32_t i;
			int rc = 0;

			rc = msm_cpp_poll_rx_empty(cpp_dev->base);
			if (rc) {
			pr_err("%s:%d] poll rx empty failed %d",
			__func__, __LINE__, rc);
			goto end;
			}

	for (i = 0; i < payload_size; i++) {		for (i = 0; i < payload_size; i++) {
	msm_cpp_write(cmd_msg[i],		msm_cpp_write(cmd_msg[i], cpp_dev->base);
	cpp_dev->base);		if (i % MSM_CPP_RX_FIFO_LEVEL == 0) {
			rc = msm_cpp_poll_rx_empty(cpp_dev->base);
			if (rc) {
			pr_err("%s:%d] poll rx empty failed %d",
			__func__, __LINE__, rc);
			goto end;
			}
	}		}
	return 0;		}
			end:
			return rc;
	}		}

	static int msm_cpp_flush_frames(struct cpp_device *cpp_dev)		static int msm_cpp_flush_frames(struct cpp_device *cpp_dev)
	@@ -2851,6 +2879,12 @@ static int32_t msm_cpp_fw_version(struct cpp_device *cpp_dev)
	{		{
	int32_t rc = 0;		int32_t rc = 0;

			rc = msm_cpp_poll_rx_empty(cpp_dev->base);
			if (rc) {
			pr_err("%s:%d] poll rx empty failed %d",
			__func__, __LINE__, rc);
			goto end;
			}
	/Get Firmware Version/		/Get Firmware Version/
	msm_cpp_write(MSM_CPP_CMD_GET_FW_VER, cpp_dev->base);		msm_cpp_write(MSM_CPP_CMD_GET_FW_VER, cpp_dev->base);
	msm_cpp_write(MSM_CPP_MSG_ID_CMD, cpp_dev->base);		msm_cpp_write(MSM_CPP_MSG_ID_CMD, cpp_dev->base);