Skip to content

Commit e1d6ab4

Browse files
lvjianmin-loongsonyetist
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. Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
1 parent 8d696b0 commit e1d6ab4

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

drivers/irqchip/irq-loongson-eiointc.c

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

306-
if (cpu_has_flatmode)
307-
node = cpu_to_node(node * CORES_PER_EIO_NODE);
308-
309306
for (i = 0; i < MAX_IO_PICS; i++) {
310307
if (node == vec_group[i].node) {
311308
vec_group[i].parent = parent;
@@ -372,8 +369,16 @@ static int __init pch_pic_parse_madt(union acpi_subtable_headers *header,
372369
static int __init pch_msi_parse_madt(union acpi_subtable_headers *header,
373370
const unsigned long end)
374371
{
372+
struct irq_domain *parent;
375373
struct acpi_madt_msi_pic *pchmsi_entry = (struct acpi_madt_msi_pic *)header;
376-
struct irq_domain *parent = acpi_get_vec_parent(eiointc_priv[nr_pics - 1]->node, msi_group);
374+
int node;
375+
376+
if (cpu_has_flatmode)
377+
node = cpu_to_node(eiointc_priv[nr_pics - 1]->node * CORES_PER_EIO_NODE);
378+
else
379+
node = eiointc_priv[nr_pics - 1]->node;
380+
381+
parent = acpi_get_vec_parent(node, msi_group);
377382

378383
if (parent)
379384
return pch_msi_acpi_init(parent, pchmsi_entry);
@@ -402,6 +407,7 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
402407
int i, ret, parent_irq;
403408
unsigned long node_map;
404409
struct eiointc_priv *priv;
410+
int node;
405411

406412
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
407413
if (!priv)
@@ -444,8 +450,12 @@ int __init eiointc_acpi_init(struct irq_domain *parent,
444450
"irqchip/loongarch/intc:starting",
445451
eiointc_router_init, NULL);
446452

447-
acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, pch_group);
448-
acpi_set_vec_parent(acpi_eiointc->node, priv->eiointc_domain, msi_group);
453+
if (cpu_has_flatmode)
454+
node = cpu_to_node(acpi_eiointc->node * CORES_PER_EIO_NODE);
455+
else
456+
node = acpi_eiointc->node;
457+
acpi_set_vec_parent(node, priv->eiointc_domain, pch_group);
458+
acpi_set_vec_parent(node, priv->eiointc_domain, msi_group);
449459
ret = acpi_cascade_irqdomain_init();
450460

451461
return ret;

0 commit comments

Comments
 (0)