Skip to content

Commit eaf290c

Browse files
rrendecKAGA-KOKO
authored andcommitted
PCI: dwc: Enable MSI affinity support
Leverage the interrupt redirection infrastructure to enable CPU affinity support for MSI interrupts. Since the parent interrupt affinity cannot be changed, affinity control for the child interrupt (MSI) is achieved by redirecting the handler to run in IRQ work context on the target CPU. This patch was originally prepared by Thomas Gleixner (see Link tag below) in a patch series that was never submitted as is, and only parts of that series have made it upstream so far. Originally-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Radu Rendec <rrendec@redhat.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/linux-pci/878qpg4o4t.ffs@tglx/ Link: https://patch.msgid.link/20251128212055.1409093-4-rrendec@redhat.com
1 parent f187509 commit eaf290c

1 file changed

Lines changed: 28 additions & 5 deletions

File tree

drivers/pci/controller/dwc/pcie-designware-host.c

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,27 @@ static struct pci_ops dw_pcie_ops;
2626
static struct pci_ops dw_pcie_ecam_ops;
2727
static struct pci_ops dw_child_pcie_ops;
2828

29+
#ifdef CONFIG_SMP
30+
static void dw_irq_noop(struct irq_data *d) { }
31+
#endif
32+
33+
static bool dw_pcie_init_dev_msi_info(struct device *dev, struct irq_domain *domain,
34+
struct irq_domain *real_parent, struct msi_domain_info *info)
35+
{
36+
if (!msi_lib_init_dev_msi_info(dev, domain, real_parent, info))
37+
return false;
38+
39+
#ifdef CONFIG_SMP
40+
info->chip->irq_ack = dw_irq_noop;
41+
info->chip->irq_pre_redirect = irq_chip_pre_redirect_parent;
42+
#else
43+
info->chip->irq_ack = irq_chip_ack_parent;
44+
#endif
45+
return true;
46+
}
47+
2948
#define DW_PCIE_MSI_FLAGS_REQUIRED (MSI_FLAG_USE_DEF_DOM_OPS | \
3049
MSI_FLAG_USE_DEF_CHIP_OPS | \
31-
MSI_FLAG_NO_AFFINITY | \
3250
MSI_FLAG_PCI_MSI_MASK_PARENT)
3351
#define DW_PCIE_MSI_FLAGS_SUPPORTED (MSI_FLAG_MULTI_PCI_MSI | \
3452
MSI_FLAG_PCI_MSIX | \
@@ -40,9 +58,8 @@ static const struct msi_parent_ops dw_pcie_msi_parent_ops = {
4058
.required_flags = DW_PCIE_MSI_FLAGS_REQUIRED,
4159
.supported_flags = DW_PCIE_MSI_FLAGS_SUPPORTED,
4260
.bus_select_token = DOMAIN_BUS_PCI_MSI,
43-
.chip_flags = MSI_CHIP_FLAG_SET_ACK,
4461
.prefix = "DW-",
45-
.init_dev_msi_info = msi_lib_init_dev_msi_info,
62+
.init_dev_msi_info = dw_pcie_init_dev_msi_info,
4663
};
4764

4865
/* MSI int handler */
@@ -63,7 +80,7 @@ void dw_handle_msi_irq(struct dw_pcie_rp *pp)
6380
continue;
6481

6582
for_each_set_bit(pos, &status, MAX_MSI_IRQS_PER_CTRL)
66-
generic_handle_domain_irq(pp->irq_domain, irq_off + pos);
83+
generic_handle_demux_domain_irq(pp->irq_domain, irq_off + pos);
6784
}
6885
}
6986

@@ -140,10 +157,16 @@ static void dw_pci_bottom_ack(struct irq_data *d)
140157

141158
static struct irq_chip dw_pci_msi_bottom_irq_chip = {
142159
.name = "DWPCI-MSI",
143-
.irq_ack = dw_pci_bottom_ack,
144160
.irq_compose_msi_msg = dw_pci_setup_msi_msg,
145161
.irq_mask = dw_pci_bottom_mask,
146162
.irq_unmask = dw_pci_bottom_unmask,
163+
#ifdef CONFIG_SMP
164+
.irq_ack = dw_irq_noop,
165+
.irq_pre_redirect = dw_pci_bottom_ack,
166+
.irq_set_affinity = irq_chip_redirect_set_affinity,
167+
#else
168+
.irq_ack = dw_pci_bottom_ack,
169+
#endif
147170
};
148171

149172
static int dw_pcie_irq_domain_alloc(struct irq_domain *domain, unsigned int virq,

0 commit comments

Comments
 (0)