| Message ID | 20240605-loongson3-ipi-v3-4-ddd2c0e03fa3@flygoat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/mips/loongson3_virt: Implement IPI support | expand |
在 2024/6/5 上午10:15, Jiaxun Yang 写道: > cpu_by_arch_id is doing the same thing as our ipi_getcpu logic. > > Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> > --- Reviewed-by: Song Gao <gaosong@loongson.cn> Thanks. Song Gao > hw/intc/loongson_ipi.c | 39 +++------------------------------------ > 1 file changed, 3 insertions(+), 36 deletions(-) > > diff --git a/hw/intc/loongson_ipi.c b/hw/intc/loongson_ipi.c > index c8a25b4eb8e2..b3cda5972793 100644 > --- a/hw/intc/loongson_ipi.c > +++ b/hw/intc/loongson_ipi.c > @@ -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; > } >
diff --git a/hw/intc/loongson_ipi.c b/hw/intc/loongson_ipi.c index c8a25b4eb8e2..b3cda5972793 100644 --- a/hw/intc/loongson_ipi.c +++ b/hw/intc/loongson_ipi.c @@ -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; }
cpu_by_arch_id is doing the same thing as our ipi_getcpu logic. Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> --- hw/intc/loongson_ipi.c | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-)