* [Qemu-devel] [PATCH 0/3] xtensa_lx60: FLASH, kernel args support, minor fixes
@ 2011-10-30 18:03 Max Filippov
2011-10-30 18:03 ` [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support Max Filippov
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Max Filippov @ 2011-10-30 18:03 UTC (permalink / raw)
To: qemu-devel; +Cc: jcmvbkbc
Max Filippov (3):
xtensa_lx60: add FLASH support
xtensa_lx60: pass kernel arguments from -append
xtensa_lx60: fix build date code and change memory region names
default-configs/xtensa-softmmu.mak | 1 +
default-configs/xtensaeb-softmmu.mak | 1 +
hw/xtensa_bootparam.h | 25 ++++++++
hw/xtensa_lx60.c | 111 +++++++++++++++++++++++++++++-----
4 files changed, 122 insertions(+), 16 deletions(-)
create mode 100644 hw/xtensa_bootparam.h
--
1.7.6.4
^ permalink raw reply [flat|nested] 5+ messages in thread* [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support 2011-10-30 18:03 [Qemu-devel] [PATCH 0/3] xtensa_lx60: FLASH, kernel args support, minor fixes Max Filippov @ 2011-10-30 18:03 ` Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 2/3] xtensa_lx60: pass kernel arguments from -append Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 3/3] xtensa_lx60: fix build date code and change memory region names Max Filippov 2 siblings, 0 replies; 5+ messages in thread From: Max Filippov @ 2011-10-30 18:03 UTC (permalink / raw) To: qemu-devel; +Cc: jcmvbkbc LX60 carry 4 Mbyte FLASH and 128 Kbyte SRAM, LX200 carry 16 Mbyte FLASH and 32 Mbyte SRAM. Either of these memories may be mapped to the system ROM region. Select boot from FLASH if -kernel option is not specified, otherwise boot from SRAM. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- default-configs/xtensa-softmmu.mak | 1 + default-configs/xtensaeb-softmmu.mak | 1 + hw/xtensa_lx60.c | 79 ++++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak index 7f0df34..9d8899c 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y +CONFIG_PFLASH_CFI01=y diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak index 7f0df34..9d8899c 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y +CONFIG_PFLASH_CFI01=y diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 3cebca1..cb047d2 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -33,6 +33,13 @@ #include "exec-memory.h" #include "pc.h" #include "sysbus.h" +#include "flash.h" + +typedef struct LxBoardDesc { + size_t flash_size; + size_t flash_sector_size; + size_t sram_size; +} LxBoardDesc; typedef struct Lx60FpgaState { MemoryRegion iomem; @@ -142,8 +149,8 @@ static void lx60_reset(void *env) cpu_reset(env); } -static void lx60_init(ram_addr_t ram_size, - const char *boot_device, +static void lx_init(const LxBoardDesc *board, + ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { @@ -155,8 +162,14 @@ static void lx60_init(ram_addr_t ram_size, MemoryRegion *system_memory = get_system_memory(); CPUState *env = NULL; MemoryRegion *ram, *rom, *system_io; + DriveInfo *dinfo; + pflash_t *flash = NULL; int n; + if (!cpu_model) { + cpu_model = "dc232b"; + } + for (n = 0; n < smp_cpus; n++) { env = cpu_init(cpu_model); if (!env) { @@ -195,6 +208,20 @@ static void lx60_init(ram_addr_t ram_size, serial_mm_init(system_io, 0x0d050020, 2, xtensa_get_extint(env, 0), 115200, serial_hds[0], DEVICE_NATIVE_ENDIAN); + dinfo = drive_get(IF_PFLASH, 0, 0); + if (dinfo) { + flash = pflash_cfi01_register(0xf8000000, + NULL, "lx60.io.flash", board->flash_size, + dinfo->bdrv, board->flash_sector_size, + board->flash_size / board->flash_sector_size, + 4, 0x0000, 0x0000, 0x0000, 0x0000, be); + if (flash == NULL) { + fprintf(stderr, "Unable to mount pflash\n"); + exit(1); + } + } + + /* Use presence of kernel file name as 'boot from SRAM' switch. */ if (kernel_filename) { uint64_t elf_entry; uint64_t elf_lowaddr; @@ -203,6 +230,16 @@ static void lx60_init(ram_addr_t ram_size, if (success > 0) { env->pc = elf_entry; } + } else { + if (flash) { + MemoryRegion *flash_mr = pflash_cfi01_get_memory(flash); + MemoryRegion *flash_io = g_malloc(sizeof(*flash_io)); + + memory_region_init_alias(flash_io, "lx60.flash", + flash_mr, 0, board->flash_size); + memory_region_add_subregion(system_memory, 0xfe000000, + flash_io); + } } } @@ -211,10 +248,28 @@ static void xtensa_lx60_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - if (!cpu_model) { - cpu_model = "dc232b"; - } - lx60_init(ram_size, boot_device, kernel_filename, kernel_cmdline, + static const LxBoardDesc lx60_board = { + .flash_size = 0x400000, + .flash_sector_size = 0x10000, + .sram_size = 0x20000, + }; + lx_init(&lx60_board, ram_size, boot_device, + kernel_filename, kernel_cmdline, + initrd_filename, cpu_model); +} + +static void xtensa_lx200_init(ram_addr_t ram_size, + const char *boot_device, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename, const char *cpu_model) +{ + static const LxBoardDesc lx200_board = { + .flash_size = 0x1000000, + .flash_sector_size = 0x20000, + .sram_size = 0x2000000, + }; + lx_init(&lx200_board, ram_size, boot_device, + kernel_filename, kernel_cmdline, initrd_filename, cpu_model); } @@ -225,9 +280,17 @@ static QEMUMachine xtensa_lx60_machine = { .max_cpus = 4, }; -static void xtensa_lx60_machine_init(void) +static QEMUMachine xtensa_lx200_machine = { + .name = "lx200", + .desc = "lx200 EVB (dc232b)", + .init = xtensa_lx200_init, + .max_cpus = 4, +}; + +static void xtensa_lx_machines_init(void) { qemu_register_machine(&xtensa_lx60_machine); + qemu_register_machine(&xtensa_lx200_machine); } -machine_init(xtensa_lx60_machine_init); +machine_init(xtensa_lx_machines_init); -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 2/3] xtensa_lx60: pass kernel arguments from -append 2011-10-30 18:03 [Qemu-devel] [PATCH 0/3] xtensa_lx60: FLASH, kernel args support, minor fixes Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support Max Filippov @ 2011-10-30 18:03 ` Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 3/3] xtensa_lx60: fix build date code and change memory region names Max Filippov 2 siblings, 0 replies; 5+ messages in thread From: Max Filippov @ 2011-10-30 18:03 UTC (permalink / raw) To: qemu-devel; +Cc: jcmvbkbc Create boot parameters in the end of SRAM region, insert kernel arguments specified in -append there. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- hw/xtensa_bootparam.h | 25 +++++++++++++++++++++++++ hw/xtensa_lx60.c | 24 ++++++++++++++++++++---- 2 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 hw/xtensa_bootparam.h diff --git a/hw/xtensa_bootparam.h b/hw/xtensa_bootparam.h new file mode 100644 index 0000000..38ef32b --- /dev/null +++ b/hw/xtensa_bootparam.h @@ -0,0 +1,25 @@ +#ifndef HW_XTENSA_BOOTPARAM +#define HW_XTENSA_BOOTPARAM + +typedef struct BpTag { + uint16_t tag; + uint16_t size; +} BpTag; + +static inline ram_addr_t put_tag(ram_addr_t addr, uint16_t tag, + size_t size, const void *data) +{ + BpTag bp_tag = { + .tag = tswap16(tag), + .size = tswap16((size + 3) & ~3), + }; + + cpu_physical_memory_write(addr, &bp_tag, sizeof(bp_tag)); + addr += sizeof(bp_tag); + cpu_physical_memory_write(addr, data, size); + addr += (size + 3) & ~3; + + return addr; +} + +#endif diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index cb047d2..069b21c 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -34,6 +34,7 @@ #include "pc.h" #include "sysbus.h" #include "flash.h" +#include "xtensa_bootparam.h" typedef struct LxBoardDesc { size_t flash_size; @@ -188,10 +189,6 @@ static void lx_init(const LxBoardDesc *board, memory_region_init_ram(ram, NULL, "xtensa.sram", ram_size); memory_region_add_subregion(system_memory, 0, ram); - rom = g_malloc(sizeof(*rom)); - memory_region_init_ram(rom, NULL, "xtensa.rom", 0x1000); - memory_region_add_subregion(system_memory, 0xfe000000, rom); - system_io = g_malloc(sizeof(*system_io)); memory_region_init(system_io, "system.io", 224 * 1024 * 1024); memory_region_add_subregion(system_memory, 0xf0000000, system_io); @@ -223,6 +220,25 @@ static void lx_init(const LxBoardDesc *board, /* Use presence of kernel file name as 'boot from SRAM' switch. */ if (kernel_filename) { + rom = g_malloc(sizeof(*rom)); + memory_region_init_ram(rom, NULL, "lx60.sram", board->sram_size); + memory_region_add_subregion(system_memory, 0xfe000000, rom); + + /* Put kernel bootparameters to the end of that SRAM */ + if (kernel_cmdline) { + size_t cmdline_size = strlen(kernel_cmdline) + 1; + size_t bp_size = sizeof(BpTag[4]) + cmdline_size; + uint32_t tagptr = (0xfe000000 + board->sram_size - bp_size) & ~0xff; + + env->regs[2] = tagptr; + + tagptr = put_tag(tagptr, 0x7b0b, 0, NULL); + if (cmdline_size > 1) { + tagptr = put_tag(tagptr, 0x1001, + cmdline_size, kernel_cmdline); + } + tagptr = put_tag(tagptr, 0x7e0b, 0, NULL); + } uint64_t elf_entry; uint64_t elf_lowaddr; int success = load_elf(kernel_filename, translate_phys_addr, env, -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 3/3] xtensa_lx60: fix build date code and change memory region names 2011-10-30 18:03 [Qemu-devel] [PATCH 0/3] xtensa_lx60: FLASH, kernel args support, minor fixes Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 2/3] xtensa_lx60: pass kernel arguments from -append Max Filippov @ 2011-10-30 18:03 ` Max Filippov 2 siblings, 0 replies; 5+ messages in thread From: Max Filippov @ 2011-10-30 18:03 UTC (permalink / raw) To: qemu-devel; +Cc: jcmvbkbc Fix date code to uses MMDDYYYY notation. Change memory region names to reflect specification that defines them. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- hw/xtensa_lx60.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 069b21c..8947157 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -63,7 +63,7 @@ static uint64_t lx60_fpga_read(void *opaque, target_phys_addr_t addr, switch (addr) { case 0x0: /*build date code*/ - return 0x27092011; + return 0x09272011; case 0x4: /*processor clock frequency, Hz*/ return 10000000; @@ -107,7 +107,7 @@ static Lx60FpgaState *lx60_fpga_init(MemoryRegion *address_space, Lx60FpgaState *s = g_malloc(sizeof(Lx60FpgaState)); memory_region_init_io(&s->iomem, &lx60_fpga_ops, s, - "lx60-fpga", 0x10000); + "lx60.fpga", 0x10000); memory_region_add_subregion(address_space, base, &s->iomem); lx60_fpga_reset(s); qemu_register_reset(lx60_fpga_reset, s); @@ -186,11 +186,11 @@ static void lx_init(const LxBoardDesc *board, } ram = g_malloc(sizeof(*ram)); - memory_region_init_ram(ram, NULL, "xtensa.sram", ram_size); + memory_region_init_ram(ram, NULL, "lx60.dram", ram_size); memory_region_add_subregion(system_memory, 0, ram); system_io = g_malloc(sizeof(*system_io)); - memory_region_init(system_io, "system.io", 224 * 1024 * 1024); + memory_region_init(system_io, "lx60.io", 224 * 1024 * 1024); memory_region_add_subregion(system_memory, 0xf0000000, system_io); lx60_fpga_init(system_io, 0x0d020000); if (nd_table[0].vlan) { -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PULL 0/7] target-xtensa patches for 1.0 @ 2011-10-31 22:17 Max Filippov 2011-10-31 22:17 ` [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support Max Filippov 0 siblings, 1 reply; 5+ messages in thread From: Max Filippov @ 2011-10-31 22:17 UTC (permalink / raw) To: Anthony Liguori; +Cc: Blue Swirl, jcmvbkbc, qemu-devel The following fixes for target-xtensa targeting 1.0 are available in the git repository at git://jcmvbkbc.spb.ru/dumb/qemu-xtensa.git xtensa Max Filippov (7): target-xtensa: mask out undefined bits of WINDOWBASE SR target-xtensa: handle cache options in the overlay tool target-xtensa: raise an exception for invalid and reserved opcodes opencores_eth: fix RX path: FCS, padding and TL xtensa_lx60: add FLASH support xtensa_lx60: pass kernel arguments from -append xtensa_lx60: fix build date code and change memory region names default-configs/xtensa-softmmu.mak | 1 + default-configs/xtensaeb-softmmu.mak | 1 + hw/opencores_eth.c | 29 +++++++-- hw/xtensa_bootparam.h | 25 ++++++++ hw/xtensa_lx60.c | 111 +++++++++++++++++++++++++++++----- target-xtensa/overlay_tool.h | 6 ++ target-xtensa/translate.c | 9 ++- 7 files changed, 159 insertions(+), 23 deletions(-) create mode 100644 hw/xtensa_bootparam.h -- 1.7.6.4 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support 2011-10-31 22:17 [Qemu-devel] [PULL 0/7] target-xtensa patches for 1.0 Max Filippov @ 2011-10-31 22:17 ` Max Filippov 0 siblings, 0 replies; 5+ messages in thread From: Max Filippov @ 2011-10-31 22:17 UTC (permalink / raw) To: Anthony Liguori; +Cc: Blue Swirl, jcmvbkbc, qemu-devel LX60 carry 4 Mbyte FLASH and 128 Kbyte SRAM, LX200 carry 16 Mbyte FLASH and 32 Mbyte SRAM. Either of these memories may be mapped to the system ROM region. Select boot from FLASH if -kernel option is not specified, otherwise boot from SRAM. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- default-configs/xtensa-softmmu.mak | 1 + default-configs/xtensaeb-softmmu.mak | 1 + hw/xtensa_lx60.c | 79 ++++++++++++++++++++++++++++++--- 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak index 7f0df34..9d8899c 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y +CONFIG_PFLASH_CFI01=y diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak index 7f0df34..9d8899c 100644 --- a/default-configs/xtensaeb-softmmu.mak +++ b/default-configs/xtensaeb-softmmu.mak @@ -2,3 +2,4 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y +CONFIG_PFLASH_CFI01=y diff --git a/hw/xtensa_lx60.c b/hw/xtensa_lx60.c index 3cebca1..cb047d2 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa_lx60.c @@ -33,6 +33,13 @@ #include "exec-memory.h" #include "pc.h" #include "sysbus.h" +#include "flash.h" + +typedef struct LxBoardDesc { + size_t flash_size; + size_t flash_sector_size; + size_t sram_size; +} LxBoardDesc; typedef struct Lx60FpgaState { MemoryRegion iomem; @@ -142,8 +149,8 @@ static void lx60_reset(void *env) cpu_reset(env); } -static void lx60_init(ram_addr_t ram_size, - const char *boot_device, +static void lx_init(const LxBoardDesc *board, + ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { @@ -155,8 +162,14 @@ static void lx60_init(ram_addr_t ram_size, MemoryRegion *system_memory = get_system_memory(); CPUState *env = NULL; MemoryRegion *ram, *rom, *system_io; + DriveInfo *dinfo; + pflash_t *flash = NULL; int n; + if (!cpu_model) { + cpu_model = "dc232b"; + } + for (n = 0; n < smp_cpus; n++) { env = cpu_init(cpu_model); if (!env) { @@ -195,6 +208,20 @@ static void lx60_init(ram_addr_t ram_size, serial_mm_init(system_io, 0x0d050020, 2, xtensa_get_extint(env, 0), 115200, serial_hds[0], DEVICE_NATIVE_ENDIAN); + dinfo = drive_get(IF_PFLASH, 0, 0); + if (dinfo) { + flash = pflash_cfi01_register(0xf8000000, + NULL, "lx60.io.flash", board->flash_size, + dinfo->bdrv, board->flash_sector_size, + board->flash_size / board->flash_sector_size, + 4, 0x0000, 0x0000, 0x0000, 0x0000, be); + if (flash == NULL) { + fprintf(stderr, "Unable to mount pflash\n"); + exit(1); + } + } + + /* Use presence of kernel file name as 'boot from SRAM' switch. */ if (kernel_filename) { uint64_t elf_entry; uint64_t elf_lowaddr; @@ -203,6 +230,16 @@ static void lx60_init(ram_addr_t ram_size, if (success > 0) { env->pc = elf_entry; } + } else { + if (flash) { + MemoryRegion *flash_mr = pflash_cfi01_get_memory(flash); + MemoryRegion *flash_io = g_malloc(sizeof(*flash_io)); + + memory_region_init_alias(flash_io, "lx60.flash", + flash_mr, 0, board->flash_size); + memory_region_add_subregion(system_memory, 0xfe000000, + flash_io); + } } } @@ -211,10 +248,28 @@ static void xtensa_lx60_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - if (!cpu_model) { - cpu_model = "dc232b"; - } - lx60_init(ram_size, boot_device, kernel_filename, kernel_cmdline, + static const LxBoardDesc lx60_board = { + .flash_size = 0x400000, + .flash_sector_size = 0x10000, + .sram_size = 0x20000, + }; + lx_init(&lx60_board, ram_size, boot_device, + kernel_filename, kernel_cmdline, + initrd_filename, cpu_model); +} + +static void xtensa_lx200_init(ram_addr_t ram_size, + const char *boot_device, + const char *kernel_filename, const char *kernel_cmdline, + const char *initrd_filename, const char *cpu_model) +{ + static const LxBoardDesc lx200_board = { + .flash_size = 0x1000000, + .flash_sector_size = 0x20000, + .sram_size = 0x2000000, + }; + lx_init(&lx200_board, ram_size, boot_device, + kernel_filename, kernel_cmdline, initrd_filename, cpu_model); } @@ -225,9 +280,17 @@ static QEMUMachine xtensa_lx60_machine = { .max_cpus = 4, }; -static void xtensa_lx60_machine_init(void) +static QEMUMachine xtensa_lx200_machine = { + .name = "lx200", + .desc = "lx200 EVB (dc232b)", + .init = xtensa_lx200_init, + .max_cpus = 4, +}; + +static void xtensa_lx_machines_init(void) { qemu_register_machine(&xtensa_lx60_machine); + qemu_register_machine(&xtensa_lx200_machine); } -machine_init(xtensa_lx60_machine_init); +machine_init(xtensa_lx_machines_init); -- 1.7.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-31 22:17 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-10-30 18:03 [Qemu-devel] [PATCH 0/3] xtensa_lx60: FLASH, kernel args support, minor fixes Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 2/3] xtensa_lx60: pass kernel arguments from -append Max Filippov 2011-10-30 18:03 ` [Qemu-devel] [PATCH 3/3] xtensa_lx60: fix build date code and change memory region names Max Filippov -- strict thread matches above, loose matches on Subject: below -- 2011-10-31 22:17 [Qemu-devel] [PULL 0/7] target-xtensa patches for 1.0 Max Filippov 2011-10-31 22:17 ` [Qemu-devel] [PATCH 1/3] xtensa_lx60: add FLASH support Max Filippov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).