Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-17 16:03:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/mips/loongson3_virt: Propagate processor_id to init_loongson_params()

Browse Source 
Remove one &first_cpu use in hw/mips/loongson3_bootp.c.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250115232952.31166-10-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-12 21:09:50 +01:00
parent 18271b5357
commit 7eb372cc8b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/mips/loongson3_bootp.c
View File

@ -23,7 +23,6 @@
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/bswap.h" #include "qemu/bswap.h"
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "cpu.h"
#include "hw/mips/loongson3_bootp.h" #include "hw/mips/loongson3_bootp.h"
static void init_cpu_info(void *g_cpuinfo, uint32_t cpu_count, static void init_cpu_info(void *g_cpuinfo, uint32_t cpu_count,
@ -112,10 +111,10 @@ static void init_special_info(void *g_special)
} }
void init_loongson_params(struct loongson_params *lp, void *p, void init_loongson_params(struct loongson_params *lp, void *p,
uint32_t cpu_count, uint32_t cpu_count, uint32_t processor_id,
uint64_t cpu_freq, uint64_t ram_size) uint64_t cpu_freq, uint64_t ram_size)
{ {
init_cpu_info(p, MIPS_CPU(first_cpu)->env.CP0_PRid, cpu_count, cpu_freq); init_cpu_info(p, cpu_count, processor_id, cpu_freq);
lp->cpu_offset = cpu_to_le64((uintptr_t)p - (uintptr_t)lp); lp->cpu_offset = cpu_to_le64((uintptr_t)p - (uintptr_t)lp);
p += ROUND_UP(sizeof(struct efi_cpuinfo_loongson), 64); p += ROUND_UP(sizeof(struct efi_cpuinfo_loongson), 64);

2
hw/mips/loongson3_bootp.h
View File

@ -233,7 +233,7 @@ enum {
extern const MemMapEntry virt_memmap[]; extern const MemMapEntry virt_memmap[];
void init_loongson_params(struct loongson_params *lp, void *p, void init_loongson_params(struct loongson_params *lp, void *p,
uint32_t cpu_count, uint32_t cpu_count, uint32_t processor_id,
uint64_t cpu_freq, uint64_t ram_size); uint64_t cpu_freq, uint64_t ram_size);
void init_reset_system(struct efi_reset_system_t *reset); void init_reset_system(struct efi_reset_system_t *reset);

1
hw/mips/loongson3_virt.c
View File

@ -185,6 +185,7 @@ static void init_boot_param(unsigned cpu_count)
init_reset_system(&(bp->reset_system)); init_reset_system(&(bp->reset_system));
p += ROUND_UP(sizeof(struct boot_params), 64); p += ROUND_UP(sizeof(struct boot_params), 64);
init_loongson_params(&(bp->efi.smbios.lp), p, cpu_count, init_loongson_params(&(bp->efi.smbios.lp), p, cpu_count,
MIPS_CPU(first_cpu)->env.CP0_PRid,
loaderparams.cpu_freq, loaderparams.ram_size); loaderparams.cpu_freq, loaderparams.ram_size);
rom_add_blob_fixed("params_rom", bp, rom_add_blob_fixed("params_rom", bp,