From nobody Tue Feb 10 05:27:03 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=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579781486; cv=none; d=zohomail.com; s=zohoarc; b=BJdGWWkTnlIi4BzJqTnFiCB9RwPl2teNe3bhMwtDtJzyHy+AD8zF6N9BkmOsblheCWmFLyhLPupzPDHy2DMWCudUTQsV8kPBcGehtxUQLfq21NcrQopbt2nMc0KrdQ0THl1+KqXsjlCZn8DlDzE0s67LK1Gtc0/4/Ih4PuLCx7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579781486; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9CK5qPoMcDq51uWEiTrxAVweeSx31rzpIOXSXlmZViQ=; b=OLbPt/OorXlrOCHa8lY6DEY2MAddcbNSt1eJFkD6KY+wj3sM1dM8vu18RX8aVDMH2FqB53+s/DjMGQpHAGstvUkdetwBBmLx0b2SmAQxoWBmawtVaBAfssV5ahOn4zwcVv76oK9CxSmDwpSqAG3tbyCejMpamdHR+jj7EWmWmPU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1579781486277663.4143669262692; Thu, 23 Jan 2020 04:11:26 -0800 (PST) Received: from localhost ([::1]:55942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubKW-0007gM-OH for importer@patchew.org; Thu, 23 Jan 2020 07:11:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35933) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuatF-0007Zi-1g for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuatD-0004uW-HV for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:12 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42619 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 1iuatD-0004uQ-DS for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:43:11 -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-30-8e76ps0wNamPT0XvZsB4Ng-1; Thu, 23 Jan 2020 06:43:07 -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 41D7D8026B6; Thu, 23 Jan 2020 11:43:06 +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 31D1110843E9; Thu, 23 Jan 2020 11:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779791; 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=9CK5qPoMcDq51uWEiTrxAVweeSx31rzpIOXSXlmZViQ=; b=a8cEk9dwou9Yqq7mEWy+EjuJ5BQ8ZAtmWEH+vAmQFwaN+PkUIOM1HPu70ywEZqtDzYoN6i /7/W59fCLpzK+SaeoG4VSlRq37WXdMbS/ypjiEGLdXIUIds+q+LAtarzo5MAYvASuSDrO7 8ne19Op5Lz6jxeGh7MZeg/Kryf6ivpc= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 45/80] lm32/lm32_boards: use memdev for RAM Date: Thu, 23 Jan 2020 12:38:10 +0100 Message-Id: <1579779525-20065-46-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: 8e76ps0wNamPT0XvZsB4Ng-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.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: michael@walle.cc Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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. PS: while at it add check for user supplied RAM size and error out if it mismatches board expected value. Signed-off-by: Igor Mammedov --- v2: * fix format string causing build failure on 32-bit host (Philippe Mathieu-Daud=C3=A9 ) CC: michael@walle.cc --- hw/lm32/lm32_boards.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c index 5ae308b..cffb777 100644 --- a/hw/lm32/lm32_boards.c +++ b/hw/lm32/lm32_boards.c @@ -19,6 +19,7 @@ =20 #include "qemu/osdep.h" #include "qemu/units.h" +#include "qemu/cutils.h" #include "qemu/error-report.h" #include "cpu.h" #include "hw/sysbus.h" @@ -75,22 +76,28 @@ static void main_cpu_reset(void *opaque) =20 static void lm32_evr_init(MachineState *machine) { + MachineClass *mc =3D MACHINE_GET_CLASS(machine); const char *kernel_filename =3D machine->kernel_filename; LM32CPU *cpu; CPULM32State *env; DriveInfo *dinfo; MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *phys_ram =3D g_new(MemoryRegion, 1); qemu_irq irq[32]; ResetInfo *reset_info; int i; =20 + if (machine->ram_size !=3D mc->default_ram_size) { + char *sz =3D size_to_str(mc->default_ram_size); + error_report("Invalid RAM size, should be %s", sz); + g_free(sz); + exit(EXIT_FAILURE); + } + /* memory map */ hwaddr flash_base =3D 0x04000000; size_t flash_sector_size =3D 256 * KiB; size_t flash_size =3D 32 * MiB; hwaddr ram_base =3D 0x08000000; - size_t ram_size =3D 64 * MiB; hwaddr timer0_base =3D 0x80002000; hwaddr uart0_base =3D 0x80006000; hwaddr timer1_base =3D 0x8000a000; @@ -107,9 +114,7 @@ static void lm32_evr_init(MachineState *machine) =20 reset_info->flash_base =3D flash_base; =20 - memory_region_allocate_system_memory(phys_ram, NULL, "lm32_evr.sdram", - ram_size); - memory_region_add_subregion(address_space_mem, ram_base, phys_ram); + memory_region_add_subregion(address_space_mem, ram_base, machine->ram); =20 dinfo =3D drive_get(IF_PFLASH, 0, 0); /* Spansion S29NS128P */ @@ -144,7 +149,7 @@ static void lm32_evr_init(MachineState *machine) =20 if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, ram_base, - ram_size); + machine->ram_size); reset_info->bootstrap_pc =3D ram_base; } =20 @@ -159,6 +164,7 @@ static void lm32_evr_init(MachineState *machine) =20 static void lm32_uclinux_init(MachineState *machine) { + MachineClass *mc =3D MACHINE_GET_CLASS(machine); const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; const char *initrd_filename =3D machine->initrd_filename; @@ -166,18 +172,23 @@ static void lm32_uclinux_init(MachineState *machine) CPULM32State *env; DriveInfo *dinfo; MemoryRegion *address_space_mem =3D get_system_memory(); - MemoryRegion *phys_ram =3D g_new(MemoryRegion, 1); qemu_irq irq[32]; HWSetup *hw; ResetInfo *reset_info; int i; =20 + if (machine->ram_size !=3D mc->default_ram_size) { + char *sz =3D size_to_str(mc->default_ram_size); + error_report("Invalid RAM size, should be %s", sz); + g_free(sz); + exit(EXIT_FAILURE); + } + /* memory map */ hwaddr flash_base =3D 0x04000000; size_t flash_sector_size =3D 256 * KiB; size_t flash_size =3D 32 * MiB; hwaddr ram_base =3D 0x08000000; - size_t ram_size =3D 64 * MiB; hwaddr uart0_base =3D 0x80000000; hwaddr timer0_base =3D 0x80002000; hwaddr timer1_base =3D 0x80010000; @@ -200,9 +211,7 @@ static void lm32_uclinux_init(MachineState *machine) =20 reset_info->flash_base =3D flash_base; =20 - memory_region_allocate_system_memory(phys_ram, NULL, - "lm32_uclinux.sdram", ram_size); - memory_region_add_subregion(address_space_mem, ram_base, phys_ram); + memory_region_add_subregion(address_space_mem, ram_base, machine->ram); =20 dinfo =3D drive_get(IF_PFLASH, 0, 0); /* Spansion S29NS128P */ @@ -238,7 +247,7 @@ static void lm32_uclinux_init(MachineState *machine) =20 if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, ram_base, - ram_size); + machine->ram_size); reset_info->bootstrap_pc =3D ram_base; } =20 @@ -252,7 +261,7 @@ static void lm32_uclinux_init(MachineState *machine) hw =3D hwsetup_init(); hwsetup_add_cpu(hw, "LM32", 75000000); hwsetup_add_flash(hw, "flash", flash_base, flash_size); - hwsetup_add_ddr_sdram(hw, "ddr_sdram", ram_base, ram_size); + hwsetup_add_ddr_sdram(hw, "ddr_sdram", ram_base, machine->ram_size); hwsetup_add_timer(hw, "timer0", timer0_base, timer0_irq); hwsetup_add_timer(hw, "timer1_dev_only", timer1_base, timer1_irq); hwsetup_add_timer(hw, "timer2_dev_only", timer2_base, timer2_irq); @@ -288,6 +297,8 @@ static void lm32_evr_class_init(ObjectClass *oc, void *= data) mc->init =3D lm32_evr_init; mc->is_default =3D 1; mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); + mc->default_ram_size =3D 64 * MiB; + mc->default_ram_id =3D "lm32_evr.sdram"; } =20 static const TypeInfo lm32_evr_type =3D { @@ -304,6 +315,8 @@ static void lm32_uclinux_class_init(ObjectClass *oc, vo= id *data) mc->init =3D lm32_uclinux_init; mc->is_default =3D 0; mc->default_cpu_type =3D LM32_CPU_TYPE_NAME("lm32-full"); + mc->default_ram_size =3D 64 * MiB; + mc->default_ram_id =3D "lm32_uclinux.sdram"; } =20 static const TypeInfo lm32_uclinux_type =3D { --=20 2.7.4