[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/6] hw/intc/loongson: Fix incorrect 'core' calculation in liointc
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 4/6] hw/intc/loongson: Fix incorrect 'core' calculation in liointc_read/write |
Date: |
Tue, 3 Nov 2020 18:31:25 +0100 |
From: AlexChen <alex.chen@huawei.com>
According to the loongson spec
(http://www.loongson.cn/uploadfile/cpu/3B1500/Loongson_3B1500_cpu_user_1.pdf)
and the macro definition(#define R_PERCORE_ISR(x) (0x40 + 0x8 * x)), we know
that the ISR size per CORE is 8, so here we need to divide
(addr - R_PERCORE_ISR(0)) by 8, not 4.
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <5FA12391.8090400@huawei.com>
[PMD: Shortened subject]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/intc/loongson_liointc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/intc/loongson_liointc.c b/hw/intc/loongson_liointc.c
index 30fb375b721..fbbfb57ee9c 100644
--- a/hw/intc/loongson_liointc.c
+++ b/hw/intc/loongson_liointc.c
@@ -130,7 +130,7 @@ liointc_read(void *opaque, hwaddr addr, unsigned int size)
if (addr >= R_PERCORE_ISR(0) &&
addr < R_PERCORE_ISR(NUM_CORES)) {
- int core = (addr - R_PERCORE_ISR(0)) / 4;
+ int core = (addr - R_PERCORE_ISR(0)) / 8;
r = p->per_core_isr[core];
goto out;
}
@@ -173,7 +173,7 @@ liointc_write(void *opaque, hwaddr addr,
if (addr >= R_PERCORE_ISR(0) &&
addr < R_PERCORE_ISR(NUM_CORES)) {
- int core = (addr - R_PERCORE_ISR(0)) / 4;
+ int core = (addr - R_PERCORE_ISR(0)) / 8;
p->per_core_isr[core] = value;
goto out;
}
--
2.26.2
- [PULL 0/6] Mips fixes patches, Philippe Mathieu-Daudé, 2020/11/03
- [PULL 1/6] hw/mips: Remove the 'r4k' machine, Philippe Mathieu-Daudé, 2020/11/03
- [PULL 2/6] hw/mips: Fix Lesser GPL version number, Philippe Mathieu-Daudé, 2020/11/03
- [PULL 3/6] hw/mips/boston: Fix Lesser GPL version number, Philippe Mathieu-Daudé, 2020/11/03
- [PULL 4/6] hw/intc/loongson: Fix incorrect 'core' calculation in liointc_read/write,
Philippe Mathieu-Daudé <=
- [PULL 5/6] target/mips: Fix Lesser GPL version number, Philippe Mathieu-Daudé, 2020/11/03
- [PULL 6/6] target/mips: Add unaligned access support for MIPS64R6 and Loongson-3, Philippe Mathieu-Daudé, 2020/11/03
- Re: [PULL 0/6] Mips fixes patches, Peter Maydell, 2020/11/04