From nobody Mon Feb 9 02:51:56 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=1579781304; cv=none; d=zohomail.com; s=zohoarc; b=G83IuZ5sCIcWa30E3AZx1jA0Lzc1uEs1in31rtgu6ubWDGrg4Oi4+caEU2ZYPakrSsbywJVHwllqstp8V7vUFy19ZAYI17XUzWnjLqgJzInHF11I38OGJwPxahEE8truYQ1wMSQAmOoEw6ITeEn7Eo14IwqYikVWPpstyvpC08k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579781304; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=GO1VXq0VZi56Yiu7E4xYB4fx4iaWgpqlJIChDA7cNgg=; b=j7OvSIi3kXVzGJZPR8RrA7vPLaez5mBQsijDm3DOY55dCCb6DPw4fAdbe2NwAMjLIBqdshi45CNiOpZC1EYx/H8ubyD0VvWKlnK3EBOej/imoEw4WNKvMHHxY0I0cFNfgQDD+qfglT5LvuE5zrdBaQ3ObJH1sBlh9XSZNfCw6/U= 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 1579781304533432.24312147086516; Thu, 23 Jan 2020 04:08:24 -0800 (PST) Received: from localhost ([::1]:55894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubHa-0003RH-Mt for importer@patchew.org; Thu, 23 Jan 2020 07:08:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35452) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuasA-00064C-Ux for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:42:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuas9-0004QV-Fh for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:42:06 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:29309 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 1iuas9-0004QD-Bs for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:42:05 -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-189-tLWO2VK5N1mGiaQdM_tN3w-1; Thu, 23 Jan 2020 06:42:01 -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 539B38010D9; Thu, 23 Jan 2020 11:42:00 +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 2CE3F10016E8; Thu, 23 Jan 2020 11:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779725; 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=GO1VXq0VZi56Yiu7E4xYB4fx4iaWgpqlJIChDA7cNgg=; b=dUcZEQ+0Sk0UaCwodH9QmbdIH650TNYNZJOZTqluUNWuB7LXqqo/C3Obhjby4r5Dbun9t+ ltNCqSQM8PERjYomxM4MNXNENVNs3ENB0Ng7P6rLQSC6flDSMIS34jBA3C/eMk8gWjMVre gFfWURf/B3tVqKUiD1tXteA5PW/83yA= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 27/80] arm/sabrelite: use memdev for RAM Date: Thu, 23 Jan 2020 12:37:52 +0100 Message-Id: <1579779525-20065-28-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> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: tLWO2VK5N1mGiaQdM_tN3w-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, jcd@tribudubois.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 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: remove no longer needed IMX6Sabrelite Signed-off-by: Igor Mammedov Reviewed-by: Andrew Jones =20 --- CC: drjones@redhat.com CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org CC: jcd@tribudubois.net --- hw/arm/sabrelite.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/hw/arm/sabrelite.c b/hw/arm/sabrelite.c index 96cc455..e31694b 100644 --- a/hw/arm/sabrelite.c +++ b/hw/arm/sabrelite.c @@ -19,11 +19,6 @@ #include "qemu/error-report.h" #include "sysemu/qtest.h" =20 -typedef struct IMX6Sabrelite { - FslIMX6State soc; - MemoryRegion ram; -} IMX6Sabrelite; - static struct arm_boot_info sabrelite_binfo =3D { /* DDR memory start */ .loader_start =3D FSL_IMX6_MMDC_ADDR, @@ -45,7 +40,7 @@ static void sabrelite_reset_secondary(ARMCPU *cpu, =20 static void sabrelite_init(MachineState *machine) { - IMX6Sabrelite *s =3D g_new0(IMX6Sabrelite, 1); + FslIMX6State *s; Error *err =3D NULL; =20 /* Check the amount of memory is compatible with the SOC */ @@ -55,19 +50,16 @@ static void sabrelite_init(MachineState *machine) exit(1); } =20 - object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc= ), - TYPE_FSL_IMX6, &error_abort, NULL); - - object_property_set_bool(OBJECT(&s->soc), true, "realized", &err); + s =3D FSL_IMX6(object_new(TYPE_FSL_IMX6)); + object_property_add_child(OBJECT(machine), "soc", OBJECT(s), &error_fa= tal); + object_property_set_bool(OBJECT(s), true, "realized", &err); if (err !=3D NULL) { error_report("%s", error_get_pretty(err)); exit(1); } =20 - memory_region_allocate_system_memory(&s->ram, NULL, "sabrelite.ram", - machine->ram_size); memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR, - &s->ram); + machine->ram); =20 { /* @@ -78,7 +70,7 @@ static void sabrelite_init(MachineState *machine) /* Add the sst25vf016b NOR FLASH memory to first SPI */ Object *spi_dev; =20 - spi_dev =3D object_resolve_path_component(OBJECT(&s->soc), "spi1"); + spi_dev =3D object_resolve_path_component(OBJECT(s), "spi1"); if (spi_dev) { SSIBus *spi_bus; =20 @@ -109,7 +101,7 @@ static void sabrelite_init(MachineState *machine) sabrelite_binfo.secondary_cpu_reset_hook =3D sabrelite_reset_secondary; =20 if (!qtest_enabled()) { - arm_load_kernel(&s->soc.cpu[0], machine, &sabrelite_binfo); + arm_load_kernel(&s->cpu[0], machine, &sabrelite_binfo); } } =20 @@ -119,6 +111,7 @@ static void sabrelite_machine_init(MachineClass *mc) mc->init =3D sabrelite_init; mc->max_cpus =3D FSL_IMX6_NUM_CPUS; mc->ignore_memory_transaction_failures =3D true; + mc->default_ram_id =3D "sabrelite.ram"; } =20 DEFINE_MACHINE("sabrelite", sabrelite_machine_init) --=20 2.7.4