|
@@ -118,39 +118,6 @@ static MemTxResult send_ipi_data(CPUState *cpu, uint64_t val, hwaddr addr,
|
|
|
return MEMTX_OK;
|
|
|
}
|
|
|
|
|
|
-static int archid_cmp(const void *a, const void *b)
|
|
|
-{
|
|
|
- CPUArchId *archid_a = (CPUArchId *)a;
|
|
|
- CPUArchId *archid_b = (CPUArchId *)b;
|
|
|
-
|
|
|
- return archid_a->arch_id - archid_b->arch_id;
|
|
|
-}
|
|
|
-
|
|
|
-static CPUArchId *find_cpu_by_archid(MachineState *ms, uint32_t id)
|
|
|
-{
|
|
|
- CPUArchId apic_id, *found_cpu;
|
|
|
-
|
|
|
- apic_id.arch_id = id;
|
|
|
- found_cpu = bsearch(&apic_id, ms->possible_cpus->cpus,
|
|
|
- ms->possible_cpus->len, sizeof(*ms->possible_cpus->cpus),
|
|
|
- archid_cmp);
|
|
|
-
|
|
|
- return found_cpu;
|
|
|
-}
|
|
|
-
|
|
|
-static CPUState *ipi_getcpu(int arch_id)
|
|
|
-{
|
|
|
- MachineState *machine = MACHINE(qdev_get_machine());
|
|
|
- CPUArchId *archid;
|
|
|
-
|
|
|
- archid = find_cpu_by_archid(machine, arch_id);
|
|
|
- if (archid) {
|
|
|
- return CPU(archid->cpu);
|
|
|
- }
|
|
|
-
|
|
|
- return NULL;
|
|
|
-}
|
|
|
-
|
|
|
static MemTxResult mail_send(uint64_t val, MemTxAttrs attrs)
|
|
|
{
|
|
|
uint32_t cpuid;
|
|
@@ -158,7 +125,7 @@ static MemTxResult mail_send(uint64_t val, MemTxAttrs attrs)
|
|
|
CPUState *cs;
|
|
|
|
|
|
cpuid = extract32(val, 16, 10);
|
|
|
- cs = ipi_getcpu(cpuid);
|
|
|
+ cs = cpu_by_arch_id(cpuid);
|
|
|
if (cs == NULL) {
|
|
|
return MEMTX_DECODE_ERROR;
|
|
|
}
|
|
@@ -176,7 +143,7 @@ static MemTxResult any_send(uint64_t val, MemTxAttrs attrs)
|
|
|
CPUState *cs;
|
|
|
|
|
|
cpuid = extract32(val, 16, 10);
|
|
|
- cs = ipi_getcpu(cpuid);
|
|
|
+ cs = cpu_by_arch_id(cpuid);
|
|
|
if (cs == NULL) {
|
|
|
return MEMTX_DECODE_ERROR;
|
|
|
}
|
|
@@ -227,7 +194,7 @@ static MemTxResult loongson_ipi_core_writel(void *opaque, hwaddr addr,
|
|
|
cpuid = extract32(val, 16, 10);
|
|
|
/* IPI status vector */
|
|
|
vector = extract8(val, 0, 5);
|
|
|
- cs = ipi_getcpu(cpuid);
|
|
|
+ cs = cpu_by_arch_id(cpuid);
|
|
|
if (cs == NULL || cs->cpu_index >= ipi->num_cpu) {
|
|
|
return MEMTX_DECODE_ERROR;
|
|
|
}
|