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

Commit 172d34b6 authored by Trishansh Bhardwaj's avatar Trishansh Bhardwaj
Browse files

msm: camera: common: Merge camera-kernel.3.1 changes in camera-kernel.4.0 



msm: camera: tfe: Fix variable initialization issues
msm: camera: isp: Dual tfe event check with proper hw idx
msm: camera: smmu: Add support for non-contiguous mermory region
msm: camera: smmu: Use iommu best match algo for camera
msm: camera: ope: Optimize allocation of IO configuration
msm: camera: ope: Fix for KW Issues
msm: camera: ope: Add support for stripe level height configuration
msm: camera: tfe: Enable the delay line clc
msm: camera: ope: Fix false alarm for OPE HW timeout
msm: camera: tfe: Support register dump per request
msm: camera: ope: Increase max number of stripes
msm: camera: ope: Change packer and unpacker format in case NV12
msm: camera: tfe: Add packet code get command for tfe
msm: camera: ope: Trigger recovery in case of violation on write bus
msm: camera: ope: Protect ope hw reset with mutex
msm: camera: ope: Add a check for valid request in cdm callback
msm: camera: ope: Remove the BW & clock vote in release context
msm: camera: ope: Reduce OPE BUS memory
msm: camera: ope: Fix return value for ope acquire
msm: camera: ope: Fix false alarm for OPE request timeout
msm: camera: ope: Avoid deadlock during recovery after HW hang
msm: camera: tfe: tfe debug enhancement
msm: camera: cdm: Fix irq_data value in case of inline irq
msm: camera: flash: Switch off flash on provider crash
msm: camera: ope: Initialize ope hw mutex structure
msm: camera: cdm: Flush all available FIFOs during reset
msm: camera: cpas: Add mandatory bw option for axi ports clocks
msm: camera: ope: Use vzalloc to allocate the write bus ctx structure
msm: camera: ope: Fix handling of init hw failure
msm: camera: tfe: Enable per frame register dump for rdi only context
msm: camera: cdm: Protect cdm core status bits with mutex
msm: camera: cdm: correct the error check in cmd submit irq
msm: camera: ope: Fix unclock access during HW reset
msm: camera: ope: Program frame level settings after idle event
msm: camera: ope: Delay releasing of resources for last context
msm: camera: isp: Increase default SOF freeze timeout
msm: camera: smmu: Add map and unmap monitor
msm: camera: isp: Add trace events across ISP
msm: camera: smmu: Profile time taken for map, unmap
msm: camera: ope: Start context timer on receiving new request
msm: camera: tfe: Reduce stack size during set axi bw
msm: camera: cdm: Check for HW state before dumping registers
msm: camera: ope: Reduce stack footprint during acquire
msm: camera: tfe: Disable clock if tfe2 is not supported
msm: camera: cdm: Avoid cdm pause incase of BL submit
msm: camera: tfe: Optimize CSID IRQ logging
msm: camera: ope: Move request id validity check outside of lock
msm: camera: tfe: Correct the tfe hw manager dump logic
msm: camera: ope: Synchronize flush and submit BLs
msm: camera: cdm: Protect cdm reset status
msm: camera: cdm: Handle cdm deinit sequence properly
msm: camera: tfe: Reduce reset timeout to 100ms
msm: camera: ope: Fix hang detection
msm: camera: ope: Make non-fatal logs as debug and info logs
msm: camera: tfe: set overflow pending bit to zero after HW reset
msm: camera: ope: Do not disable CDM during error handling
msm: camera: ope: Add support for OPE Replay
msm: camera: ope: Stop OPE in case of init failure
msm: camera: ope: Synchronize process cmd and flush request
msm: camera: cdm: Fix CDM IRQ handling
msm: camera: tfe: LDAR dump for TFE
msm: camera: ope: Fix the length check for debug buffer
msm: camera: cdm: Fix CDM reset logic
msm: camera: ope: Dump debug registers in case of HW hang
msm: camera: tfe: Support the RDI bus port for line based mode
msm: camera: cdm: Handle out of order reset done events
msm: camera: ope: Consider other contexts during timeout
msm: camera: ope: Put GenIRQ in last stripe BL
msm: camera: tfe: Process the rdi interrupts for rdi only resource
msm: camera: jpeg: Check the HW state before accessing register
msm: camera: csiphy: Update csiphy power-up sequence for lito v2
msm: camera: cdm: Secure freeing of request lists using locks
msm: camera: cpas: Add support for Scuba camnoc
msm: camera: csiphy: Clear secure phy flags on release
msm: camera: tfe: validate the tfe bw num paths
msm: camera: ope: Reorder the reset order in ope acquire
msm: camera: ope: Dump debug registers in case of reset failure
msm: camera: ope: Add logic to detect hang in CDM
msm: camera: isp: Increase max count of cfg to support more init packets
msm: camera: core: Fix cpas axi clk rate overflow.

