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

Unverified Commit a7cc4292 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0' of... 

Merge tag 'LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/camera-kernel into android12-5.4-lahaina

"LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0"

* tag 'LA.UM.9.14.r1-19600.01-LAHAINA.QSSI12.0' of https://git.codelinaro.org/clo/la/platform/vendor/opensource/camera-kernel:
  msm: camera: eeprom: Add OOB read check for eeprom memory map
  msm: camera: jpeg: By default disable Camnoc MISR configuration

Change-Id: I7a43d3541489fab4e970272f70ea3468bead7a65
parents ebaae91b 2a481c8b

techpack/camera/drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+24 −15
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */
@@ -142,12 +143,18 @@ static int cam_jpeg_process_next_hw_update(void *priv, void *data, 


	CAM_TRACE(CAM_JPEG, "Start JPEG ENC Req %llu", config_args->request_id);



	if (g_jpeg_hw_mgr.camnoc_misr_test) {

		/* configure jpeg hw and camnoc misr */

		rc = hw_mgr->devices[dev_type][0]->hw_ops.process_cmd(

			hw_mgr->devices[dev_type][0]->hw_priv,

			CAM_JPEG_CMD_CONFIG_HW_MISR,

			&g_jpeg_hw_mgr.camnoc_misr_test,

			sizeof(g_jpeg_hw_mgr.camnoc_misr_test));

		if (rc) {

			CAM_ERR(CAM_JPEG, "Failed to apply the configs %d", rc);

			goto end_error;

		}

	}



	rc = hw_mgr->devices[dev_type][0]->hw_ops.start(

		hw_mgr->devices[dev_type][0]->hw_priv, NULL, 0);
@@ -214,6 +221,7 @@ static int cam_jpeg_mgr_process_irq(void *priv, void *data) 
	CAM_DBG(CAM_JPEG, "hw entry processed %d Encoded size :%d",

		p_cfg_req->num_hw_entry_processed, task_data->result_size);



	if (g_jpeg_hw_mgr.camnoc_misr_test) {

		misr_args.req_id = p_cfg_req->req_id;

		misr_args.enable_bug = g_jpeg_hw_mgr.bug_on_misr;

		CAM_DBG(CAM_JPEG, "req %lld bug is enabled for MISR :%d",
@@ -224,6 +232,7 @@ static int cam_jpeg_mgr_process_irq(void *priv, void *data) 
			hw_mgr->devices[dev_type][0]->hw_priv,

			CAM_JPEG_CMD_DUMP_HW_MISR_VAL, &misr_args,

			sizeof(struct cam_jpeg_misr_dump_args));

	}



	if ((task_data->result_size > 0) &&

		(p_cfg_req->num_hw_entry_processed <

techpack/camera/drivers/cam_jpeg/jpeg_hw/include/cam_jpeg_hw_intf.h

+3 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */
@@ -21,8 +22,8 @@ 
#define CAM_JPEG_CAMNOC_MISR_VAL_ROW 2

#define CAM_JPEG_CAMNOC_MISR_VAL_COL 4

#define CAM_JPEG_ENC_MISR_VAL_NUM    3

#define CAM_JPEG_MISR_ID_LOW_RD      0

#define CAM_JPEG_MISR_ID_LOW_WR      1

#define CAM_JPEG_MISR_ID_LOW_RD      1

#define CAM_JPEG_MISR_ID_LOW_WR      2



enum cam_jpeg_hw_type {

	CAM_JPEG_DEV_ENC,

techpack/camera/drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/cam_jpeg_dma_165_hw_info_ver_4_2_0.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021, The Linux Foundation. All rights reserved.

 */
@@ -70,6 +71,7 @@ static struct cam_jpeg_dma_device_hw_info cam_jpeg_dma_165_hw_info = { 
	.camnoc_misr_sigdata = 4,

	.master_we_sel = 2,

	.misr_rd_word_sel = 4,

	.camnoc_misr_support = 1,

};



#endif /* CAM_JPEG_DMA_165_HW_INFO_VER_4_2_0_H */

techpack/camera/drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/cam_jpeg_dma_580_hw_info_ver_4_2_0.h

+2 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021, The Linux Foundation. All rights reserved.

 */
@@ -70,6 +71,7 @@ static struct cam_jpeg_dma_device_hw_info cam_jpeg_dma_580_hw_info = { 
	.camnoc_misr_sigdata = 4,

	.master_we_sel = 2,

	.misr_rd_word_sel = 4,

	.camnoc_misr_support = 1,

};



#endif /* CAM_JPEG_DMA_580_HW_INFO_VER_4_2_0_H */

techpack/camera/drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/cam_jpeg_dma_hw_info_ver_4_2_0.h

+3 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */
@@ -40,7 +41,8 @@ static struct cam_jpeg_dma_device_hw_info cam_jpeg_dma_hw_info = { 
		.resetdone = CAM_JPEGDMA_HW_MASK_COMP_RESET_ACK,

		.iserror = 0x0,

		.stopdone = CAM_JPEGDMA_HW_IRQ_STATUS_AXI_HALT,

	}

	},

	.camnoc_misr_support = 0,

};



#endif /* CAM_JPEG_DMA_HW_INFO_VER_4_2_0_H */