Commit eb7eacaa authored by Mark Tomlinson's avatar Mark Tomlinson Committed by Lorenzo Pieralisi

PCI: iproc: Set affinity mask on MSI interrupts

The core interrupt code expects the irq_set_affinity call to update the
effective affinity for the interrupt. This was not being done, so update
iproc_msi_irq_set_affinity() to do so.

Link: https://lore.kernel.org/r/20200803035241.7737-1-mark.tomlinson@alliedtelesis.co.nz
Fixes: 3bc2b234 ("PCI: iproc: Add iProc PCIe MSI support")
Signed-off-by: default avatarMark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarRay Jui <ray.jui@broadcom.com>
parent 9123e3a7
...@@ -209,15 +209,20 @@ static int iproc_msi_irq_set_affinity(struct irq_data *data, ...@@ -209,15 +209,20 @@ static int iproc_msi_irq_set_affinity(struct irq_data *data,
struct iproc_msi *msi = irq_data_get_irq_chip_data(data); struct iproc_msi *msi = irq_data_get_irq_chip_data(data);
int target_cpu = cpumask_first(mask); int target_cpu = cpumask_first(mask);
int curr_cpu; int curr_cpu;
int ret;
curr_cpu = hwirq_to_cpu(msi, data->hwirq); curr_cpu = hwirq_to_cpu(msi, data->hwirq);
if (curr_cpu == target_cpu) if (curr_cpu == target_cpu)
return IRQ_SET_MASK_OK_DONE; ret = IRQ_SET_MASK_OK_DONE;
else {
/* steer MSI to the target CPU */
data->hwirq = hwirq_to_canonical_hwirq(msi, data->hwirq) + target_cpu;
ret = IRQ_SET_MASK_OK;
}
/* steer MSI to the target CPU */ irq_data_update_effective_affinity(data, cpumask_of(target_cpu));
data->hwirq = hwirq_to_canonical_hwirq(msi, data->hwirq) + target_cpu;
return IRQ_SET_MASK_OK; return ret;
} }
static void iproc_msi_irq_compose_msi_msg(struct irq_data *data, static void iproc_msi_irq_compose_msi_msg(struct irq_data *data,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment