Commit-ID: 893fbfff976cd069f2e60c3b186dbe3f85504db2 Gitweb: https://git.kernel.org/tip/893fbfff976cd069f2e60c3b186dbe3f85504db2 Author: Marc Zyngier <marc.zyng...@arm.com> AuthorDate: Fri, 22 Jun 2018 10:52:49 +0100 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Fri, 22 Jun 2018 14:22:00 +0200
irqchip/ls-scfg-msi: Fix MSI affinity handling The ls-scfs-msi driver is not dealing with the effective affinity as it should. Let's fix that, and make it clear that the effective affinity is restricted to a single CPU. Also prevent the driver from messing with the internals of the affinity setting infrastructure. Reported-by: Alexandre Belloni <alexandre.bell...@bootlin.com> Signed-off-by: Marc Zyngier <marc.zyng...@arm.com> Signed-off-by: Thomas Gleixner <t...@linutronix.de> Tested-by: Alexandre Belloni <alexandre.bell...@bootlin.com> Cc: Jason Cooper <ja...@lakedaemon.net> Cc: Yang Yingliang <yangyingli...@huawei.com> Cc: Sumit Garg <sumit.g...@linaro.org> Link: https://lkml.kernel.org/r/20180622095254.5906-3-marc.zyng...@arm.com --- drivers/irqchip/irq-ls-scfg-msi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/irq-ls-scfg-msi.c b/drivers/irqchip/irq-ls-scfg-msi.c index 1ec3bfe56693..c671b3212010 100644 --- a/drivers/irqchip/irq-ls-scfg-msi.c +++ b/drivers/irqchip/irq-ls-scfg-msi.c @@ -93,8 +93,12 @@ static void ls_scfg_msi_compose_msg(struct irq_data *data, struct msi_msg *msg) msg->address_lo = lower_32_bits(msi_data->msiir_addr); msg->data = data->hwirq; - if (msi_affinity_flag) - msg->data |= cpumask_first(data->common->affinity); + if (msi_affinity_flag) { + const struct cpumask *mask; + + mask = irq_data_get_effective_affinity_mask(data); + msg->data |= cpumask_first(mask); + } iommu_dma_map_msi_msg(data->irq, msg); } @@ -121,7 +125,7 @@ static int ls_scfg_msi_set_affinity(struct irq_data *irq_data, return -EINVAL; } - cpumask_copy(irq_data->common->affinity, mask); + irq_data_update_effective_affinity(irq_data, cpumask_of(cpu)); return IRQ_SET_MASK_OK; }
