|
@@ -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,
|
|
|
|
- MemTxAttrs attrs)
|
|
|
|
|
|
+static MemTxResult send_ipi_data(LoongsonIPICommonState *ipi, CPUState *cpu,
|
|
|
|
+ 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;
|