CRs-Fixed: 2668666
Change-Id: I882ca4bd117bebc7d1c62bc82299d69d7b5c9388
Signed-off-by: default avatarTrishansh Bhardwaj <tbhardwa@codeaurora.org>
parent 76586bbf

drivers/cam_cdm/cam_cdm.h

+7 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
/* BL_FIFO configurations*/

#define CAM_CDM_BL_FIFO_LENGTH_MAX_DEFAULT 0x40

#define CAM_CDM_BL_FIFO_LENGTH_CFG_SHIFT 0x10

#define CAM_CDM_BL_FIFO_FLUSH_SHIFT 0x3



#define CAM_CDM_BL_FIFO_REQ_SIZE_MAX 0x00

#define CAM_CDM_BL_FIFO_REQ_SIZE_MAX_DIV2 0x01
@@ -100,6 +101,7 @@ 
#define CAM_CDM_IRQ_STATUS_ERROR_INV_CMD_MASK 0x10000

#define CAM_CDM_IRQ_STATUS_ERROR_OVER_FLOW_MASK 0x20000

#define CAM_CDM_IRQ_STATUS_ERROR_AHB_BUS_MASK 0x40000

#define CAM_CDM_IRQ_STATUS_USR_DATA_MASK 0xFF



#define CAM_CDM_IRQ_STATUS_ERRORS \

	(CAM_CDM_IRQ_STATUS_ERROR_INV_CMD_MASK | \
@@ -371,6 +373,7 @@ enum cam_cdm_hw_process_intf_cmd { 
	CAM_CDM_HW_INTF_CMD_RESET_HW,

	CAM_CDM_HW_INTF_CMD_FLUSH_HW,

	CAM_CDM_HW_INTF_CMD_HANDLE_ERROR,

	CAM_CDM_HW_INTF_CMD_HANG_DETECT,

	CAM_CDM_HW_INTF_CMD_INVALID,

};
@@ -466,6 +469,8 @@ struct cam_cdm_bl_fifo { 
	struct mutex fifo_lock;

	uint8_t bl_tag;

	uint32_t bl_depth;

	uint8_t last_bl_tag_done;

	uint32_t work_record;

};



/**
@@ -493,6 +498,7 @@ struct cam_cdm_bl_fifo { 
 * @gen_irq:             memory region in which gen_irq command will be written

 * @cpas_handle:         handle for cpas driver

 * @arbitration:         type of arbitration to be used for the CDM

 * @rst_done_cnt:        CMD reset done count

 */

struct cam_cdm {

	uint32_t index;
@@ -515,6 +521,7 @@ struct cam_cdm { 
	struct cam_cdm_hw_mem gen_irq[CAM_CDM_BL_FIFO_MAX];

	uint32_t cpas_handle;

	enum cam_cdm_arbitration arbitration;

	uint32_t rst_done_cnt;

};



/* struct cam_cdm_private_dt_data - CDM hw custom dt data */

drivers/cam_cdm/cam_cdm_core_common.c

+80 −23
Original line number Diff line number Diff line
@@ -262,6 +262,47 @@ void cam_cdm_notify_clients(struct cam_hw_info *cdm_hw, 
	}

}



static int cam_cdm_stream_handle_init(void *hw_priv, bool init)

{

	struct cam_hw_info *cdm_hw = hw_priv;

	struct cam_cdm *core = NULL;

	int rc = -EPERM;



	core = (struct cam_cdm *)cdm_hw->core_info;



	if (init) {

		rc = cam_hw_cdm_init(hw_priv, NULL, 0);

		if (rc) {

			CAM_ERR(CAM_CDM, "CDM HW init failed");

			return rc;

		}



		if (core->arbitration !=

			CAM_CDM_ARBITRATION_PRIORITY_BASED) {

			rc = cam_hw_cdm_alloc_genirq_mem(

				hw_priv);

			if (rc) {

				CAM_ERR(CAM_CDM,

					"Genirqalloc failed");

				cam_hw_cdm_deinit(hw_priv,

					NULL, 0);

			}

		}

	} else {

		rc = cam_hw_cdm_deinit(hw_priv, NULL, 0);

		if (rc)

			CAM_ERR(CAM_CDM, "Deinit failed in streamoff");



		if (core->arbitration !=

			CAM_CDM_ARBITRATION_PRIORITY_BASED) {

			if (cam_hw_cdm_release_genirq_mem(hw_priv))

				CAM_ERR(CAM_CDM, "Genirq release fail");

		}

	}



	return rc;

}



int cam_cdm_stream_ops_internal(void *hw_priv,

	void *start_args, bool operation)

{
@@ -337,19 +378,7 @@ int cam_cdm_stream_ops_internal(void *hw_priv, 
				rc = 0;

			} else {

				CAM_DBG(CAM_CDM, "CDM HW init first time");

				rc = cam_hw_cdm_init(hw_priv, NULL, 0);

				if (rc == 0) {

					rc = cam_hw_cdm_alloc_genirq_mem(

						hw_priv);

					if (rc != 0) {

						CAM_ERR(CAM_CDM,

							"Genirqalloc failed");

						cam_hw_cdm_deinit(hw_priv,

							NULL, 0);

					}

				} else {

					CAM_ERR(CAM_CDM, "CDM HW init failed");

				}

				rc = cam_cdm_stream_handle_init(hw_priv, true);

			}

			if (rc == 0) {

				cdm_hw->open_count++;
@@ -378,17 +407,10 @@ int cam_cdm_stream_ops_internal(void *hw_priv, 
					rc = 0;

				} else {

					CAM_DBG(CAM_CDM, "CDM HW Deinit now");

					rc = cam_hw_cdm_deinit(

						hw_priv, NULL, 0);

					if (cam_hw_cdm_release_genirq_mem(

						hw_priv))

						CAM_ERR(CAM_CDM,

							"Genirq release fail");

					rc = cam_cdm_stream_handle_init(hw_priv,

						false);

				}

				if (rc) {

					CAM_ERR(CAM_CDM,

						"Deinit failed in streamoff");

				} else {

				if (rc == 0) {

					client->stream_on = false;

					rc = cam_cpas_stop(core->cpas_handle);

					if (rc)
@@ -763,6 +785,41 @@ int cam_cdm_process_cmd(void *hw_priv, 
		mutex_unlock(&cdm_hw->hw_mutex);

		break;

	}

	case CAM_CDM_HW_INTF_CMD_HANG_DETECT: {

		uint32_t *handle = cmd_args;

		int idx;

		struct cam_cdm_client *client;



		if (sizeof(uint32_t) != arg_size) {

			CAM_ERR(CAM_CDM,

				"Invalid CDM cmd %d size=%x for handle=%x",

				cmd, arg_size, *handle);

				return -EINVAL;

		}



		idx = CAM_CDM_GET_CLIENT_IDX(*handle);

		mutex_lock(&cdm_hw->hw_mutex);

		client = core->clients[idx];

		if (!client) {

			CAM_ERR(CAM_CDM,

				"Client not present for handle %d",

				*handle);

			mutex_unlock(&cdm_hw->hw_mutex);

			break;

		}



		if (*handle != client->handle) {

			CAM_ERR(CAM_CDM,

				"handle mismatch, client handle %d index %d received handle %d",

				client->handle, idx, *handle);

			mutex_unlock(&cdm_hw->hw_mutex);

			break;

		}



		rc = cam_hw_cdm_hang_detect(cdm_hw, *handle);

		mutex_unlock(&cdm_hw->hw_mutex);

		break;

	}

	default:

		CAM_ERR(CAM_CDM, "CDM HW intf command not valid =%d", cmd);

		break;

drivers/cam_cdm/cam_cdm_core_common.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ int cam_hw_cdm_submit_bl(struct cam_hw_info *cdm_hw, 
int cam_hw_cdm_reset_hw(struct cam_hw_info *cdm_hw, uint32_t handle);

int cam_hw_cdm_flush_hw(struct cam_hw_info *cdm_hw, uint32_t handle);

int cam_hw_cdm_handle_error(struct cam_hw_info *cdm_hw, uint32_t handle);

int cam_hw_cdm_hang_detect(struct cam_hw_info *cdm_hw, uint32_t handle);

struct cam_cdm_bl_cb_request_entry *cam_cdm_find_request_by_bl_tag(

	uint32_t tag, struct list_head *bl_list);

void cam_cdm_notify_clients(struct cam_hw_info *cdm_hw,

drivers/cam_cdm/cam_cdm_hw_core.c

+382 −107

File changed.

Preview size limit exceeded, changes collapsed.

drivers/cam_cdm/cam_cdm_intf.c

+27 −0
Original line number Diff line number Diff line
@@ -480,6 +480,33 @@ int cam_cdm_handle_error(uint32_t handle) 
}

EXPORT_SYMBOL(cam_cdm_handle_error);



int cam_cdm_detect_hang_error(uint32_t handle)

{

	uint32_t hw_index;

	int rc = -EINVAL;

	struct cam_hw_intf *hw;



	if (get_cdm_mgr_refcount()) {

		CAM_ERR(CAM_CDM, "CDM intf mgr get refcount failed");

		rc = -EPERM;

		return rc;

	}



	hw_index = CAM_CDM_GET_HW_IDX(handle);

	if (hw_index < CAM_CDM_INTF_MGR_MAX_SUPPORTED_CDM) {

		hw = cdm_mgr.nodes[hw_index].device;

		if (hw && hw->hw_ops.process_cmd)

			rc = hw->hw_ops.process_cmd(hw->hw_priv,

				CAM_CDM_HW_INTF_CMD_HANG_DETECT,

				&handle,

				sizeof(handle));

	}

	put_cdm_mgr_refcount();



	return rc;

}

EXPORT_SYMBOL(cam_cdm_detect_hang_error);



int cam_cdm_intf_register_hw_cdm(struct cam_hw_intf *hw,

	struct cam_cdm_private_dt_data *data, enum cam_cdm_type type,

	uint32_t *index)