[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 6/8] hw/mips/fuloong2e: Correct cpuclock env
From: |
Jiaxun Yang |
Subject: |
[PATCH v3 6/8] hw/mips/fuloong2e: Correct cpuclock env |
Date: |
Thu, 24 Dec 2020 11:17:48 +0800 |
It was missed in 3ca7639ff00 ("hw/mips/fuloong2e:
Set CPU frequency to 533 MHz"), we need to tell kernel
correct clocks.
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>
---
hw/mips/fuloong2e.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c
index c4843dd15e..2744b211fd 100644
--- a/hw/mips/fuloong2e.c
+++ b/hw/mips/fuloong2e.c
@@ -100,7 +100,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++, "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);
@@ -304,7 +304,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,
--
2.29.2
- [PATCH v3 0/8] hw/mips/fuloong2e fixes, Jiaxun Yang, 2020/12/23
- [PATCH v3 4/8] hw/pci-host/bonito: Fixup pci.lomem mapping, Jiaxun Yang, 2020/12/23
- [PATCH v3 5/8] hw/mips/fuloong2e: Remove unused env entry, Jiaxun Yang, 2020/12/23
- [PATCH v3 6/8] hw/mips/fuloong2e: Correct cpuclock env,
Jiaxun Yang <=
- [PATCH v3 7/8] hw/mips/fuloong2e: Add highmem support, Jiaxun Yang, 2020/12/23
- [PATCH v3 8/8] tests/acceptance: Test boot_linux_console for fuloong2e, Jiaxun Yang, 2020/12/23