Merge "msm: camera: isp: use a spin_lock instead of a rwlock" into dev/msm-4.9-camx (8356e26a) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_isp/isp_hw_mgr/hw_utils/irq_controller/cam_irq_controller.c

+17 −17

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ struct cam_irq_register_obj {
		* @th_list_head: List of handlers sorted by priority
		* @hdl_idx: Unique identity of handler assigned on Subscribe.
		* Used to Unsubscribe.
		* @rw_lock: Read-Write Lock for use by controller
		* @lock: Lock for use by controller
		*/
		struct cam_irq_controller {
		const char *name;
		@@ -101,7 +101,7 @@ struct cam_irq_controller {
		struct list_head evt_handler_list_head;
		struct list_head th_list_head[CAM_IRQ_PRIORITY_MAX];
		uint32_t hdl_idx;
		rwlock_t rw_lock;
		spinlock_t lock;
		struct cam_irq_th_payload th_payload;
		};

		@@ -208,7 +208,7 @@ int cam_irq_controller_init(const char *name,
		for (i = 0; i < CAM_IRQ_PRIORITY_MAX; i++)
		INIT_LIST_HEAD(&controller->th_list_head[i]);

		rwlock_init(&controller->rw_lock);
		spin_lock_init(&controller->lock);

		controller->hdl_idx = 1;
		*irq_controller = controller;
		@@ -304,7 +304,7 @@ int cam_irq_controller_subscribe_irq(void *irq_controller,

		need_lock = !in_irq();
		if (need_lock)
		write_lock_irqsave(&controller->rw_lock, flags);
		spin_lock_irqsave(&controller->lock, flags);
		for (i = 0; i < controller->num_registers; i++) {
		controller->irq_register_arr[i].top_half_enable_mask[priority]
		\|= evt_bit_mask_arr[i];
		@@ -317,7 +317,7 @@ int cam_irq_controller_subscribe_irq(void *irq_controller,
		controller->irq_register_arr[i].mask_reg_offset);
		}
		if (need_lock)
		write_unlock_irqrestore(&controller->rw_lock, flags);
		spin_unlock_irqrestore(&controller->lock, flags);

		list_add_tail(&evt_handler->list_node,
		&controller->evt_handler_list_head);
		@@ -363,7 +363,7 @@ int cam_irq_controller_enable_irq(void *irq_controller, uint32_t handle)

		need_lock = !in_irq();
		if (need_lock)
		write_lock_irqsave(&controller->rw_lock, flags);
		spin_lock_irqsave(&controller->lock, flags);
		for (i = 0; i < controller->num_registers; i++) {
		controller->irq_register_arr[i].
		top_half_enable_mask[evt_handler->priority] \|=
		@@ -378,7 +378,7 @@ int cam_irq_controller_enable_irq(void *irq_controller, uint32_t handle)
		controller->irq_register_arr[i].mask_reg_offset);
		}
		if (need_lock)
		write_unlock_irqrestore(&controller->rw_lock, flags);
		spin_unlock_irqrestore(&controller->lock, flags);

		return rc;
		}
		@@ -413,7 +413,7 @@ int cam_irq_controller_disable_irq(void *irq_controller, uint32_t handle)

		need_lock = !in_irq();
		if (need_lock)
		write_lock_irqsave(&controller->rw_lock, flags);
		spin_lock_irqsave(&controller->lock, flags);
		for (i = 0; i < controller->num_registers; i++) {
		controller->irq_register_arr[i].
		top_half_enable_mask[evt_handler->priority] &=
		@@ -441,7 +441,7 @@ int cam_irq_controller_disable_irq(void *irq_controller, uint32_t handle)
		controller->global_clear_offset);
		}
		if (need_lock)
		write_unlock_irqrestore(&controller->rw_lock, flags);
		spin_unlock_irqrestore(&controller->lock, flags);

		return rc;
		}
		@@ -475,7 +475,7 @@ int cam_irq_controller_unsubscribe_irq(void *irq_controller,

		if (found) {
		if (need_lock)
		write_lock_irqsave(&controller->rw_lock, flags);
		spin_lock_irqsave(&controller->lock, flags);
		for (i = 0; i < controller->num_registers; i++) {
		controller->irq_register_arr[i].
		top_half_enable_mask[evt_handler->priority] &=
		@@ -502,7 +502,7 @@ int cam_irq_controller_unsubscribe_irq(void *irq_controller,
		controller->global_clear_offset);
		}
		if (need_lock)
		write_unlock_irqrestore(&controller->rw_lock, flags);
		spin_unlock_irqrestore(&controller->lock, flags);

		kfree(evt_handler->evt_bit_mask_arr);
		kfree(evt_handler);
		@@ -607,9 +607,9 @@ irqreturn_t cam_irq_controller_handle_irq(int irq_num, void *priv)
		if (!controller)
		return IRQ_NONE;

		CAM_DBG(CAM_ISP, "locking controller %pK name %s rw_lock %pK",
		controller, controller->name, &controller->rw_lock);
		read_lock(&controller->rw_lock);
		CAM_DBG(CAM_ISP, "locking controller %pK name %s lock %pK",
		controller, controller->name, &controller->lock);
		spin_lock(&controller->lock);
		for (i = 0; i < controller->num_registers; i++) {
		controller->irq_status_arr[i] = cam_io_r_mb(
		controller->mem_base +
		@@ -630,8 +630,8 @@ irqreturn_t cam_irq_controller_handle_irq(int irq_num, void *priv)
		i, j, need_th_processing[j]);
		}
		}
		CAM_DBG(CAM_ISP, "unlocked controller %pK name %s rw_lock %pK",
		controller, controller->name, &controller->rw_lock);
		CAM_DBG(CAM_ISP, "unlocked controller %pK name %s lock %pK",
		controller, controller->name, &controller->lock);

		CAM_DBG(CAM_ISP, "Status Registers read Successful");

		@@ -648,7 +648,7 @@ irqreturn_t cam_irq_controller_handle_irq(int irq_num, void *priv)
		&controller->th_list_head[i]);
		}
		}
		read_unlock(&controller->rw_lock);
		spin_unlock(&controller->lock);

		return IRQ_HANDLED;
		}