From patchwork Tue Feb 25 11:49:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11403435 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D0B8A1580 for ; Tue, 25 Feb 2020 12:12:35 +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 A72972084E for ; Tue, 25 Feb 2020 12:12:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HFPvZADx" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A72972084E 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:53832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6Z4k-0003Fi-Lx for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Feb 2020 07:12:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49390) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6YkY-0000g6-VV for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:51:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6YkV-0006jS-1x for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:51:42 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6YkU-0006f4-Pv for qemu-devel@nongnu.org; Tue, 25 Feb 2020 06:51:38 -0500 Received: by mail-wm1-x32f.google.com with SMTP id q9so2665278wmj.5 for ; Tue, 25 Feb 2020 03:51:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zWmZ61z0msAJ4D8mcX7IeohKOn0UBeDe9d8kqdQ3OKo=; b=HFPvZADxkGx3nnJAI3T0XB2JiZL/+SYdQivUhl8psmetT8oCYfn93mssn1yI9S9N67 Xf/mOPiGzVByJWIxqYIJxF1tckz9RGSq7ghFevOhamz/fHa6BiBWIGuk179jaOnDqH7h ooPu9nKMCIGOcWMtdyVTYoZ3a3bJAqCcwZjnmzBscIFiW+4GZ+NujTVGMUrZ4dVqFJWb EqJkbzRVbEOrCuEemFJt8R/9Fot6/zmpdTyhkaNM5uYV6eHc5aipZu2mzgOyAAQlpwhW O6uRG+rXfZ8Rz/DcUrskI8d11y+E8KQIVlp9uhui3y9nCLhdP2kBLxorhgOQd3gutamu 4SOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zWmZ61z0msAJ4D8mcX7IeohKOn0UBeDe9d8kqdQ3OKo=; b=Hr7WxmyZIiytqnZTxIphUQYBeEjkRZ8RGgyCBM3dhoPxrTJFXPyk5v5mx1IZJ5+LDA /uQb39Scw8njDSl2NGekaUqSbWK9+BNDM7bmK6uUoWl4mtK78uuuw8LcuFgTOBZvjd/6 I+u5wuWh7708U0KkM/ixfq4vmWkB9Av32pqRK4Z5FLpv1zRfjt/4D5q/FLZQ9n9vHT8x n9dhbCpXUCYzBana8S/1a/C49hWFzTMbGHgZUXNv7myO0BEdILMth0kMQFx9dFzzswkZ +6s2T3hXqe0mB4B/drhLjeKOcGvIL5ewVWccHySPYRvuc1HJ4Y19ykPTrlHJ3FkSKW4S tm/w== X-Gm-Message-State: APjAAAUtOZqYe8EtB/LFt3T4m2nMA8M4q0nBw66NzWSO+rxzyTZQnpXQ 33bpqBbpx8Y3jDgijLgvHzlzPSfS X-Google-Smtp-Source: APXvYqzyODzZ566gpNG6NQ26WERv7DNoN2y+9U+skiDDz231wtoGMCgi3a0ituiR7XxYF7ETjpXypg== X-Received: by 2002:a7b:c088:: with SMTP id r8mr4987857wmh.18.1582631496733; Tue, 25 Feb 2020 03:51:36 -0800 (PST) Received: from 640k.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id b67sm3922326wmc.38.2020.02.25.03.51.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Feb 2020 03:51:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 032/136] arm/vexpress: use memdev for RAM Date: Tue, 25 Feb 2020 12:49:22 +0100 Message-Id: <1582631466-13880-32-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582631466-13880-1-git-send-email-pbonzini@redhat.com> References: <1582631466-13880-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f 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: Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Igor Mammedov 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é Reviewed-by: Richard Henderson Message-Id: <20200219160953.13771-33-imammedo@redhat.com> --- hw/arm/vexpress.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 4673a88..ed683ee 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -273,7 +273,6 @@ static void a9_daughterboard_init(const VexpressMachineState *vms, { MachineState *machine = MACHINE(vms); MemoryRegion *sysmem = get_system_memory(); - MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *lowram = g_new(MemoryRegion, 1); ram_addr_t low_ram_size; @@ -283,8 +282,6 @@ static void a9_daughterboard_init(const VexpressMachineState *vms, exit(1); } - memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem", - ram_size); low_ram_size = ram_size; if (low_ram_size > 0x4000000) { low_ram_size = 0x4000000; @@ -293,9 +290,10 @@ static void a9_daughterboard_init(const VexpressMachineState *vms, * address space should in theory be remappable to various * things including ROM or RAM; we always map the RAM there. */ - memory_region_init_alias(lowram, NULL, "vexpress.lowmem", ram, 0, low_ram_size); + memory_region_init_alias(lowram, NULL, "vexpress.lowmem", machine->ram, + 0, low_ram_size); memory_region_add_subregion(sysmem, 0x0, lowram); - memory_region_add_subregion(sysmem, 0x60000000, ram); + memory_region_add_subregion(sysmem, 0x60000000, machine->ram); /* 0x1e000000 A9MPCore (SCU) private memory region */ init_cpus(machine, cpu_type, TYPE_A9MPCORE_PRIV, 0x1e000000, pic, @@ -360,7 +358,6 @@ static void a15_daughterboard_init(const VexpressMachineState *vms, { MachineState *machine = MACHINE(vms); MemoryRegion *sysmem = get_system_memory(); - MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1); { @@ -375,10 +372,8 @@ static void a15_daughterboard_init(const VexpressMachineState *vms, } } - memory_region_allocate_system_memory(ram, NULL, "vexpress.highmem", - ram_size); /* RAM is from 0x80000000 upwards; there is no low-memory alias for it. */ - memory_region_add_subregion(sysmem, 0x80000000, ram); + memory_region_add_subregion(sysmem, 0x80000000, machine->ram); /* 0x2c000000 A15MPCore private memory region (GIC) */ init_cpus(machine, cpu_type, TYPE_A15MPCORE_PRIV, @@ -795,6 +790,7 @@ static void vexpress_class_init(ObjectClass *oc, void *data) mc->init = vexpress_common_init; mc->max_cpus = 4; mc->ignore_memory_transaction_failures = true; + mc->default_ram_id = "vexpress.highmem"; } static void vexpress_a9_class_init(ObjectClass *oc, void *data)