* [Qemu-devel] [PATCH v3] target/xtensa: xtfpga: provide default memory sizes
@ 2018-11-21 18:58 Max Filippov
2018-11-22 1:13 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 2+ messages in thread
From: Max Filippov @ 2018-11-21 18:58 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Max Filippov
Provide default RAM sizes for all XTFPGA boards, so that when started
without -m option they do the right thing.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Changes v2->v3:
- add XTFPGA_MMU_RESERVED_MEMORY_SIZE definition and express Xilinx board
memory sizes using it as suggested by Philippe;
Changes v1->v2:
- fix memory sizes for ml605 and kc705 with MMU
hw/xtensa/xtfpga.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index b3161de32093..21094319a659 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -446,6 +446,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
}
}
+#define XTFPGA_MMU_RESERVED_MEMORY_SIZE (128 * MiB)
+
static const hwaddr xtfpga_mmu_io[2] = {
0xf0000000,
};
@@ -568,6 +570,7 @@ static void xtfpga_lx60_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_lx60_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_ram_size = 64 * MiB;
}
static const TypeInfo xtfpga_lx60_type = {
@@ -584,6 +587,7 @@ static void xtfpga_lx60_nommu_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_lx60_nommu_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
+ mc->default_ram_size = 64 * MiB;
}
static const TypeInfo xtfpga_lx60_nommu_type = {
@@ -600,6 +604,7 @@ static void xtfpga_lx200_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_lx200_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_ram_size = 96 * MiB;
}
static const TypeInfo xtfpga_lx200_type = {
@@ -616,6 +621,7 @@ static void xtfpga_lx200_nommu_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_lx200_nommu_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
+ mc->default_ram_size = 96 * MiB;
}
static const TypeInfo xtfpga_lx200_nommu_type = {
@@ -632,6 +638,7 @@ static void xtfpga_ml605_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_ml605_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_ram_size = 512 * MiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;
}
static const TypeInfo xtfpga_ml605_type = {
@@ -648,6 +655,7 @@ static void xtfpga_ml605_nommu_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_ml605_nommu_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
+ mc->default_ram_size = 256 * MiB;
}
static const TypeInfo xtfpga_ml605_nommu_type = {
@@ -664,6 +672,7 @@ static void xtfpga_kc705_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_kc705_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
+ mc->default_ram_size = 1 * GiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;
}
static const TypeInfo xtfpga_kc705_type = {
@@ -680,6 +689,7 @@ static void xtfpga_kc705_nommu_class_init(ObjectClass *oc, void *data)
mc->init = xtfpga_kc705_nommu_init;
mc->max_cpus = 4;
mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
+ mc->default_ram_size = 256 * MiB;
}
static const TypeInfo xtfpga_kc705_nommu_type = {
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v3] target/xtensa: xtfpga: provide default memory sizes
2018-11-21 18:58 [Qemu-devel] [PATCH v3] target/xtensa: xtfpga: provide default memory sizes Max Filippov
@ 2018-11-22 1:13 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2018-11-22 1:13 UTC (permalink / raw)
To: Max Filippov, qemu-devel
On 21/11/18 19:58, Max Filippov wrote:
> Provide default RAM sizes for all XTFPGA boards, so that when started
> without -m option they do the right thing.
>
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Changes v2->v3:
> - add XTFPGA_MMU_RESERVED_MEMORY_SIZE definition and express Xilinx board
> memory sizes using it as suggested by Philippe;
Thanks for your v3, this is now very clean!
>
> Changes v1->v2:
> - fix memory sizes for ml605 and kc705 with MMU
>
>
> hw/xtensa/xtfpga.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
> index b3161de32093..21094319a659 100644
> --- a/hw/xtensa/xtfpga.c
> +++ b/hw/xtensa/xtfpga.c
> @@ -446,6 +446,8 @@ static void xtfpga_init(const XtfpgaBoardDesc *board, MachineState *machine)
> }
> }
>
> +#define XTFPGA_MMU_RESERVED_MEMORY_SIZE (128 * MiB)
> +
> static const hwaddr xtfpga_mmu_io[2] = {
> 0xf0000000,
> };
> @@ -568,6 +570,7 @@ static void xtfpga_lx60_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_lx60_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
> + mc->default_ram_size = 64 * MiB;
> }
>
> static const TypeInfo xtfpga_lx60_type = {
> @@ -584,6 +587,7 @@ static void xtfpga_lx60_nommu_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_lx60_nommu_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
> + mc->default_ram_size = 64 * MiB;
> }
>
> static const TypeInfo xtfpga_lx60_nommu_type = {
> @@ -600,6 +604,7 @@ static void xtfpga_lx200_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_lx200_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
> + mc->default_ram_size = 96 * MiB;
> }
>
> static const TypeInfo xtfpga_lx200_type = {
> @@ -616,6 +621,7 @@ static void xtfpga_lx200_nommu_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_lx200_nommu_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
> + mc->default_ram_size = 96 * MiB;
> }
>
> static const TypeInfo xtfpga_lx200_nommu_type = {
> @@ -632,6 +638,7 @@ static void xtfpga_ml605_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_ml605_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
> + mc->default_ram_size = 512 * MiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;
> }
>
> static const TypeInfo xtfpga_ml605_type = {
> @@ -648,6 +655,7 @@ static void xtfpga_ml605_nommu_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_ml605_nommu_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
> + mc->default_ram_size = 256 * MiB;
> }
>
> static const TypeInfo xtfpga_ml605_nommu_type = {
> @@ -664,6 +672,7 @@ static void xtfpga_kc705_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_kc705_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_TYPE;
> + mc->default_ram_size = 1 * GiB - XTFPGA_MMU_RESERVED_MEMORY_SIZE;
> }
>
> static const TypeInfo xtfpga_kc705_type = {
> @@ -680,6 +689,7 @@ static void xtfpga_kc705_nommu_class_init(ObjectClass *oc, void *data)
> mc->init = xtfpga_kc705_nommu_init;
> mc->max_cpus = 4;
> mc->default_cpu_type = XTENSA_DEFAULT_CPU_NOMMU_TYPE;
> + mc->default_ram_size = 256 * MiB;
> }
>
> static const TypeInfo xtfpga_kc705_nommu_type = {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-22 1:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-21 18:58 [Qemu-devel] [PATCH v3] target/xtensa: xtfpga: provide default memory sizes Max Filippov
2018-11-22 1:13 ` Philippe Mathieu-Daudé
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).