Merge branch 'pci/controller/xgene'

- Teach handle_simple_irq() to resend an in-progress interrupt (Marc
  Zyngier)

- Defer probing if the MSI widget driver hasn't probed yet (Marc Zyngier)

- Drop useless conditional compilation, since pci-xgene.c is only compiled
  when CONFIG_PCI_XGENE is selected (Marc Zyngier)

- Drop useless XGENE_PCIE_IP_VER_UNKN IP version (Marc Zyngier)

- Simplify and make per-CPU interrupt setup robust (Marc Zyngier)

- Drop superfluous struct xgene_msi fields (Marc Zyngier)

- Use device-managed memory allocations (Marc Zyngier)

- Drop intermediate xgene_msi_group tracking structure (Marc Zyngier)

- Rewrite pci-xgene-msi.c to fix MSI CPU affinity and clean things up (Marc
  Zyngier)

- Resend an MSI racing with itself on a different CPU (Marc Zyngier)

- Probe xgene-msi as a standard platform driver rather than a
  subsys_initcall (Marc Zyngier)

- Simplify MSI handler setup/teardown by dropping useless CPU hotplug bits
  (Marc Zyngier)

- Remove unused cpuhp_state CPUHP_PCI_XGENE_DEAD (Marc Zyngier)

* pci/controller/xgene:
  cpu/hotplug: Remove unused cpuhp_state CPUHP_PCI_XGENE_DEAD
  PCI: xgene-msi: Restructure handler setup/teardown
  PCI: xgene-msi: Probe as a standard platform driver
  PCI: xgene-msi: Resend an MSI racing with itself on a different CPU
  PCI: xgene-msi: Sanitise MSI allocation and affinity setting
  PCI: xgene-msi: Get rid of intermediate tracking structure
  PCI: xgene-msi: Use device-managed memory allocations
  PCI: xgene-msi: Drop superfluous fields from xgene_msi structure
  PCI: xgene-msi: Make per-CPU interrupt setup robust
  PCI: xgene: Drop XGENE_PCIE_IP_VER_UNKN
  PCI: xgene: Drop useless conditional compilation
  PCI: xgene: Defer probing if the MSI widget driver hasn't probed yet
  genirq: Teach handle_simple_irq() to resend an in-progress interrupt

1 files changed, 7 insertions, 1 deletions

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index b0e0a7332993..e3948e31e654 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -551,7 +551,13 @@ void handle_simple_irq(struct irq_desc *desc)
 {
 	guard(raw_spinlock)(&desc->lock);
 
-	if (!irq_can_handle(desc))
+	if (!irq_can_handle_pm(desc)) {
+		if (irqd_needs_resend_when_in_progress(&desc->irq_data))
+			desc->istate |= IRQS_PENDING;
+		return;
+	}
+
+	if (!irq_can_handle_actions(desc))
 		return;
 
 	kstat_incr_irqs_this_cpu(desc);