david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use guest memory access functions when setting up arm boorloader.

Browse Source 
Signed-off-by: Paul Brook <paul@codesourcery.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7053 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2009-04-09 17:19:47 +00:00
parent 7ffab4d78c
commit 52b437377f
2 changed files with 85 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
hw/arm_boot.c
View File

@ -53,124 +53,135 @@ static void main_cpu_reset(void *opaque)
/* TODO: Reset secondary CPUs. */ /* TODO: Reset secondary CPUs. */
} }
static void set_kernel_args(struct arm_boot_info *info, #define WRITE_WORD(p, value) do { \
int initrd_size, void *base) stl_phys_notdirty(p, value); \
{ p += 4; \
uint32_t *p; } while (0)
p = (uint32_t *)(base + KERNEL_ARGS_ADDR); static void set_kernel_args(struct arm_boot_info *info,
int initrd_size, target_phys_addr_t base)
{
target_phys_addr_t p;
p = base + KERNEL_ARGS_ADDR;
/* ATAG_CORE */ /* ATAG_CORE */
stl_raw(p++, 5); WRITE_WORD(p, 5);
stl_raw(p++, 0x54410001); WRITE_WORD(p, 0x54410001);
stl_raw(p++, 1); WRITE_WORD(p, 1);
stl_raw(p++, 0x1000); WRITE_WORD(p, 0x1000);
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* ATAG_MEM */ /* ATAG_MEM */
/* TODO: handle multiple chips on one ATAG list */ /* TODO: handle multiple chips on one ATAG list */
stl_raw(p++, 4); WRITE_WORD(p, 4);
stl_raw(p++, 0x54410002); WRITE_WORD(p, 0x54410002);
stl_raw(p++, info->ram_size); WRITE_WORD(p, info->ram_size);
stl_raw(p++, info->loader_start); WRITE_WORD(p, info->loader_start);
if (initrd_size) { if (initrd_size) {
/* ATAG_INITRD2 */ /* ATAG_INITRD2 */
stl_raw(p++, 4); WRITE_WORD(p, 4);
stl_raw(p++, 0x54420005); WRITE_WORD(p, 0x54420005);
stl_raw(p++, info->loader_start + INITRD_LOAD_ADDR); WRITE_WORD(p, info->loader_start + INITRD_LOAD_ADDR);
stl_raw(p++, initrd_size); WRITE_WORD(p, initrd_size);
} }
if (info->kernel_cmdline && *info->kernel_cmdline) { if (info->kernel_cmdline && *info->kernel_cmdline) {
/* ATAG_CMDLINE */ /* ATAG_CMDLINE */
int cmdline_size; int cmdline_size;
cmdline_size = strlen(info->kernel_cmdline); cmdline_size = strlen(info->kernel_cmdline);
memcpy(p + 2, info->kernel_cmdline, cmdline_size + 1); cpu_physical_memory_write(p + 8, (void *)info->kernel_cmdline,
cmdline_size + 1);
cmdline_size = (cmdline_size >> 2) + 1; cmdline_size = (cmdline_size >> 2) + 1;
stl_raw(p++, cmdline_size + 2); WRITE_WORD(p, cmdline_size + 2);
stl_raw(p++, 0x54410009); WRITE_WORD(p, 0x54410009);
p += cmdline_size; p += cmdline_size * 4;
} }
if (info->atag_board) { if (info->atag_board) {
/* ATAG_BOARD */ /* ATAG_BOARD */
int atag_board_len; int atag_board_len;
uint8_t atag_board_buf[0x1000];
atag_board_len = (info->atag_board(info, p + 2) + 3) >> 2; atag_board_len = (info->atag_board(info, atag_board_buf) + 3) & ~3;
stl_raw(p++, 2 + atag_board_len); WRITE_WORD(p, (atag_board_len + 8) >> 2);
stl_raw(p++, 0x414f4d50); WRITE_WORD(p, 0x414f4d50);
cpu_physical_memory_write(p, atag_board_buf, atag_board_len);
p += atag_board_len; p += atag_board_len;
} }
/* ATAG_END */ /* ATAG_END */
stl_raw(p++, 0); WRITE_WORD(p, 0);
stl_raw(p++, 0); WRITE_WORD(p, 0);
} }
static void set_kernel_args_old(struct arm_boot_info *info, static void set_kernel_args_old(struct arm_boot_info *info,
int initrd_size, void *base) int initrd_size, target_phys_addr_t base)
{ {
uint32_t *p; target_phys_addr_t p;
char *s; const char *s;
/* see linux/include/asm-arm/setup.h */ /* see linux/include/asm-arm/setup.h */
p = (uint32_t *)(base + KERNEL_ARGS_ADDR); p = base + KERNEL_ARGS_ADDR;
/* page_size */ /* page_size */
stl_raw(p++, 4096); WRITE_WORD(p, 4096);
/* nr_pages */ /* nr_pages */
stl_raw(p++, info->ram_size / 4096); WRITE_WORD(p, info->ram_size / 4096);
/* ramdisk_size */ /* ramdisk_size */
stl_raw(p++, 0); WRITE_WORD(p, 0);
#define FLAG_READONLY 1 #define FLAG_READONLY 1
#define FLAG_RDLOAD 4 #define FLAG_RDLOAD 4
#define FLAG_RDPROMPT 8 #define FLAG_RDPROMPT 8
/* flags */ /* flags */
stl_raw(p++, FLAG_READONLY | FLAG_RDLOAD | FLAG_RDPROMPT); WRITE_WORD(p, FLAG_READONLY | FLAG_RDLOAD | FLAG_RDPROMPT);
/* rootdev */ /* rootdev */
stl_raw(p++, (31 << 8) | 0); /* /dev/mtdblock0 */ WRITE_WORD(p, (31 << 8) | 0); /* /dev/mtdblock0 */
/* video_num_cols */ /* video_num_cols */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* video_num_rows */ /* video_num_rows */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* video_x */ /* video_x */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* video_y */ /* video_y */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* memc_control_reg */ /* memc_control_reg */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* unsigned char sounddefault */ /* unsigned char sounddefault */
/* unsigned char adfsdrives */ /* unsigned char adfsdrives */
/* unsigned char bytes_per_char_h */ /* unsigned char bytes_per_char_h */
/* unsigned char bytes_per_char_v */ /* unsigned char bytes_per_char_v */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* pages_in_bank[4] */ /* pages_in_bank[4] */
stl_raw(p++, 0); WRITE_WORD(p, 0);
stl_raw(p++, 0); WRITE_WORD(p, 0);
stl_raw(p++, 0); WRITE_WORD(p, 0);
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* pages_in_vram */ /* pages_in_vram */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* initrd_start */ /* initrd_start */
if (initrd_size) if (initrd_size)
stl_raw(p++, info->loader_start + INITRD_LOAD_ADDR); WRITE_WORD(p, info->loader_start + INITRD_LOAD_ADDR);
else else
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* initrd_size */ /* initrd_size */
stl_raw(p++, initrd_size); WRITE_WORD(p, initrd_size);
/* rd_start */ /* rd_start */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* system_rev */ /* system_rev */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* system_serial_low */ /* system_serial_low */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* system_serial_high */ /* system_serial_high */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* mem_fclk_21285 */ /* mem_fclk_21285 */
stl_raw(p++, 0); WRITE_WORD(p, 0);
/* zero unused fields */ /* zero unused fields */
memset(p, 0, 256 + 1024 - while (p < base + KERNEL_ARGS_ADDR + 256 + 1024) {
(p - ((uint32_t *)(base + KERNEL_ARGS_ADDR)))); WRITE_WORD(p, 0);
s = base + KERNEL_ARGS_ADDR + 256 + 1024; }
if (info->kernel_cmdline) s = info->kernel_cmdline;
strcpy (s, info->kernel_cmdline); if (s) {
else cpu_physical_memory_write(p, (void *)s, strlen(s) + 1);
stb_raw(s, 0); } else {
WRITE_WORD(p, 0);
}
} }
void arm_load_kernel(CPUState *env, struct arm_boot_info *info) void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
@ -197,6 +208,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
qemu_register_reset(main_cpu_reset, env); qemu_register_reset(main_cpu_reset, env);
} }
/* FIXME: We should make load_image take a guest physical address. */
pd = cpu_get_physical_page_desc(info->loader_start); pd = cpu_get_physical_page_desc(info->loader_start);
loader_phys = phys_ram_base + (pd & TARGET_PAGE_MASK) + loader_phys = phys_ram_base + (pd & TARGET_PAGE_MASK) +
(info->loader_start & ~TARGET_PAGE_MASK); (info->loader_start & ~TARGET_PAGE_MASK);
@ -239,14 +251,17 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
bootloader[2] |= (info->board_id >> 8) & 0xff; bootloader[2] |= (info->board_id >> 8) & 0xff;
bootloader[5] = info->loader_start + KERNEL_ARGS_ADDR; bootloader[5] = info->loader_start + KERNEL_ARGS_ADDR;
bootloader[6] = entry; bootloader[6] = entry;
for (n = 0; n < sizeof(bootloader) / 4; n++) for (n = 0; n < sizeof(bootloader) / 4; n++) {
stl_raw(loader_phys + (n * 4), bootloader[n]); stl_phys_notdirty(info->loader_start + (n * 4), bootloader[n]);
if (info->nb_cpus > 1) }
for (n = 0; n < sizeof(smpboot) / 4; n++) if (info->nb_cpus > 1) {
stl_raw(loader_phys + info->ram_size + (n * 4), smpboot[n]); for (n = 0; n < sizeof(smpboot) / 4; n++) {
stl_phys_notdirty(info->smp_loader_start + (n * 4), smpboot[n]);
}
}
if (old_param) if (old_param)
set_kernel_args_old(info, initrd_size, loader_phys); set_kernel_args_old(info, initrd_size, info->loader_start);
else else
set_kernel_args(info, initrd_size, loader_phys); set_kernel_args(info, initrd_size, info->loader_start);
} }
} }

1
hw/realview.c
View File

@ -20,6 +20,7 @@
static struct arm_boot_info realview_binfo = { static struct arm_boot_info realview_binfo = {
.loader_start = 0x0, .loader_start = 0x0,
.smp_loader_start = 0x80000000,
.board_id = 0x33b, .board_id = 0x33b,
}; };