Received: by 2002:a05:6512:3aa:0:0:0:0 with SMTP id v10csp555117lfp; Thu, 23 Jan 2020 03:51:03 -0800 (PST) X-Google-Smtp-Source: APXvYqxEGBzjebSdH/Yo5fEwn+2k+1gT1pHCDxuw0GrI/jS4FSdoLUXUJG/wlVLkSSJhHSg4iOZ0 X-Received: by 2002:a37:9acb:: with SMTP id c194mr15106627qke.291.1579780263111; Thu, 23 Jan 2020 03:51:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579780263; cv=none; d=google.com; s=arc-20160816; b=zlR1E/tn6XTl1iRJlJW1dlQBHAIjUvmqs+8UulsVZdW8ybHuAgXOYkuYLOm3FiAhmZ h8KOgSSyQ15I7lFywVjA7LZ4MplRJ1GIdCrwRL/XcMtA4Koo5Su2p3ulvLyk8ka0Ogf6 dC5umSxWr3cGJ5rivyLTjjoMMxC5jKGMq/0HA9Uri8QMpv3Kna4aIBfuc2ROfLBm79Nf Jm4jdmiFWm6LJgafha0vjCc2h8YSozYiMIyKxd0Y+XqKtO0KPM5DIwam4dqQEM+U68o8 o0dLaE40AWz9a0uA4+ttCDr9j/xkEbZmeshxLKDmk2TE2aZ3rzECETp7rS7QcZUyx8ac 1C5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=iUzxQqEmJjJ2Uyw+aub0P/ov8dlVJvwKPJXfgjDOLeM=; b=taZHckUJ4YFvn7dQkiNKTFyFdgTTNaqs1SIlS0xNH5RVV8CLFQ/JByllx+TTTRalkJ JlMpo7OASgI8R7/p3qXyxwDLai8db8lhRgVo8OcmBSrKbKVJUlfjRdEW6CnMjEHPpfZP m8EXnkE0c1UdPiJxXE3swQaXqyBR7camU0HkGoT7AFNDeSMAkIk5MA+lx7ImAO/j0HjV 1Y2cYZkBbZoHqCK/S6v1dFF8TqxrKkz5JJCNUjzV8NUJ6ys4aZ91Z/eyn4uvMTsNFKkD uXzM/pXm//dOijsYd87EsAm593R/7DB4S7BLtlkBZp8GvuD7CgJPiZowQONDPXoZSChq YIdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Av90XMvg; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x6si1272671qkf.79.2020.01.23.03.51.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 Jan 2020 03:51:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Av90XMvg; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:55358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub0n-0007pt-SO for alex.bennee@linaro.org; Thu, 23 Jan 2020 06:51:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35016) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuare-0005Do-7r for qemu-arm@nongnu.org; Thu, 23 Jan 2020 06:41:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuard-00040O-0N for qemu-arm@nongnu.org; Thu, 23 Jan 2020 06:41:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50613 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 1iuarc-0003zv-Ss for qemu-arm@nongnu.org; Thu, 23 Jan 2020 06:41:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iUzxQqEmJjJ2Uyw+aub0P/ov8dlVJvwKPJXfgjDOLeM=; b=Av90XMvgi56FRnB4Xf7Sc7kuzMkPsbMBFpQOBvoIPVAOIYRPUsoWQqC108qIHrCyOJib/1 Iqb2FfauAytYYNTdCjStb3JPOMPTZfzcRNPw6VxDvj0ncxKQgrA94l48tEDnw2V3aywb8f OTCMF9Yk7jtaVhh2loz/FdkgDZt+mok= 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-315-ohi6GNFWOMqVm-K8sdDyUg-1; Thu, 23 Jan 2020 06:41:28 -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 04C908010DB; Thu, 23 Jan 2020 11:41:27 +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 E23F3106F957; Thu, 23 Jan 2020 11:41:25 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 12/80] arm/highbank: use memdev for RAM Date: Thu, 23 Jan 2020 12:37:37 +0100 Message-Id: <1579779525-20065-13-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> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: ohi6GNFWOMqVm-K8sdDyUg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: xKyo9qIcFB76 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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