Commit b0a4ab7c authored by Michael Kelley's avatar Michael Kelley Committed by Marc Zyngier
Browse files

iommu/hyper-v: Use helper instead of directly accessing affinity 



Recent changes to solve inconsistencies in handling IRQ masks #ifdef
out the affinity field in irq_common_data for non-SMP configurations.
The current code in hyperv_irq_remapping_alloc() gets a compiler error
in that case.

Fix this by using the new irq_data_update_affinity() helper, which
handles the non-SMP case correctly.

Signed-off-by: default avatarMichael Kelley <mikelley@microsoft.com>
Reported-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Tested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Fixes: aa081358 ("genirq: Provide an IRQ affinity mask in non-SMP configs")
Link: https://lore.kernel.org/r/1658796820-2261-1-git-send-email-mikelley@microsoft.com
parent 2bd1753e

drivers/iommu/hyperv-iommu.c

+1 −3
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain, 
{

	struct irq_alloc_info *info = arg;

	struct irq_data *irq_data;

	struct irq_desc *desc;

	int ret = 0;



	if (!info || info->type != X86_IRQ_ALLOC_TYPE_IOAPIC || nr_irqs > 1)
@@ -90,8 +89,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain, 
	 * Hypver-V IO APIC irq affinity should be in the scope of

	 * ioapic_max_cpumask because no irq remapping support.

	 */

	desc = irq_data_to_desc(irq_data);

	cpumask_copy(desc->irq_common_data.affinity, &ioapic_max_cpumask);

	irq_data_update_affinity(irq_data, &ioapic_max_cpumask);



	return 0;

}