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

Commit 893fbfff authored by Marc Zyngier's avatar Marc Zyngier Committed by Thomas Gleixner
Browse files

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: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Yang Yingliang <yangyingliang@huawei.com>
Cc: Sumit Garg <sumit.garg@linaro.org>
Link: https://lkml.kernel.org/r/20180622095254.5906-3-marc.zyngier@arm.com
parent 72a8edc2

drivers/irqchip/irq-ls-scfg-msi.c

+7 −3
Original line number Diff line number Diff line
@@ -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;

}