Forráskód Böngészése

msm: camera: isp: Move IFE FD out port to non-secure

Currently, the IFE FD port is configured to be secure by TZ and the
camera software allocates secure buffers to be consumed by EFA FD
module. However, as we are moving to the software based DLFD, this
port needs to be configured as non secure by TZ and camera should
treat so and allocate non secure buffers.

CRs-Fixed: 3443139
Change-Id: I2fcc89d4d61bd944969bfe854584960c10648f6c
Signed-off-by: Suraj Dongre <[email protected]>
Signed-off-by: Vijay Kumar Tumati <[email protected]>
Vijay Kumar Tumati 2 éve
szülő
commit
059b3006ac

+ 3 - 1
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c

@@ -300,7 +300,6 @@ static bool cam_vfe_bus_ver3_can_be_secure(uint32_t out_type)
 	case CAM_VFE_BUS_VER3_VFE_OUT_FULL:
 	case CAM_VFE_BUS_VER3_VFE_OUT_DS4:
 	case CAM_VFE_BUS_VER3_VFE_OUT_DS16:
-	case CAM_VFE_BUS_VER3_VFE_OUT_FD:
 	case CAM_VFE_BUS_VER3_VFE_OUT_RAW_DUMP:
 	case CAM_VFE_BUS_VER3_VFE_OUT_RDI0:
 	case CAM_VFE_BUS_VER3_VFE_OUT_RDI1:
@@ -318,6 +317,9 @@ static bool cam_vfe_bus_ver3_can_be_secure(uint32_t out_type)
 	case CAM_VFE_BUS_VER3_VFE_OUT_PREPROCESS_RAW:
 		return true;
 
+	case CAM_VFE_BUS_VER3_VFE_OUT_FD:
+		return cam_secure_get_vfe_fd_port_config();
+
 	case CAM_VFE_BUS_VER3_VFE_OUT_STATS_HDR_BE:
 	case CAM_VFE_BUS_VER3_VFE_OUT_STATS_HDR_BHIST:
 	case CAM_VFE_BUS_VER3_VFE_OUT_STATS_TL_BG:

+ 10 - 0
drivers/cam_utils/cam_compat.c

@@ -751,3 +751,13 @@ int cam_compat_util_get_irq(struct cam_hw_soc_info *soc_info)
 	return rc;
 }
 #endif
+
+bool cam_secure_get_vfe_fd_port_config(void)
+{
+#if KERNEL_VERSION(6, 0, 0) <= LINUX_VERSION_CODE
+	return false;
+#else
+	return true;
+#endif
+}
+

+ 2 - 0
drivers/cam_utils/cam_compat.h

@@ -98,4 +98,6 @@ int cam_eeprom_spi_driver_remove(struct spi_device *sdev);
 
 int cam_compat_util_get_irq(struct cam_hw_soc_info *soc_info);
 
+bool cam_secure_get_vfe_fd_port_config(void);
+
 #endif /* _CAM_COMPAT_H_ */