Commit 9d9238c4 authored by Yipeng Zou's avatar Yipeng Zou
Browse files

irqchip/mbigen: Fix mbigen node address layout 

linux-next inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAI2U3
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=6be6cba9c4371d27f78d900ccfe34bb880d9ee20



--------------------------------

The mbigen interrupt chip has its per node registers located in a
contiguous region of page sized chunks. The code maps them into virtual
address space as a contiguous region and determines the address of a node
by using the node ID as index.

                    mbigen chip
       |-----------------|------------|--------------|
   mgn_node_0         mgn_node_1     ...         mgn_node_i
|--------------|   |--------------|       |----------------------|
[0x0000, 0x0x0FFF] [0x1000, 0x1FFF]    [i*0x1000, (i+1)*0x1000 - 1]

This works correctly up to 10 nodes, but then fails because the 11th's
array slot is used for the MGN_CLEAR registers.

                         mbigen chip
    |-----------|--------|--------|---------------|--------|
mgn_node_0  mgn_node_1  ...  mgn_clear_register  ...   mgn_node_i
                            |-----------------|
                             [0xA000, 0xAFFF]

Skip the MGN_CLEAR register space when calculating the offset for node IDs
greater than or equal to ten.

Fixes: a6c2f87b ("irqchip/mbigen: Implement the mbigen irq chip operation functions")
Signed-off-by: default avatarYipeng Zou <zouyipeng@huawei.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20240730014400.1751530-1-zouyipeng@huawei.com


Signed-off-by: default avatarYipeng Zou <zouyipeng@huawei.com>
parent e81a12ab

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,