diff options
| author | Jiaxun Yang <jiaxun.yang@flygoat.com> | 2020-12-24 11:17:48 +0800 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-01-04 23:36:03 +0100 |
| commit | e41f27ec2a0c29a7b016af16992cf6e642a54002 (patch) | |
| tree | 4d6315070a43679a5c06d3604b53876eaad51526 /hw/mips/fuloong2e.c | |
| parent | c0809fcfac3cf599d69f7e4610856a786d78ccad (diff) | |
| download | qemu-e41f27ec2a0c29a7b016af16992cf6e642a54002.zip qemu-e41f27ec2a0c29a7b016af16992cf6e642a54002.tar.gz qemu-e41f27ec2a0c29a7b016af16992cf6e642a54002.tar.bz2 | |
hw/mips/fuloong2e: Correct cpuclock in PROM environment
Missed in 3ca7639ff00 ("hw/mips/fuloong2e: Set CPU frequency
to 533 MHz"), we need to tell the kernel the correct clock.
Fixes: 3ca7639ff00 ("hw/mips/fuloong2e: Set CPU frequency to 533 MHz").
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Huacai Chen <chenhuacai@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201224031750.52146-7-jiaxun.yang@flygoat.com>
[PMD: Reworded]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/mips/fuloong2e.c')
| -rw-r--r-- | hw/mips/fuloong2e.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 9b44ac6..2980524 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -99,7 +99,7 @@ static void GCC_FMT_ATTR(3, 4) prom_set(uint32_t *prom_buf, int index, va_end(ap); } -static uint64_t load_kernel(CPUMIPSState *env) +static uint64_t load_kernel(MIPSCPU *cpu) { uint64_t kernel_entry, kernel_high, initrd_size; int index = 0; @@ -159,7 +159,7 @@ static uint64_t load_kernel(CPUMIPSState *env) /* Setup minimum environment variables */ prom_set(prom_buf, index++, "busclock=33000000"); - prom_set(prom_buf, index++, "cpuclock=100000000"); + prom_set(prom_buf, index++, "cpuclock=%u", clock_get_hz(cpu->clock)); prom_set(prom_buf, index++, "memsize=%"PRIi64, loaderparams.ram_size / MiB); prom_set(prom_buf, index++, NULL); @@ -330,7 +330,7 @@ static void mips_fuloong2e_init(MachineState *machine) loaderparams.kernel_filename = kernel_filename; loaderparams.kernel_cmdline = kernel_cmdline; loaderparams.initrd_filename = initrd_filename; - kernel_entry = load_kernel(env); + kernel_entry = load_kernel(cpu); write_bootloader(env, memory_region_get_ram_ptr(bios), kernel_entry); } else { filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, |