Unverified Commit 52dd5f83 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7767 irqchip/loongson-eiointc: fix gsi register error 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hongchen Zhang <zhanghongchen@loongson.cn>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XTTV37ESXDVHUJRQFKPYSOOEA3PCLRQ7/ 
 
https://gitee.com/openeuler/kernel/issues/I9RAP5 
 
Link:https://gitee.com/openeuler/kernel/pulls/7767

 

Reviewed-by: default avatarJuxin Gao <gaojuxin@loongson.cn>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b51533d4 30affb08

arch/loongarch/include/asm/numa.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/nodemask.h>



#define NODE_ADDRSPACE_SHIFT 44

#define NODES_PER_FLATMODE_NODE 4



#define pa_to_nid(addr)		(((addr) & 0xf00000000000) >> NODE_ADDRSPACE_SHIFT)

#define nid_to_addrbase(nid)	(_ULCAST_(nid) << NODE_ADDRSPACE_SHIFT)

drivers/irqchip/irq-loongson-eiointc.c

+2 −2
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ int __init pch_msi_parse_madt(union acpi_subtable_headers *header, 
	int node;



	if (cpu_has_flatmode)

		node = cpu_to_node(eiointc_priv[nr_pics - 1]->node * CORES_PER_EIO_NODE);

		node = eiointc_priv[nr_pics - 1]->node / NODES_PER_FLATMODE_NODE;

	else

		node = eiointc_priv[nr_pics - 1]->node;
@@ -478,7 +478,7 @@ int __init eiointc_acpi_init(struct irq_domain *parent, 
		goto out_free_handle;



	if (cpu_has_flatmode)

		node = cpu_to_node(acpi_eiointc->node * CORES_PER_EIO_NODE);

		node = acpi_eiointc->node / NODES_PER_FLATMODE_NODE;

	else

		node = acpi_eiointc->node;

	acpi_set_vec_parent(node, priv->eiointc_domain, pch_group);