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

Commit 0407dace authored by Marc Zyngier's avatar Marc Zyngier Committed by Jason Cooper
Browse files

irqchip/gic: Return IRQ_SET_MASK_OK_DONE in the set_affinity method 



Moving an SPI around doesn't require any extra work from the rest
of the stack, and specially not for MSI-generated SPIs.

It is then worth returning IRQ_SET_MASK_OK_DONE instead of
IRQ_SET_MASK_OK, and simplify the other irqchips that rely on
this behaviour (GICv2m and Marvell's ODMI controller).

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1455894029-17270-1-git-send-email-marc.zyngier@arm.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent c27f29bb

drivers/irqchip/irq-gic-v2m.c

+1 −13
Original line number Diff line number Diff line
@@ -92,18 +92,6 @@ static struct msi_domain_info gicv2m_msi_domain_info = { 
	.chip	= &gicv2m_msi_irq_chip,

};



static int gicv2m_set_affinity(struct irq_data *irq_data,

			       const struct cpumask *mask, bool force)

{

	int ret;



	ret = irq_chip_set_affinity_parent(irq_data, mask, force);

	if (ret == IRQ_SET_MASK_OK)

		ret = IRQ_SET_MASK_OK_DONE;



	return ret;

}



static void gicv2m_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)

{

	struct v2m_data *v2m = irq_data_get_irq_chip_data(data);
@@ -122,7 +110,7 @@ static struct irq_chip gicv2m_irq_chip = { 
	.irq_mask		= irq_chip_mask_parent,

	.irq_unmask		= irq_chip_unmask_parent,

	.irq_eoi		= irq_chip_eoi_parent,

	.irq_set_affinity	= gicv2m_set_affinity,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.irq_compose_msi_msg	= gicv2m_compose_msi_msg,

};

drivers/irqchip/irq-gic.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, 
	writel_relaxed(val | bit, reg);

	raw_spin_unlock_irqrestore(&irq_controller_lock, flags);



	return IRQ_SET_MASK_OK;

	return IRQ_SET_MASK_OK_DONE;

}

#endif

drivers/irqchip/irq-mvebu-odmi.c

+1 −13
Original line number Diff line number Diff line
@@ -47,18 +47,6 @@ static unsigned int odmis_count; 
/* Protects odmis_bm */

static DEFINE_SPINLOCK(odmis_bm_lock);



static int odmi_set_affinity(struct irq_data *d,

			     const struct cpumask *mask, bool force)

{

	int ret;



	ret = irq_chip_set_affinity_parent(d, mask, force);

	if (ret == IRQ_SET_MASK_OK)

		ret = IRQ_SET_MASK_OK_DONE;



	return ret;

}



static void odmi_compose_msi_msg(struct irq_data *d, struct msi_msg *msg)

{

	struct odmi_data *odmi;
@@ -83,7 +71,7 @@ static struct irq_chip odmi_irq_chip = { 
	.irq_mask		= irq_chip_mask_parent,

	.irq_unmask		= irq_chip_unmask_parent,

	.irq_eoi		= irq_chip_eoi_parent,

	.irq_set_affinity	= odmi_set_affinity,

	.irq_set_affinity	= irq_chip_set_affinity_parent,

	.irq_compose_msi_msg	= odmi_compose_msi_msg,

};