motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/microblaze: Propagate CPU endianness to microblaze_load_kernel()

Browse source 
Pass vCPU endianness as argument so we can load kernels
with different endianness (different from the qemu-system-binary
builtin one).

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20241107012223.94337-3-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-11-04 16:36:49 +01:00
parent d826e47404
commit 8f27e70e3b
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/microblaze/boot.c
View file

@ -114,8 +114,8 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
return addr - 0x30000000LL; return addr - 0x30000000LL;
} }
void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian,
uint32_t ramsize, hwaddr ddr_base, uint32_t ramsize,
const char *initrd_filename, const char *initrd_filename,
const char *dtb_filename, const char *dtb_filename,
void (*machine_cpu_reset)(MicroBlazeCPU *)) void (*machine_cpu_reset)(MicroBlazeCPU *))
@ -144,13 +144,13 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base,
/* Boots a kernel elf binary. */ /* Boots a kernel elf binary. */
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
&entry, NULL, &high, NULL, &entry, NULL, &high, NULL,
TARGET_BIG_ENDIAN, EM_MICROBLAZE, 0, 0); !is_little_endian, EM_MICROBLAZE, 0, 0);
base32 = entry; base32 = entry;
if (base32 == 0xc0000000) { if (base32 == 0xc0000000) {
kernel_size = load_elf(kernel_filename, NULL, kernel_size = load_elf(kernel_filename, NULL,
translate_kernel_address, NULL, translate_kernel_address, NULL,
&entry, NULL, NULL, NULL, &entry, NULL, NULL, NULL,
TARGET_BIG_ENDIAN, EM_MICROBLAZE, 0, 0); !is_little_endian, EM_MICROBLAZE, 0, 0);
} }
/* Always boot into physical ram. */ /* Always boot into physical ram. */
boot_info.bootstrap_pc = (uint32_t)entry; boot_info.bootstrap_pc = (uint32_t)entry;

4
hw/microblaze/boot.h
View file

@ -2,8 +2,8 @@
#define MICROBLAZE_BOOT_H #define MICROBLAZE_BOOT_H
void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, void microblaze_load_kernel(MicroBlazeCPU *cpu, bool is_little_endian,
uint32_t ramsize, hwaddr ddr_base, uint32_t ramsize,
const char *initrd_filename, const char *initrd_filename,
const char *dtb_filename, const char *dtb_filename,
void (*machine_cpu_reset)(MicroBlazeCPU *)); void (*machine_cpu_reset)(MicroBlazeCPU *));

2
hw/microblaze/petalogix_ml605_mmu.c
View file

@ -204,7 +204,7 @@ petalogix_ml605_init(MachineState *machine)
cpu->cfg.pvr_regs[5] = 0xc56be000; cpu->cfg.pvr_regs[5] = 0xc56be000;
cpu->cfg.pvr_regs[10] = 0x0e000000; /* virtex 6 */ cpu->cfg.pvr_regs[10] = 0x0e000000; /* virtex 6 */
microblaze_load_kernel(cpu, MEMORY_BASEADDR, ram_size, microblaze_load_kernel(cpu, true, MEMORY_BASEADDR, ram_size,
machine->initrd_filename, machine->initrd_filename,
BINARY_DEVICE_TREE_FILE, BINARY_DEVICE_TREE_FILE,
NULL); NULL);

2
hw/microblaze/petalogix_s3adsp1800_mmu.c
View file

@ -129,7 +129,7 @@ petalogix_s3adsp1800_init(MachineState *machine)
create_unimplemented_device("xps_gpio", GPIO_BASEADDR, 0x10000); create_unimplemented_device("xps_gpio", GPIO_BASEADDR, 0x10000);
microblaze_load_kernel(cpu, ddr_base, ram_size, microblaze_load_kernel(cpu, !TARGET_BIG_ENDIAN, ddr_base, ram_size,
machine->initrd_filename, machine->initrd_filename,
BINARY_DEVICE_TREE_FILE, BINARY_DEVICE_TREE_FILE,
NULL); NULL);

2
hw/microblaze/xlnx-zynqmp-pmu.c
View file

@ -172,7 +172,7 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine)
qdev_realize(DEVICE(pmu), NULL, &error_fatal); qdev_realize(DEVICE(pmu), NULL, &error_fatal);
/* Load the kernel */ /* Load the kernel */
microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, microblaze_load_kernel(&pmu->cpu, true, XLNX_ZYNQMP_PMU_RAM_ADDR,
machine->ram_size, machine->ram_size,
machine->initrd_filename, machine->initrd_filename,
machine->dtb, machine->dtb,