From nobody Mon Feb 9 19:25:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579782551; cv=none; d=zohomail.com; s=zohoarc; b=RDxnZJuolmXh7gZVuWWqHp40A7ywjX5p8HKKWa4bbXHdXiRSZ6HLSYJDfxlOBTwTrXTKcKG5yF72zA+Jj1NmzHsZIIxlP0VIu6nZdS/m2GwAnxc0xpPZ53SSkYqRzziEcs3sCvBfUl0PXOjfo+LA3mCfQZptZk5AF+cnq5xuSos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579782551; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=+FZpDj0ZrFCGGjPdBPyuMqvNVkjQsiI2/v2PAIWBrtU=; b=cvItzA8qvUY3STswnT1zA6WVpzo2h95WlvucBiwDkegXBBbo5wUxmIHEYgh9WQtC8Ux+0I/FAG3XocundKxJ5HprR4GvaKQq12p0A4c8f9luDhqrTJ2pHtoBCImqfREaZnwgr/Gal3RVOW7W/j45uTF/ATMjnrTiGIk1hLNGZmY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579782551840646.5738593552251; Thu, 23 Jan 2020 04:29:11 -0800 (PST) Received: from localhost ([::1]:56180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubbi-000587-3e for importer@patchew.org; Thu, 23 Jan 2020 07:29:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36357) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuati-0008Lz-7f for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuatf-0005A9-Sd for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:42 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:28626 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuatf-00059v-ON for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-196-qXTeNf_rMD-Y-zi5z1-e1w-1; Thu, 23 Jan 2020 06:43:35 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A0D57107ACC4; Thu, 23 Jan 2020 11:43:34 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78088100164D; Thu, 23 Jan 2020 11:43:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+FZpDj0ZrFCGGjPdBPyuMqvNVkjQsiI2/v2PAIWBrtU=; b=eSZYHbIZiOf2vRHUU30iua0EoEmo/phP4OShRi8+vpR4lvhnrGwGTYl6Am7u4xpGOAwnrA aggywGMRkAsOg24ylEo5PRmEpLapv0wyETx6OEskwMxwUc1b6SiFiMKKCKU64fsfpMcfpc 2DLBdO46zWM1N4tA7OD6e4QldGRrFaA= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 66/80] ppc/prep: use memdev for RAM Date: Thu, 23 Jan 2020 12:38:31 +0100 Message-Id: <1579779525-20065-67-git-send-email-imammedo@redhat.com> In-Reply-To: <1579779525-20065-1-git-send-email-imammedo@redhat.com> References: <1579779525-20065-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: qXTeNf_rMD-Y-zi5z1-e1w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, hpoussin@reactos.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Acked-by: David Gibson Acked-by: Mark Cave-Ayland --- CC: hpoussin@reactos.org CC: david@gibson.dropbear.id.au CC: qemu-ppc@nongnu.org --- hw/ppc/prep.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index 862345c..bf75dde 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -400,7 +400,6 @@ static int PPC_NVRAM_set_params (Nvram *nvram, uint16_t= NVRAM_size, /* PowerPC PREP hardware initialisation */ static void ppc_prep_init(MachineState *machine) { - ram_addr_t ram_size =3D machine->ram_size; const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; const char *initrd_filename =3D machine->initrd_filename; @@ -413,7 +412,6 @@ static void ppc_prep_init(MachineState *machine) MemoryRegion *xcsr =3D g_new(MemoryRegion, 1); #endif int linux_boot, i, nb_nics1; - MemoryRegion *ram =3D g_new(MemoryRegion, 1); uint32_t kernel_base, initrd_base; long kernel_size, initrd_size; DeviceState *dev; @@ -444,15 +442,14 @@ static void ppc_prep_init(MachineState *machine) qemu_register_reset(ppc_prep_reset, cpu); } =20 - /* allocate RAM */ - memory_region_allocate_system_memory(ram, NULL, "ppc_prep.ram", ram_si= ze); - memory_region_add_subregion(sysmem, 0, ram); + /* map RAM */ + memory_region_add_subregion(sysmem, 0, machine->ram); =20 if (linux_boot) { kernel_base =3D KERNEL_LOAD_ADDR; /* now we can load the kernel */ kernel_size =3D load_image_targphys(kernel_filename, kernel_base, - ram_size - kernel_base); + machine->ram_size - kernel_base); if (kernel_size < 0) { error_report("could not load kernel '%s'", kernel_filename); exit(1); @@ -461,7 +458,7 @@ static void ppc_prep_init(MachineState *machine) if (initrd_filename) { initrd_base =3D INITRD_LOAD_ADDR; initrd_size =3D load_image_targphys(initrd_filename, initrd_ba= se, - ram_size - initrd_base); + machine->ram_size - initrd_b= ase); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -576,7 +573,7 @@ static void ppc_prep_init(MachineState *machine) sysctrl->nvram =3D m48t59; =20 /* Initialise NVRAM */ - PPC_NVRAM_set_params(m48t59, NVRAM_SIZE, "PREP", ram_size, + PPC_NVRAM_set_params(m48t59, NVRAM_SIZE, "PREP", machine->ram_size, ppc_boot_device, kernel_base, kernel_size, kernel_cmdline, @@ -596,6 +593,7 @@ static void prep_machine_init(MachineClass *mc) mc->default_boot_order =3D "cad"; mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("602"); mc->default_display =3D "std"; + mc->default_ram_id =3D "ppc_prep.ram"; } =20 static int prep_set_cmos_checksum(DeviceState *dev, void *opaque) @@ -814,6 +812,7 @@ static void ibm_40p_machine_init(MachineClass *mc) mc->init =3D ibm_40p_init; mc->max_cpus =3D 1; mc->default_ram_size =3D 128 * MiB; + mc->default_ram_id =3D "ppc_prep.ram"; mc->block_default_type =3D IF_SCSI; mc->default_boot_order =3D "c"; mc->default_cpu_type =3D POWERPC_CPU_TYPE_NAME("604"); --=20 2.7.4