Unverified Commit 6cfbe577 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10742 irqchip/mbigen: Fix mbigen node address layout 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yipeng Zou <zouyipeng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/P5TKSS3RKOLZFFNI7PGEJX5EKQPQHMOV/ 
 
https://gitee.com/openeuler/kernel/issues/IAI2U3 
 
Link:https://gitee.com/openeuler/kernel/pulls/10742

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents fd23de90 9d9238c4

drivers/irqchip/irq-mbigen.c

+16 −4
Original line number Diff line number Diff line
@@ -291,6 +291,20 @@ static int vtimer_mbigen_set_type(unsigned int cpu_id) 
	return 0;

}



static inline unsigned int get_mbigen_node_offset(unsigned int nid)

{

	unsigned int offset = nid * MBIGEN_NODE_OFFSET;



	/*

	 * To avoid touched clear register in unexpected way, we need to directly

	 * skip clear register when access to more than 10 mbigen nodes.

	 */

	if (nid >= (REG_MBIGEN_CLEAR_OFFSET / MBIGEN_NODE_OFFSET))

		offset += MBIGEN_NODE_OFFSET;



	return offset;

}



static inline unsigned int get_mbigen_vec_reg(irq_hw_number_t hwirq)

{

	unsigned int nid, pin;
@@ -302,8 +316,7 @@ static inline unsigned int get_mbigen_vec_reg(irq_hw_number_t hwirq) 
	nid = hwirq / IRQS_PER_MBIGEN_NODE + 1;

	pin = hwirq % IRQS_PER_MBIGEN_NODE;



	return pin * 4 + nid * MBIGEN_NODE_OFFSET

			+ REG_MBIGEN_LPI_VEC_OFFSET;

	return pin * 4 + get_mbigen_node_offset(nid) + REG_MBIGEN_LPI_VEC_OFFSET;

}



static inline void get_mbigen_type_reg(irq_hw_number_t hwirq,
@@ -325,8 +338,7 @@ static inline void get_mbigen_type_reg(irq_hw_number_t hwirq, 
	*mask = 1 << (irq_ofst % 32);

	ofst = irq_ofst / 32 * 4;



	*addr = ofst + nid * MBIGEN_NODE_OFFSET

		+ REG_MBIGEN_LPI_TYPE_OFFSET;

	*addr = ofst + get_mbigen_node_offset(nid) + REG_MBIGEN_LPI_TYPE_OFFSET;

}



static inline void get_mbigen_clear_reg(irq_hw_number_t hwirq,