@@ -101,8 +101,6 @@ static void platform_msi_update_chip_ops(struct msi_domain_info *info)
chip->irq_mask = irq_chip_mask_parent;
if (!chip->irq_unmask)
chip->irq_unmask = irq_chip_unmask_parent;
- if (!chip->irq_eoi)
- chip->irq_eoi = irq_chip_eoi_parent;
if (!chip->irq_set_affinity)
chip->irq_set_affinity = msi_domain_set_affinity;
if (!chip->irq_write_msi_msg)
@@ -274,6 +274,8 @@ static void msi_domain_update_chip_ops(struct msi_domain_info *info)
BUG_ON(!chip || !chip->irq_mask || !chip->irq_unmask);
if (!chip->irq_set_affinity)
chip->irq_set_affinity = msi_domain_set_affinity;
+ if (!chip->irq_eoi)
+ chip->irq_eoi = irq_chip_eoi_parent;
}
/**
Currently only platform-MSI irqchips get a default .irq_eoi() when MSI_FLAG_USE_DEF_CHIP_OPS is set. There's no reason PCI-MSI irqchips couldn't benefit from this too, so let all MSI irqchips benefit from this default. Signed-off-by: Valentin Schneider <valentin.schneider@arm.com> --- drivers/base/platform-msi.c | 2 -- kernel/irq/msi.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)