]> git.itanic.dy.fi Git - linux-stable/commitdiff
irqchip/loongson-pch-pic: Fix pch_pic_acpi_init calling
authorJianmin Lv <lvjianmin@loongson.cn>
Fri, 7 Apr 2023 08:34:53 +0000 (16:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:53:48 +0000 (11:53 +0200)
commit 48ce2d722f7f108f27bedddf54bee3423a57ce57 upstream.

For dual-bridges scenario, pch_pic_acpi_init() will be called
in following path:

cpuintc_acpi_init
  acpi_cascade_irqdomain_init(in cpuintc driver)
    acpi_table_parse_madt
      eiointc_parse_madt
        eiointc_acpi_init /* this will be called two times
                             correspondingto parsing two
                             eiointc entries in MADT under
                             dual-bridges scenario*/
          acpi_cascade_irqdomain_init(in eiointc driver)
            acpi_table_parse_madt
              pch_pic_parse_madt
                pch_pic_acpi_init /* this will be called depend
                                     on valid parent IRQ domain
                                     handle for one or two times
                                     corresponding to parsing
                                     two pchpic entries in MADT
                                     druring calling
                                     eiointc_acpi_init() under
                                     dual-bridges scenario*/

During the first eiointc_acpi_init() calling, the
pch_pic_acpi_init() will be called just one time since only
one valid parent IRQ domain handle will be found for current
eiointc IRQ domain.

During the second eiointc_acpi_init() calling, the
pch_pic_acpi_init() will be called two times since two valid
parent IRQ domain handles will be found. So in pch_pic_acpi_init(),
we must have a reasonable way to prevent from creating second same
pch_pic IRQ domain.

The patch matches gsi base information in created pch_pic IRQ
domains to check if the target domain has been created to avoid the
bug mentioned above.

Cc: stable@vger.kernel.org
Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230407083453.6305-6-lvjianmin@loongson.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/irqchip/irq-loongson-pch-pic.c

index 03493cda65a3799639d70d9164b84db0fc3513d9..9d2250e2775817b5cbf2c8a3dbfacf7b6d556e13 100644 (file)
@@ -350,6 +350,9 @@ int __init pch_pic_acpi_init(struct irq_domain *parent,
        int ret, vec_base;
        struct fwnode_handle *domain_handle;
 
+       if (find_pch_pic(acpi_pchpic->gsi_base) >= 0)
+               return 0;
+
        vec_base = acpi_pchpic->gsi_base - GSI_MIN_PCH_IRQ;
 
        domain_handle = irq_domain_alloc_fwnode(&acpi_pchpic->address);