From nobody Mon Feb 9 10:58:05 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=1579780605; cv=none; d=zohomail.com; s=zohoarc; b=OYKqDNUnoDuyXAHJsdSmtR1Jj1umZDkUghvhY3mr9HkkNE376QlFJCBbocCLoqaXxJtld7eQKaFNmgXTgI8n37jPfNgY8spRA6zSf+ODB33wdTtBsIq5EzYDXuQ2DaN3l/bnEJgH2259yJ5WUCFrQ+xthCYAXzZry6blJKAz8Oc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579780605; 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=8y8D9EhmjB3XxaRrfjVHkrdLSjL3RXOaGcDAKZPCyKs=; b=JNZBbMdt+VCG8NuSNv4Jvy3Ra9CF+hpc5OQCGcHZMtXxHTxlqkzwOr2Xme/mKbukUcOmFofUehUopVUvkmO2DsxZbM2PB2RLkT498pB2zQHmjblLfd3Xmssudwi/zn9cr7arm2op8NLSpVVUb5iV6loaePhosXo/EyEtKq7RZIQ= 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 1579780605880286.4737657468105; Thu, 23 Jan 2020 03:56:45 -0800 (PST) Received: from localhost ([::1]:55468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub6J-0006Oe-45 for importer@patchew.org; Thu, 23 Jan 2020 06:56:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35373) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuas1-0005ok-Lt for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuas0-0004LT-9C for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:57 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:46406 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 1iuas0-0004LJ-5C for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:41:56 -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-165-Sw_vEIhgPa-U57wPYpMTOw-1; Thu, 23 Jan 2020 06:41:54 -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 E83CADBA7; Thu, 23 Jan 2020 11:41:52 +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 E678D10016E8; Thu, 23 Jan 2020 11:41:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779715; 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=8y8D9EhmjB3XxaRrfjVHkrdLSjL3RXOaGcDAKZPCyKs=; b=gArgIlEcLMMojRij1dGmvWU8eUAgLn5M4uxRHS6mE1UJsrepigr/uFOwtQnvp/14JYVitC wez+oeI2ax8KpSkIK4usZYAZ/ObtEClwFjlN7tqZN9jUxoibAUoQTJgVv2JxcTGn5ptbPs 9Lx4L0xJioe60tEaYHYiNo0KC8DUA3k= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 24/80] arm/omap_sx1: use memdev for RAM Date: Thu, 23 Jan 2020 12:37:49 +0100 Message-Id: <1579779525-20065-25-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: Sw_vEIhgPa-U57wPYpMTOw-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: 207.211.31.81 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: peter.maydell@linaro.org, drjones@redhat.com, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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 Reviewed-by: Andrew Jones --- v2: * fix format string causing build failure on 32-bit host (Philippe Mathieu-Daud=C3=A9 ) CC: drjones@redhat.com CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org --- hw/arm/omap_sx1.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c index be24571..2bebab4 100644 --- a/hw/arm/omap_sx1.c +++ b/hw/arm/omap_sx1.c @@ -35,6 +35,7 @@ #include "sysemu/qtest.h" #include "exec/address-spaces.h" #include "cpu.h" +#include "qemu/cutils.h" =20 /*************************************************************************= ****/ /* Siemens SX1 Cellphone V1 */ @@ -102,8 +103,8 @@ static struct arm_boot_info sx1_binfo =3D { static void sx1_init(MachineState *machine, const int version) { struct omap_mpu_state_s *mpu; + MachineClass *mc =3D MACHINE_GET_CLASS(machine); MemoryRegion *address_space =3D get_system_memory(); - MemoryRegion *dram =3D g_new(MemoryRegion, 1); MemoryRegion *flash =3D g_new(MemoryRegion, 1); MemoryRegion *cs =3D g_new(MemoryRegion, 4); static uint32_t cs0val =3D 0x00213090; @@ -115,15 +116,20 @@ static void sx1_init(MachineState *machine, const int= version) uint32_t flash_size =3D flash0_size; int be; =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); + } + if (version =3D=3D 2) { flash_size =3D flash2_size; } =20 - memory_region_allocate_system_memory(dram, NULL, "omap1.dram", - sx1_binfo.ram_size); - memory_region_add_subregion(address_space, OMAP_EMIFF_BASE, dram); + memory_region_add_subregion(address_space, OMAP_EMIFF_BASE, machine->r= am); =20 - mpu =3D omap310_mpu_init(dram, machine->cpu_type); + mpu =3D omap310_mpu_init(machine->ram, machine->cpu_type); =20 /* External Flash (EMIFS) */ memory_region_init_ram(flash, NULL, "omap_sx1.flash0-0", flash_size, @@ -223,6 +229,8 @@ static void sx1_machine_v2_class_init(ObjectClass *oc, = void *data) mc->init =3D sx1_init_v2; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("ti925t"); + mc->default_ram_size =3D sdram_size; + mc->default_ram_id =3D "omap1.dram"; } =20 static const TypeInfo sx1_machine_v2_type =3D { @@ -239,6 +247,8 @@ static void sx1_machine_v1_class_init(ObjectClass *oc, = void *data) mc->init =3D sx1_init_v1; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("ti925t"); + mc->default_ram_size =3D sdram_size; + mc->default_ram_id =3D "omap1.dram"; } =20 static const TypeInfo sx1_machine_v1_type =3D { --=20 2.7.4