mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/intc/loongson_ipi: Pass LoongsonIPICommonState to send_ipi_data()

Browse Source 
In order to get LoongsonIPICommonClass in send_ipi_data()
in the next commit, propagate LoongsonIPICommonState.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
[PMD: Extracted from bigger commit, added commit description]
Co-Developed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Bibo Mao <maobibo@loongson.cn>
Tested-by: Bibo Mao <maobibo@loongson.cn>
Acked-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Tested-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Message-Id: <20240805180622.21001-8-philmd@linaro.org>
This commit is contained in:
Bibo Mao 2024-07-15 17:40:50 +02:00 committed by Philippe Mathieu-Daudé
parent 6c8698a5e4
commit ed722e0ec4
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/intc/loongson_ipi.c
View File

@ -88,8 +88,8 @@ static AddressSpace *get_cpu_iocsr_as(CPUState *cpu)
return NULL; return NULL;
} }
static MemTxResult send_ipi_data(CPUState *cpu, uint64_t val, hwaddr addr, static MemTxResult send_ipi_data(LoongsonIPICommonState *ipi, CPUState *cpu,
MemTxAttrs attrs) uint64_t val, hwaddr addr, MemTxAttrs attrs)
{ {
int i, mask = 0, data = 0; int i, mask = 0, data = 0;
AddressSpace *iocsr_as = get_cpu_iocsr_as(cpu); AddressSpace *iocsr_as = get_cpu_iocsr_as(cpu);
@ -119,7 +119,8 @@ static MemTxResult send_ipi_data(CPUState *cpu, uint64_t val, hwaddr addr,
return MEMTX_OK; return MEMTX_OK;
} }
static MemTxResult mail_send(uint64_t val, MemTxAttrs attrs) static MemTxResult mail_send(LoongsonIPICommonState *ipi,
uint64_t val, MemTxAttrs attrs)
{ {
uint32_t cpuid; uint32_t cpuid;
hwaddr addr; hwaddr addr;
@ -134,10 +135,11 @@ static MemTxResult mail_send(uint64_t val, MemTxAttrs attrs)
/* override requester_id */ /* override requester_id */
addr = SMP_IPI_MAILBOX + CORE_BUF_20 + (val & 0x1c); addr = SMP_IPI_MAILBOX + CORE_BUF_20 + (val & 0x1c);
attrs.requester_id = cs->cpu_index; attrs.requester_id = cs->cpu_index;
return send_ipi_data(cs, val, addr, attrs); return send_ipi_data(ipi, cs, val, addr, attrs);
} }
static MemTxResult any_send(uint64_t val, MemTxAttrs attrs) static MemTxResult any_send(LoongsonIPICommonState *ipi,
uint64_t val, MemTxAttrs attrs)
{ {
uint32_t cpuid; uint32_t cpuid;
hwaddr addr; hwaddr addr;
@ -152,7 +154,7 @@ static MemTxResult any_send(uint64_t val, MemTxAttrs attrs)
/* override requester_id */ /* override requester_id */
addr = val & 0xffff; addr = val & 0xffff;
attrs.requester_id = cs->cpu_index; attrs.requester_id = cs->cpu_index;
return send_ipi_data(cs, val, addr, attrs); return send_ipi_data(ipi, cs, val, addr, attrs);
} }
static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr, static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr,
@ -249,15 +251,16 @@ static const MemoryRegionOps loongson_ipi_iocsr_ops = {
static MemTxResult loongson_ipi_writeq(void *opaque, hwaddr addr, uint64_t val, static MemTxResult loongson_ipi_writeq(void *opaque, hwaddr addr, uint64_t val,
unsigned size, MemTxAttrs attrs) unsigned size, MemTxAttrs attrs)
{ {
LoongsonIPICommonState *ipi = opaque;
MemTxResult ret = MEMTX_OK; MemTxResult ret = MEMTX_OK;
addr &= 0xfff; addr &= 0xfff;
switch (addr) { switch (addr) {
case MAIL_SEND_OFFSET: case MAIL_SEND_OFFSET:
ret = mail_send(val, attrs); ret = mail_send(ipi, val, attrs);
break; break;
case ANY_SEND_OFFSET: case ANY_SEND_OFFSET:
ret = any_send(val, attrs); ret = any_send(ipi, val, attrs);
break; break;
default: default:
break; break;