irqchip/loongson-eiointc: Fix incorrect use of acpi_get_vec_parent

[ Upstream commit 64cc451e45e146b2140211b4f45f278b93b24ac0 ]

In eiointc_acpi_init(), a *eiointc* node is passed into
acpi_get_vec_parent() instead of a required *NUMA* node (on some chip
like 3C5000L, a *NUMA* node means a *eiointc* node, but on some chip
like 3C5000, a *NUMA* node contains 4 *eiointc* nodes), and node in
struct acpi_vector_group is essentially a *NUMA* node, which will
lead to no parent matched for passed *eiointc* node. so the patch
adjusts code to use *NUMA* node for parameter node of
acpi_set_vec_parent/acpi_get_vec_parent.

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-3-lvjianmin@loongson.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c
index 7e601a5f7d9f8de79ed85612347f4fc5a4e3291f..768ed36f5f66354e2c62c1d7c7055613a1619cab 100644 (file)
--- a/drivers/irqchip/irq-loongson-eiointc.c
+++ b/drivers/irqchip/irq-loongson-eiointc.c
@@ -279,9 +279,6 @@ static void acpi_set_vec_parent(int node, struct irq_domain *parent, struct acpi
 {
        int i;
 
-       if (cpu_has_flatmode)
-               node = cpu_to_node(node * CORES_PER_EIO_NODE);
-
        for (i = 0; i < MAX_IO_PICS; i++) {
                if (node == vec_group[i].node) {
                        vec_group[i].parent = parent;
@@ -317,8 +314,16 @@ static int __init pch_pic_parse_madt(union acpi_subtable_headers *header,
 static int __init pch_msi_parse_madt(union acpi_subtable_headers *header,
                                        const unsigned long end)
 {
+       struct irq_domain *parent;
        struct acpi_madt_msi_pic *pchmsi_entry = (struct acpi_madt_msi_pic *)header;
-       struct irq_domain *parent = acpi_get_vec_parent(eiointc_priv[nr_pics - 1]->node, msi_group);
+       int node;
+
+       if (cpu_has_flatmode)
+               node = cpu_to_node(eiointc_priv[nr_pics - 1]->node * CORES_PER_EIO_NODE);
+       else
+               node = eiointc_priv[nr_pics - 1]->node;
+
+       parent = acpi_get_vec_parent(node, msi_group);
 
        if (parent)
                return pch_msi_acpi_init(parent, pchmsi_entry);
@@ -347,6 +352,7 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
        int i, ret, parent_irq;
        unsigned long node_map;
        struct eiointc_priv *priv;
+       int node;
 
        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv)
@@ -388,8 +394,12 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
                                  "irqchip/loongarch/intc:starting",
                                  eiointc_router_init, NULL);
 
-       acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, pch_group);
-       acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, msi_group);
+       if (cpu_has_flatmode)
+               node = cpu_to_node(acpi_eiointc->node * CORES_PER_EIO_NODE);
+       else
+               node = acpi_eiointc->node;
+       acpi_set_vec_parent(node, priv->eiointc_domain, pch_group);
+       acpi_set_vec_parent(node, priv->eiointc_domain, msi_group);
        ret = acpi_cascade_irqdomain_init();
 
        return ret;