Merge "msm: camera: common: add kernel-compatible hard IRQ check helper" into camera-kernel.qclinux.0.0

Author: Camera Software Integration

camera/drivers/cam_core/cam_hw_intf.h

@@ -127,7 +127,7 @@ static inline unsigned long cam_hw_util_hw_lock_irqsave(struct cam_hw_info *hw_i
 {
 	unsigned long flags = 0;
 
-	if (!in_irq())
+	if (!cam_in_hardirq())
 		spin_lock_irqsave(&hw_info->hw_lock, flags);
 
 	return flags;
@@ -136,7 +136,7 @@ static inline unsigned long cam_hw_util_hw_lock_irqsave(struct cam_hw_info *hw_i
 static inline void cam_hw_util_hw_unlock_irqrestore(struct cam_hw_info *hw_info,
 	unsigned long flags)
 {
-	if (!in_irq())
+	if (!cam_in_hardirq())
 		spin_unlock_irqrestore(&hw_info->hw_lock, flags);
 }
 

camera/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c

@@ -183,7 +183,7 @@ static inline unsigned long cam_irq_controller_lock_irqsave(
 {
 	unsigned long flags = 0;
 
-	if (!in_irq())
+	if (!cam_in_hardirq())
 		spin_lock_irqsave(&controller->lock, flags);
 
 	return flags;
@@ -192,7 +192,7 @@ static inline unsigned long cam_irq_controller_lock_irqsave(
 static inline void cam_irq_controller_unlock_irqrestore(
 	struct cam_irq_controller *controller, unsigned long flags)
 {
-	if (!in_irq())
+	if (!cam_in_hardirq())
 		spin_unlock_irqrestore(&controller->lock, flags);
 }
 
@@ -299,7 +299,7 @@ static inline void cam_irq_controller_clear_irq(
 	/* Don't clear in IRQ context since global clear will be issued after
 	 * top half processing
 	 */
-	if (in_irq())
+	if (cam_in_hardirq())
 		return;
 
 	for (i = 0; i < controller->num_registers; i++) {

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c

@@ -3222,7 +3222,7 @@ static int cam_tfe_csid_sof_irq_debug(
 		csid_hw->sof_irq_triggered = false;
 	}
 
-	if (!in_irq())
+	if (!cam_in_hardirq())
 		CAM_INFO(CAM_ISP, "SOF freeze: CSID:%d SOF irq %s",
 			csid_hw->hw_intf->hw_idx,
 			sof_irq_enable ? "enabled" : "disabled");

camera/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c

@@ -241,7 +241,7 @@ int cam_tfe_irq_config(void     *tfe_core_data,
 	soc_info = (struct cam_hw_soc_info  *)top_priv->common_data.soc_info;
 	mem_base = soc_info->reg_map[TFE_CORE_BASE_IDX].mem_base;
 
-	need_lock = !in_irq();
+	need_lock = !cam_in_hardirq();
 	if (need_lock)
 		spin_lock_irqsave(&core_info->spin_lock, flags);
 

camera_kt/drivers/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c

@@ -11,6 +11,7 @@
 #include "cam_io_util.h"
 #include "cam_irq_controller.h"
 #include "cam_debug_util.h"
+#include "cam_common_util.h"
 
 /**
  * struct cam_irq_evt_handler:
@@ -322,7 +323,7 @@ int cam_irq_controller_subscribe_irq(void *irq_controller,
 	if (controller->hdl_idx > 0x3FFFFFFF)
 		controller->hdl_idx = 1;
 
-	need_lock = !in_irq();
+	need_lock = !cam_in_hardirq();
 	if (need_lock)
 		spin_lock_irqsave(&controller->lock, flags);
 	for (i = 0; i < controller->num_registers; i++) {
@@ -374,7 +375,7 @@ int cam_irq_controller_enable_irq(void *irq_controller, uint32_t handle)
 	if (!controller)
 		return rc;
 
-	need_lock = !in_irq();
+	need_lock = !cam_in_hardirq();
 	if (need_lock)
 		spin_lock_irqsave(&controller->lock, flags);
 
@@ -430,7 +431,7 @@ int cam_irq_controller_disable_irq(void *irq_controller, uint32_t handle)
 	if (!controller)
 		return rc;
 
-	need_lock = !in_irq();
+	need_lock = !cam_in_hardirq();
 	if (need_lock)
 		spin_lock_irqsave(&controller->lock, flags);
 
@@ -499,7 +500,7 @@ int cam_irq_controller_unsubscribe_irq(void *irq_controller,
 	int                         rc = -EINVAL;
 	bool                        need_lock;
 
-	need_lock = !in_irq();
+	need_lock = !cam_in_hardirq();
 	if (need_lock)
 		spin_lock_irqsave(&controller->lock, flags);
 

camera_kt/drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

@@ -22,6 +22,7 @@
 #include "cam_cpas_api.h"
 #include "cam_subdev.h"
 #include "cam_tasklet_util.h"
+#include "cam_common_util.h"
 
 /* Timeout value in msec */
 #define IFE_CSID_TIMEOUT                               1000
@@ -4364,7 +4365,7 @@ static int cam_ife_csid_sof_irq_debug(
 		csid_hw->sof_irq_triggered = false;
 	}
 
-	if (!in_irq())
+	if (!cam_in_hardirq())
 		CAM_INFO(CAM_ISP, "SOF freeze: CSID SOF irq %s, CSID HW:%d",
 			(sof_irq_enable) ? "enabled" : "disabled",
 			csid_hw->hw_intf->hw_idx);

camera_kt/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_csid_hw/cam_tfe_csid_core.c

@@ -2585,7 +2585,7 @@ static int cam_tfe_csid_sof_irq_debug(
 		csid_hw->sof_irq_triggered = false;
 	}
 
-	if (!in_irq())
+	if (!cam_in_hardirq())
 		CAM_INFO(CAM_ISP, "SOF freeze: CSID:%d SOF irq %s",
 			csid_hw->hw_intf->hw_idx,
 			sof_irq_enable ? "enabled" : "disabled");

camera_kt/drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c

@@ -207,7 +207,7 @@ int cam_tfe_irq_config(void     *tfe_core_data,
 	soc_info = (struct cam_hw_soc_info  *)top_priv->common_data.soc_info;
 	mem_base = soc_info->reg_map[TFE_CORE_BASE_IDX].mem_base;
 
-	need_lock = !in_irq();
+	need_lock = !cam_in_hardirq();
 	if (need_lock)
 		spin_lock_irqsave(&core_info->spin_lock, flags);
 

common/cam_common_util.h

@@ -10,6 +10,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/vmalloc.h>
+#include <linux/version.h>
 
 #include "cam_hw_mgr_intf.h"
 
@@ -86,6 +87,28 @@
 	rem_jiffies;                                                                         \
 })
 
+
+/*
+ * Linux ≥ 6.19 removed in_irq(); the intended replacement is in_hardirq().
+ * Linux ≤ 6.18 still has in_irq().
+ *
+ * cam_in_hardirq():
+ *  - returns true in hard IRQ context only (matching the old in_irq() semantics).
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 19, 0)
+  #include <linux/irq.h>        /* in_hardirq() */
+  static inline bool cam_in_hardirq(void)
+  {
+      return in_hardirq();
+  }
+#else
+  #include <linux/interrupt.h>  /* in_irq() */
+  static inline bool cam_in_hardirq(void)
+  {
+      return in_irq();
+  }
+#endif
+
 typedef unsigned long (*cam_common_mini_dump_cb) (void *dst,
 	unsigned long len, void *priv_data);