From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61E83C33CB1 for ; Wed, 15 Jan 2020 15:24:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EE532053B for ; Wed, 15 Jan 2020 15:24:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YK/UH4nP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EE532053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkWy-0002M7-Tk for qemu-devel@archiver.kernel.org; Wed, 15 Jan 2020 10:24:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48756) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkJy-0007Wm-By for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irkJu-00083M-0Z for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:02 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34441 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irkJt-000837-T3 for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:10:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579101057; 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=LTrBzTc2TMtid2u0PggUbIze7d3VHHkRtmTLCmvzIMs=; b=YK/UH4nPIhEmShQlYvQM5cv/e36hn1c0nOxDDxx6wLtQbbSeR9MRc+JqxwwVX7PReDT8pL /sAFUMcBx8rSnRNnbJUuz9DBYwIgSmMEinGItHQ1szEJVp2POAdXswoXgD6l80zMoJB0lT fX+lMWSdf+IS8U3/vDQMYmjM66B9ODg= 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-44-oRx6S2yaOW25-L_PhSIg2w-1; Wed, 15 Jan 2020 10:10:54 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02EA78DBF10; Wed, 15 Jan 2020 15:10:53 +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 F3945473D9; Wed, 15 Jan 2020 15:10:51 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 14/86] arm:highbank: use memdev for RAM Date: Wed, 15 Jan 2020 16:06:29 +0100 Message-Id: <1579100861-73692-15-git-send-email-imammedo@redhat.com> In-Reply-To: <1579100861-73692-1-git-send-email-imammedo@redhat.com> References: <1579100861-73692-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: oRx6S2yaOW25-L_PhSIg2w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: robh@kernel.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- CC: robh@kernel.org CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org --- hw/arm/highbank.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c index 518d935..ac9de94 100644 --- a/hw/arm/highbank.c +++ b/hw/arm/highbank.c @@ -236,7 +236,6 @@ enum cxmachines { */ static void calxeda_init(MachineState *machine, enum cxmachines machine_id= ) { - ram_addr_t ram_size =3D machine->ram_size; DeviceState *dev =3D NULL; SysBusDevice *busdev; qemu_irq pic[128]; @@ -247,7 +246,6 @@ static void calxeda_init(MachineState *machine, enum cx= machines machine_id) qemu_irq cpu_virq[4]; qemu_irq cpu_vfiq[4]; MemoryRegion *sysram; - MemoryRegion *dram; MemoryRegion *sysmem; char *sysboot_filename; =20 @@ -290,10 +288,8 @@ static void calxeda_init(MachineState *machine, enum c= xmachines machine_id) } =20 sysmem =3D get_system_memory(); - dram =3D g_new(MemoryRegion, 1); - memory_region_allocate_system_memory(dram, NULL, "highbank.dram", ram_= size); /* SDRAM at address zero. */ - memory_region_add_subregion(sysmem, 0, dram); + memory_region_add_subregion(sysmem, 0, machine->ram); =20 sysram =3D g_new(MemoryRegion, 1); memory_region_init_ram(sysram, NULL, "highbank.sysram", 0x8000, @@ -387,7 +383,7 @@ static void calxeda_init(MachineState *machine, enum cx= machines machine_id) =20 /* TODO create and connect IDE devices for ide_drive_get() */ =20 - highbank_binfo.ram_size =3D ram_size; + highbank_binfo.ram_size =3D machine->ram_size; /* highbank requires a dtb in order to boot, and the dtb will override * the board ID. The following value is ignored, so set it to -1 to be * clear that the value is meaningless. @@ -430,6 +426,7 @@ static void highbank_class_init(ObjectClass *oc, void *= data) mc->units_per_default_bus =3D 1; mc->max_cpus =3D 4; mc->ignore_memory_transaction_failures =3D true; + mc->default_ram_id =3D "highbank.dram"; } =20 static const TypeInfo highbank_type =3D { @@ -448,6 +445,7 @@ static void midway_class_init(ObjectClass *oc, void *da= ta) mc->units_per_default_bus =3D 1; mc->max_cpus =3D 4; mc->ignore_memory_transaction_failures =3D true; + mc->default_ram_id =3D "highbank.dram"; } =20 static const TypeInfo midway_type =3D { --=20 2.7.4