mfd: Implement bus_lock/bus_sync_unlock twl4030-irq methods (91e3569f) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/mfd/twl4030-irq.c

+21 −16

Original line number	Original line	Diff line number	Diff line
	@@ -460,8 +460,6 @@ static inline void activate_irq(int irq)

	/----------------------------------------------------------------------/		/----------------------------------------------------------------------/

	static DEFINE_SPINLOCK(sih_agent_lock);

	static struct workqueue_struct *wq;		static struct workqueue_struct *wq;

	struct sih_agent {		struct sih_agent {
	@@ -474,6 +472,8 @@ struct sih_agent {

	u32 edge_change;		u32 edge_change;
	struct work_struct edge_work;		struct work_struct edge_work;

			struct mutex irq_lock;
	};		};

	static void twl4030_sih_do_mask(struct work_struct *work)		static void twl4030_sih_do_mask(struct work_struct *work)
	@@ -489,7 +489,6 @@ static void twl4030_sih_do_mask(struct work_struct *work)
	agent = container_of(work, struct sih_agent, mask_work);		agent = container_of(work, struct sih_agent, mask_work);

	/* see what work we have */		/* see what work we have */
	spin_lock_irq(&sih_agent_lock);
	if (agent->imr_change_pending) {		if (agent->imr_change_pending) {
	sih = agent->sih;		sih = agent->sih;
	/* byte[0] gets overwritten as we write ... */		/* byte[0] gets overwritten as we write ... */
	@@ -497,7 +496,6 @@ static void twl4030_sih_do_mask(struct work_struct *work)
	agent->imr_change_pending = false;		agent->imr_change_pending = false;
	} else		} else
	sih = NULL;		sih = NULL;
	spin_unlock_irq(&sih_agent_lock);
	if (!sih)		if (!sih)
	return;		return;

	@@ -520,11 +518,9 @@ static void twl4030_sih_do_edge(struct work_struct *work)
	agent = container_of(work, struct sih_agent, edge_work);		agent = container_of(work, struct sih_agent, edge_work);

	/* see what work we have */		/* see what work we have */
	spin_lock_irq(&sih_agent_lock);
	edge_change = agent->edge_change;		edge_change = agent->edge_change;
	agent->edge_change = 0;		agent->edge_change = 0;
	sih = edge_change ? agent->sih : NULL;		sih = edge_change ? agent->sih : NULL;
	spin_unlock_irq(&sih_agent_lock);
	if (!sih)		if (!sih)
	return;		return;

	@@ -580,49 +576,57 @@ static void twl4030_sih_do_edge(struct work_struct *work)
	static void twl4030_sih_mask(struct irq_data *data)		static void twl4030_sih_mask(struct irq_data *data)
	{		{
	struct sih_agent *sih = irq_data_get_irq_chip_data(data);		struct sih_agent *sih = irq_data_get_irq_chip_data(data);
	unsigned long flags;

	spin_lock_irqsave(&sih_agent_lock, flags);
	sih->imr \|= BIT(data->irq - sih->irq_base);		sih->imr \|= BIT(data->irq - sih->irq_base);
	sih->imr_change_pending = true;		sih->imr_change_pending = true;
	queue_work(wq, &sih->mask_work);		queue_work(wq, &sih->mask_work);
	spin_unlock_irqrestore(&sih_agent_lock, flags);
	}		}

	static void twl4030_sih_unmask(struct irq_data *data)		static void twl4030_sih_unmask(struct irq_data *data)
	{		{
	struct sih_agent *sih = irq_data_get_irq_chip_data(data);		struct sih_agent *sih = irq_data_get_irq_chip_data(data);
	unsigned long flags;

	spin_lock_irqsave(&sih_agent_lock, flags);
	sih->imr &= ~BIT(data->irq - sih->irq_base);		sih->imr &= ~BIT(data->irq - sih->irq_base);
	sih->imr_change_pending = true;		sih->imr_change_pending = true;
	queue_work(wq, &sih->mask_work);		queue_work(wq, &sih->mask_work);
	spin_unlock_irqrestore(&sih_agent_lock, flags);
	}		}

	static int twl4030_sih_set_type(struct irq_data *data, unsigned trigger)		static int twl4030_sih_set_type(struct irq_data *data, unsigned trigger)
	{		{
	struct sih_agent *sih = irq_data_get_irq_chip_data(data);		struct sih_agent *sih = irq_data_get_irq_chip_data(data);
	unsigned long flags;

	if (trigger & ~(IRQ_TYPE_EDGE_FALLING \| IRQ_TYPE_EDGE_RISING))		if (trigger & ~(IRQ_TYPE_EDGE_FALLING \| IRQ_TYPE_EDGE_RISING))
	return -EINVAL;		return -EINVAL;

	spin_lock_irqsave(&sih_agent_lock, flags);
	if (irqd_get_trigger_type(data) != trigger) {		if (irqd_get_trigger_type(data) != trigger) {
	sih->edge_change \|= BIT(data->irq - sih->irq_base);		sih->edge_change \|= BIT(data->irq - sih->irq_base);
	queue_work(wq, &sih->edge_work);		queue_work(wq, &sih->edge_work);
	}		}
	spin_unlock_irqrestore(&sih_agent_lock, flags);
	return 0;		return 0;
	}		}

			static void twl4030_sih_bus_lock(struct irq_data *data)
			{
			struct sih_agent *sih = irq_data_get_irq_chip_data(data);

			mutex_lock(&sih->irq_lock);
			}

			static void twl4030_sih_bus_sync_unlock(struct irq_data *data)
			{
			struct sih_agent *sih = irq_data_get_irq_chip_data(data);

			mutex_unlock(&sih->irq_lock);
			}

	static struct irq_chip twl4030_sih_irq_chip = {		static struct irq_chip twl4030_sih_irq_chip = {
	.name = "twl4030",		.name = "twl4030",
	.irq_mask = twl4030_sih_mask,		.irq_mask = twl4030_sih_mask,
	.irq_unmask = twl4030_sih_unmask,		.irq_unmask = twl4030_sih_unmask,
	.irq_set_type = twl4030_sih_set_type,		.irq_set_type = twl4030_sih_set_type,
			.irq_bus_lock = twl4030_sih_bus_lock,
			.irq_bus_sync_unlock = twl4030_sih_bus_sync_unlock,
	};		};

	/----------------------------------------------------------------------/		/----------------------------------------------------------------------/
	@@ -718,15 +722,16 @@ int twl4030_sih_setup(int module)
	agent->irq_base = irq_base;		agent->irq_base = irq_base;
	agent->sih = sih;		agent->sih = sih;
	agent->imr = ~0;		agent->imr = ~0;
			mutex_init(&agent->irq_lock);
	INIT_WORK(&agent->mask_work, twl4030_sih_do_mask);		INIT_WORK(&agent->mask_work, twl4030_sih_do_mask);
	INIT_WORK(&agent->edge_work, twl4030_sih_do_edge);		INIT_WORK(&agent->edge_work, twl4030_sih_do_edge);

	for (i = 0; i < sih->bits; i++) {		for (i = 0; i < sih->bits; i++) {
	irq = irq_base + i;		irq = irq_base + i;

			irq_set_chip_data(irq, agent);
	irq_set_chip_and_handler(irq, &twl4030_sih_irq_chip,		irq_set_chip_and_handler(irq, &twl4030_sih_irq_chip,
	handle_edge_irq);		handle_edge_irq);
	irq_set_chip_data(irq, agent);
	activate_irq(irq);		activate_irq(irq);
	}		}