Skip to content

Commit 64cc451

Browse files
lvjianmin-loongsonMarc Zyngier
authored andcommitted
irqchip/loongson-eiointc: Fix incorrect use of acpi_get_vec_parent
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
1 parent 112eaa8 commit 64cc451

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

drivers/irqchip/irq-loongson-eiointc.c

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,6 @@ static void acpi_set_vec_parent(int node, struct irq_domain *parent, struct acpi
280280
{
281281
int i;
282282

283-
if (cpu_has_flatmode)
284-
node = cpu_to_node(node * CORES_PER_EIO_NODE);
285-
286283
for (i = 0; i < MAX_IO_PICS; i++) {
287284
if (node == vec_group[i].node) {
288285
vec_group[i].parent = parent;
@@ -349,8 +346,16 @@ static int __init pch_pic_parse_madt(union acpi_subtable_headers *header,
349346
static int __init pch_msi_parse_madt(union acpi_subtable_headers *header,
350347
const unsigned long end)
351348
{
349+
struct irq_domain *parent;
352350
struct acpi_madt_msi_pic *pchmsi_entry = (struct acpi_madt_msi_pic *)header;
353-
struct irq_domain *parent = acpi_get_vec_parent(eiointc_priv[nr_pics - 1]->node, msi_group);
351+
int node;
352+
353+
if (cpu_has_flatmode)
354+
node = cpu_to_node(eiointc_priv[nr_pics - 1]->node * CORES_PER_EIO_NODE);
355+
else
356+
node = eiointc_priv[nr_pics - 1]->node;
357+
358+
parent = acpi_get_vec_parent(node, msi_group);
354359

355360
if (parent)
356361
return pch_msi_acpi_init(parent, pchmsi_entry);
@@ -379,6 +384,7 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
379384
int i, ret, parent_irq;
380385
unsigned long node_map;
381386
struct eiointc_priv *priv;
387+
int node;
382388

383389
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
384390
if (!priv)
@@ -421,8 +427,12 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
421427
"irqchip/loongarch/intc:starting",
422428
eiointc_router_init, NULL);
423429

424-
acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, pch_group);
425-
acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, msi_group);
430+
if (cpu_has_flatmode)
431+
node = cpu_to_node(acpi_eiointc->node * CORES_PER_EIO_NODE);
432+
else
433+
node = acpi_eiointc->node;
434+
acpi_set_vec_parent(node, priv->eiointc_domain, pch_group);
435+
acpi_set_vec_parent(node, priv->eiointc_domain, msi_group);
426436
ret = acpi_cascade_irqdomain_init();
427437

428438
return ret;

0 commit comments

Comments
 (0)