From: Igor Mammedov <imammedo@redhat.com>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: edgar.iglesias@gmail.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH v2 71/86] ppc:virtex_ml507: use memdev for RAM
Date: Thu, 16 Jan 2020 13:12:57 +0100 [thread overview]
Message-ID: <20200116131257.50b274ee@redhat.com> (raw)
In-Reply-To: <20200116043157.GN54439@umbus>
On Thu, 16 Jan 2020 14:31:57 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:
> On Wed, Jan 15, 2020 at 04:07:26PM +0100, Igor Mammedov wrote:
> > memory_region_allocate_system_memory() API is going away, so
> > replace it with memdev allocated MemoryRegion. The later is
> > initialized by generic code, so board only needs to opt in
> > to memdev scheme by providing
> > MachineClass::default_ram_id
> > and using MachineState::ram instead of manually initializing
> > RAM memory region.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
>
> Since this is (AFAICT) independent of the main purpose of your series,
> I've also applied it to my ppc-for-5.0 tree. If we get a conflict
> because of that it should be easy to resolve.
this patch depends on 1-5/86 as prerequsites,
so pls drop it from your queue.
What could be merged independently is patches with following
phrases in title:
"drop RAM size fixup"
"add RAM size checks"
that should help by reducing size of this series a bit.
> > ---
> > CC: david@gibson.dropbear.id.au
> > CC: qemu-ppc@nongnu.org
> > CC: edgar.iglesias@gmail.com
> > ---
> > hw/ppc/virtex_ml507.c | 12 +++++-------
> > 1 file changed, 5 insertions(+), 7 deletions(-)
> >
> > diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
> > index 651d8db..b74a269 100644
> > --- a/hw/ppc/virtex_ml507.c
> > +++ b/hw/ppc/virtex_ml507.c
> > @@ -193,7 +193,6 @@ static int xilinx_load_device_tree(hwaddr addr,
> >
> > static void virtex_init(MachineState *machine)
> > {
> > - ram_addr_t ram_size = machine->ram_size;
> > const char *kernel_filename = machine->kernel_filename;
> > const char *kernel_cmdline = machine->kernel_cmdline;
> > hwaddr initrd_base = 0;
> > @@ -204,7 +203,6 @@ static void virtex_init(MachineState *machine)
> > CPUPPCState *env;
> > hwaddr ram_base = 0;
> > DriveInfo *dinfo;
> > - MemoryRegion *phys_ram = g_new(MemoryRegion, 1);
> > qemu_irq irq[32], *cpu_irq;
> > int kernel_size;
> > int i;
> > @@ -221,8 +219,7 @@ static void virtex_init(MachineState *machine)
> >
> > qemu_register_reset(main_cpu_reset, cpu);
> >
> > - memory_region_allocate_system_memory(phys_ram, NULL, "ram", ram_size);
> > - memory_region_add_subregion(address_space_mem, ram_base, phys_ram);
> > + memory_region_add_subregion(address_space_mem, ram_base, machine->ram);
> >
> > dinfo = drive_get(IF_PFLASH, 0, 0);
> > pflash_cfi01_register(PFLASH_BASEADDR, "virtex.flash", FLASH_SIZE,
> > @@ -265,7 +262,7 @@ static void virtex_init(MachineState *machine)
> > /* If we failed loading ELF's try a raw image. */
> > kernel_size = load_image_targphys(kernel_filename,
> > boot_offset,
> > - ram_size);
> > + machine->ram_size);
> > boot_info.bootstrap_pc = boot_offset;
> > high = boot_info.bootstrap_pc + kernel_size + 8192;
> > }
> > @@ -276,7 +273,7 @@ static void virtex_init(MachineState *machine)
> > if (machine->initrd_filename) {
> > initrd_base = high = ROUND_UP(high, 4);
> > initrd_size = load_image_targphys(machine->initrd_filename,
> > - high, ram_size - high);
> > + high, machine->ram_size - high);
> >
> > if (initrd_size < 0) {
> > error_report("couldn't load ram disk '%s'",
> > @@ -290,7 +287,7 @@ static void virtex_init(MachineState *machine)
> > boot_info.fdt = high + (8192 * 2);
> > boot_info.fdt &= ~8191;
> >
> > - xilinx_load_device_tree(boot_info.fdt, ram_size,
> > + xilinx_load_device_tree(boot_info.fdt, machine->ram_size,
> > initrd_base, initrd_size,
> > kernel_cmdline);
> > }
> > @@ -302,6 +299,7 @@ static void virtex_machine_init(MachineClass *mc)
> > mc->desc = "Xilinx Virtex ML507 reference design";
> > mc->init = virtex_init;
> > mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("440-xilinx");
> > + mc->default_ram_id = "ram";
> > }
> >
> > DEFINE_MACHINE("virtex-ml507", virtex_machine_init)
>
next prev parent reply other threads:[~2020-01-16 12:14 UTC|newest]
Thread overview: 212+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 15:06 [PATCH v2 00/86] refactor main RAM allocation to use hostmem backend Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 01/86] numa: remove deprecated -mem-path fallback to anonymous RAM Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 02/86] machine: introduce ram-memdev property Igor Mammedov
2020-01-15 15:56 ` Paolo Bonzini
2020-01-15 16:39 ` Igor Mammedov
2020-01-15 16:57 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 03/86] machine: alias -mem-path and -mem-prealloc into memory-foo backend Igor Mammedov
2020-01-15 18:54 ` Philippe Mathieu-Daudé
2020-01-16 12:20 ` Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 04/86] machine: introduce convenience MachineState::ram Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 05/86] initialize MachineState::ram in NUMA case Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 06/86] alpha:dp264: use memdev for RAM Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 07/86] arm:aspeed: convert valid RAM sizes to data Igor Mammedov
2020-01-16 1:45 ` Joel Stanley
2020-01-15 15:06 ` [PATCH v2 08/86] arm:aspeed: actually check RAM size Igor Mammedov
2020-01-16 8:41 ` Cédric Le Goater
2020-01-16 17:35 ` Igor Mammedov
2020-01-17 7:56 ` Cédric Le Goater
2020-01-20 14:21 ` [PATCH v3 07/84] hw/arm/aspeed: " Igor Mammedov
2020-01-20 15:33 ` Cédric Le Goater
2020-01-15 15:06 ` [PATCH v2 09/86] hw:aspeed: drop warning and bogus ram_size fixup Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 10/86] arm:aspeed: use memdev for RAM Igor Mammedov
2020-01-15 19:19 ` Philippe Mathieu-Daudé
2020-01-16 9:24 ` Cédric Le Goater
2020-01-16 18:17 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 11/86] arm:collie: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 12/86] arm:cubieboard: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 13/86] arm:digic_boards: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 14/86] arm:highbank: " Igor Mammedov
2020-01-15 19:18 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 15/86] arm:imx25_pdk: drop RAM size fixup Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 16/86] arm:imx25_pdk: use memdev for RAM Igor Mammedov
2020-01-15 19:18 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 17/86] arm:integratorcp: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 18/86] arm:kzm: drop RAM size fixup Igor Mammedov
2020-01-15 19:58 ` Chubb, Peter (Data61, Kensington NSW)
2020-01-16 17:26 ` [PATCH v3 " Igor Mammedov
2020-01-16 18:22 ` Philippe Mathieu-Daudé
2020-01-17 9:50 ` Igor Mammedov
2020-01-17 13:07 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 19/86] arm:kzm: use memdev for RAM Igor Mammedov
2020-01-15 20:09 ` Chubb, Peter (Data61, Kensington NSW)
2020-01-15 15:06 ` [PATCH v2 20/86] arm:mcimx6ul-evk: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 21/86] arm:mcimx7d-sabre: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 22/86] arm:mps2-tz: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 23/86] arm:mps2: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 24/86] arm:musicpal: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 25/86] arm:nseries: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 26/86] arm:omap_sx1: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 27/86] arm:palm: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 28/86] arm:raspi: " Igor Mammedov
2020-01-15 19:07 ` Philippe Mathieu-Daudé
2020-01-16 16:55 ` Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 29/86] arm:sabrelite: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 30/86] arm:sbsa-ref: " Igor Mammedov
2020-01-15 19:09 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 31/86] arm:versatilepb: " Igor Mammedov
2020-01-15 19:20 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 32/86] arm:vexpress: " Igor Mammedov
2020-01-15 19:21 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 33/86] arm:virt: " Igor Mammedov
2020-01-15 18:57 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 34/86] arm:xilinx_zynq: drop RAM size fixup Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 35/86] arm:xilinx_zynq: use memdev for RAM Igor Mammedov
2020-01-15 19:01 ` Philippe Mathieu-Daudé
2020-01-16 0:20 ` Alistair Francis
2020-01-15 15:06 ` [PATCH v2 36/86] arm:xlnx-versal-virt: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 37/86] arm:xlnx-zcu102: " Igor Mammedov
2020-01-15 19:21 ` Philippe Mathieu-Daudé
2020-01-16 0:19 ` Alistair Francis
2020-01-15 15:06 ` [PATCH v2 38/86] s390x:s390-virtio-ccw: " Igor Mammedov
2020-01-15 19:22 ` Philippe Mathieu-Daudé
2020-01-16 8:22 ` David Hildenbrand
2020-01-15 15:06 ` [PATCH v2 39/86] null-machine: " Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 40/86] cris:axis_dev88: " Igor Mammedov
2020-01-15 18:20 ` Philippe Mathieu-Daudé
2020-01-15 15:06 ` [PATCH v2 41/86] hw/hppa/machine: Correctly check the firmware is in PDC range Igor Mammedov
2020-01-15 18:15 ` BALATON Zoltan
2020-01-15 19:14 ` Philippe Mathieu-Daudé
2020-01-15 21:59 ` BALATON Zoltan
2020-01-16 15:14 ` Philippe Mathieu-Daudé
2020-01-16 16:34 ` Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 42/86] hw/hppa/machine: Restrict the total memory size to 3GB Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 43/86] hw/hppa/machine: Map the PDC memory region with higher priority Igor Mammedov
2020-01-15 15:06 ` [PATCH v2 44/86] hppa: use memdev for RAM Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 45/86] x86:microvm: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 46/86] x86:pc: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 47/86] lm32:lm32_boards: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 48/86] lm32:milkymist: " Igor Mammedov
2020-01-15 18:32 ` Philippe Mathieu-Daudé
2020-01-16 16:25 ` Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 49/86] m68k:an5206: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 50/86] m68k:mcf5208: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 51/86] m68k:next-cube: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 52/86] mips:boston-cube: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 53/86] mips:mips_fulong2e: drop RAM size fixup Igor Mammedov
2020-01-15 18:19 ` BALATON Zoltan
2020-01-16 14:12 ` [PATCH v3 " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 54/86] mips:mips_fulong2e: use memdev for RAM Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 55/86] mips:mips_jazz: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 56/86] mips:mips_malta: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 57/86] mips:mips_mipssim: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 58/86] mips:mips_r4k: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 59/86] ppc:e500: drop RAM size fixup Igor Mammedov
2020-01-16 1:08 ` David Gibson
2020-01-15 15:07 ` [PATCH v2 60/86] ppc:e500: use memdev for RAM Igor Mammedov
2020-01-16 2:00 ` David Gibson
2020-01-15 15:07 ` [PATCH v2 61/86] ppc:mac_newworld: " Igor Mammedov
2020-01-16 2:01 ` David Gibson
2020-01-16 8:48 ` Mark Cave-Ayland
2020-01-15 15:07 ` [PATCH v2 62/86] ppc:mac_oldworld: " Igor Mammedov
2020-01-16 2:02 ` David Gibson
2020-01-16 8:48 ` Mark Cave-Ayland
2020-01-15 15:07 ` [PATCH v2 63/86] ppc:pnv: " Igor Mammedov
2020-01-16 2:03 ` David Gibson
2020-01-16 8:16 ` Cédric Le Goater
2020-01-15 15:07 ` [PATCH v2 64/86] ppc:ppc405_boards: add RAM size checks Igor Mammedov
2020-01-15 18:24 ` BALATON Zoltan
2020-01-16 16:19 ` [PATCH v3 " Igor Mammedov
2020-01-16 4:20 ` [PATCH v2 " David Gibson
2020-01-15 15:07 ` [PATCH v2 65/86] ppc:ppc405_boards: use memdev for RAM Igor Mammedov
2020-01-16 4:21 ` David Gibson
2020-01-15 15:07 ` [PATCH v2 66/86] ppc/{ppc440_bamboo,sam460x}: drop RAM size fixup Igor Mammedov
2020-01-15 21:33 ` BALATON Zoltan
2020-01-17 10:46 ` Igor Mammedov
2020-01-17 15:38 ` [PATCH v2 66/86] ppc/{ppc440_bamboo, sam460x}: " Philippe Mathieu-Daudé
2020-01-17 16:39 ` [PATCH v2 66/86] ppc/{ppc440_bamboo,sam460x}: " Igor Mammedov
2020-01-17 17:32 ` BALATON Zoltan
2020-01-20 15:14 ` [PATCH v3 64/84] ppc/{ppc440_bamboo,sam460ex}: " Igor Mammedov
2020-01-20 17:02 ` BALATON Zoltan
2020-01-21 8:26 ` Igor Mammedov
2020-01-21 16:41 ` [PATCH v3 64/82] " Igor Mammedov
2020-01-21 19:31 ` BALATON Zoltan
2020-01-22 8:56 ` Igor Mammedov
2020-01-22 16:01 ` BALATON Zoltan
2020-01-16 4:24 ` [PATCH v2 66/86] ppc/{ppc440_bamboo, sam460x}: " David Gibson
2020-01-15 15:07 ` [PATCH v2 67/86] ppc:ppc440_bamboo/sam460ex: use memdev for RAM Igor Mammedov
2020-01-15 21:36 ` BALATON Zoltan
2020-01-20 15:17 ` [PATCH v3 65/84] ppc/{ppc440_bamboo, sam460ex}: " Igor Mammedov
2020-01-21 16:43 ` [PATCH v3 65/82] " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 68/86] ppc:prep: " Igor Mammedov
2020-01-16 4:26 ` David Gibson
2020-01-16 12:15 ` Igor Mammedov
2020-01-16 8:50 ` Mark Cave-Ayland
2020-01-15 15:07 ` [PATCH v2 69/86] ppc:spapr: " Igor Mammedov
2020-01-16 4:27 ` David Gibson
2020-01-15 15:07 ` [PATCH v2 70/86] ppc:virtex_ml507: remove unused arguments Igor Mammedov
2020-01-15 17:01 ` Philippe Mathieu-Daudé
2020-01-15 15:07 ` [PATCH v2 71/86] ppc:virtex_ml507: use memdev for RAM Igor Mammedov
2020-01-15 18:37 ` Philippe Mathieu-Daudé
2020-01-16 4:31 ` David Gibson
2020-01-16 12:12 ` Igor Mammedov [this message]
2020-01-16 4:35 ` David Gibson
2020-01-15 15:07 ` [PATCH v2 72/86] sparc:leon3: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 73/86] sparc:sun4m: " Igor Mammedov
2020-01-16 9:12 ` Mark Cave-Ayland
2020-01-15 15:07 ` [PATCH v2 74/86] sparc:niagara: " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 75/86] remove no longer used memory_region_allocate_system_memory() Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 76/86] post conversion default_ram_id cleanup Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 77/86] exec: cleanup qemu_minrampagesize()/qemu_maxrampagesize() Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 78/86] exec: drop bogus mem_path from qemu_ram_alloc_from_fd() Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 79/86] make mem_path local variable Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 80/86] hostmem: introduce "prealloc-threads" property Igor Mammedov
2020-01-15 16:03 ` Paolo Bonzini
2020-01-15 17:15 ` [PATCH v3 " Igor Mammedov
2020-01-15 18:21 ` BALATON Zoltan
2020-01-16 12:45 ` [PATCH v3.1 " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 81/86] hostmem: fix strict bind policy Igor Mammedov
2020-01-15 17:17 ` [PATCH v3 " Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 82/86] numa: forbid '-numa node, mem' for 5.0 and newer machine types Igor Mammedov
2020-01-15 15:34 ` [libvirt] " Peter Krempa
2020-01-15 16:52 ` Igor Mammedov
2020-01-16 10:42 ` Michal Privoznik
2020-01-16 12:37 ` Igor Mammedov
2020-01-16 13:03 ` Michal Privoznik
2020-01-16 13:49 ` Igor Mammedov
2020-01-16 13:06 ` Daniel P. Berrangé
2020-01-16 13:58 ` Igor Mammedov
2020-01-16 4:36 ` David Gibson
2020-01-15 15:07 ` [PATCH v2 83/86] tests:numa-test: make top level args dynamic and g_autofree(cli) cleanups Igor Mammedov
2020-01-16 16:35 ` Thomas Huth
2020-01-16 17:06 ` Igor Mammedov
2020-01-17 11:14 ` Thomas Huth
2020-01-17 13:33 ` Igor Mammedov
2020-01-17 13:52 ` Thomas Huth
2020-01-17 14:02 ` Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 84/86] tests:numa-test: use explicit memdev to specify node RAM Igor Mammedov
2020-01-15 15:07 ` [PATCH v2 85/86] numa: make exit() usage consistent Igor Mammedov
2020-01-16 15:40 ` Philippe Mathieu-Daudé
2020-01-16 16:43 ` Thomas Huth
2020-01-16 17:10 ` Igor Mammedov
2020-01-17 7:24 ` Thomas Huth
2020-01-17 8:06 ` Philippe Mathieu-Daudé
2020-01-17 8:26 ` Thomas Huth
2020-01-17 8:30 ` Thomas Huth
2020-01-15 15:07 ` [PATCH v2 86/86] numa: remove deprecated implicit RAM distribution between nodes Igor Mammedov
2020-01-15 16:42 ` [PATCH v2 00/86] refactor main RAM allocation to use hostmem backend no-reply
2020-01-15 16:43 ` no-reply
2020-01-15 17:09 ` Igor Mammedov
2020-01-15 19:13 ` Philippe Mathieu-Daudé
2020-01-15 23:23 ` Richard Henderson
2020-01-15 18:14 ` no-reply
2020-01-15 18:16 ` no-reply
2020-01-15 19:39 ` no-reply
2020-01-15 20:11 ` no-reply
2020-01-15 21:01 ` no-reply
2020-01-16 15:43 ` Philippe Mathieu-Daudé
2020-01-17 16:03 ` Igor Mammedov
2020-01-17 16:19 ` Philippe Mathieu-Daudé
2020-01-17 16:40 ` Igor Mammedov
2020-01-17 16:49 ` Philippe Mathieu-Daudé
2020-01-15 21:02 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200116131257.50b274ee@redhat.com \
--to=imammedo@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=edgar.iglesias@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).