1 files changed, 20 insertions, 3 deletions

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 6066d945c40e..5d30c5e42bb1 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -661,11 +661,28 @@ void irq_complete_move(struct irq_cfg *cfg)
  */
 void irq_force_complete_move(struct irq_desc *desc)
 {
-        struct irq_data *irqdata = irq_desc_get_irq_data(desc);
-        struct apic_chip_data *data = apic_chip_data(irqdata);
-        struct irq_cfg *cfg = data ? &data->cfg : NULL;
+        struct irq_data *irqdata;
+        struct apic_chip_data *data;
+        struct irq_cfg *cfg;
         unsigned int cpu;
 
+        /*
+         * The function is called for all descriptors regardless of which
+         * irqdomain they belong to. For example if an IRQ is provided by
+         * an irq_chip as part of a GPIO driver, the chip data for that
+         * descriptor is specific to the irq_chip in question.
+         *
+         * Check first that the chip_data is what we expect
+         * (apic_chip_data) before touching it any further.
+         */
+        irqdata = irq_domain_get_irq_data(x86_vector_domain,
+                                          irq_desc_get_irq(desc));
+        if (!irqdata)
+                return;
+
+        data = apic_chip_data(irqdata);
+        cfg = data ? &data->cfg : NULL;
+
         if (!cfg)
                 return;