diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-26 08:07:17 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-26 08:07:17 +0900 |
| commit | 9ff3b40e411c00870d1c29cd6b843fca7c4160ae (patch) | |
| tree | 4d58943bf8907f5704ba004fd5383c0d7683c61f /drivers/irqchip/irq-ls-scfg-msi.c | |
| parent | 823819507095135b475a99048f0b0b6e75580fbc (diff) | |
| parent | 6f0d349d922ba44e4348a17a78ea51b7135965b1 (diff) | |
| download | talos-op-linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.tar.gz talos-op-linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/irqchip/irq-ls-scfg-msi.c')
| -rw-r--r-- | drivers/irqchip/irq-ls-scfg-msi.c | 10 |
1 files 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; } |
