From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp7072401lff; Wed, 15 Jan 2020 07:36:08 -0800 (PST) X-Google-Smtp-Source: APXvYqxpMrk6Lk3agsi/kzJyOMNQqc4EZaPBcWWl7B/JtTO4n6eX/UbS54DC2ijb2rzcrATR9Lpe X-Received: by 2002:a17:906:c35a:: with SMTP id ci26mr28385389ejb.133.1579102568764; Wed, 15 Jan 2020 07:36:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579102568; cv=none; d=google.com; s=arc-20160816; b=YQa9Am5S6vo0ELt4bEmTSAJOFI7bSGJKRG9/6x7HmWRMP/wx64a5ju8dc7jOjk/FJc MQl7C+iNnEk7OsxrH4j9ckezb2JazuvVXuiq5ZeMAvaY2P+hMmlvFvcTCsF90SzuZWZN DATyKcz3ZMWHZmZfZiDZ6+BGQhKN3SEzr39nDwkegqVolMfxzUw+vS1RSWc3KYhZCP0a AZ/EfXFfsJFxLaYNppumcUr5S1kFwapxubL9xJhl8HKHAkAwisWvgyldRe++8ABhMZFv Ik0d0b35lyOv7iK0JYgG3k1iLaYc9OAbAz7RtuCXlGEDKQ2Igzsa+0dNzB3jaaq2wFet NJWw== 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 :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xP+XfDgYHSkn5jHLJWF0MPXwt9rUfzMHFz128ZKXP8M=; b=XQUICqIoeWQVsXSoFRLu1NKvcSRsBZzXCUaUOAPPROH2CWVqOM93Z4HSUS+tu7r49o WNzjPiIDvHtNHEivByYAPkbl58HhKYpKXo6nT9tdrUjgsWPk9Knu1KwYFJyuuhZEZkZg 4gAHO5r0ZY1P4HByCXI94CHmVENPvCzTq78qs+YNoGC6UNwDQuQoaIUkvZ7JpQBi21Mk A0hOOVD7VwCJncPssiaFtBlIiqRALUJZqxd6TUZWcw9oVOBFKiyISZvvrH5mFqbSVzt1 LNq5rkbMGpJ5i4TxDV4wW9liFwPi0KWv2p+cHwwCSagl1pM/BgYXkY83dFVzFAEZ9xyU tHaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jJgQiyRT; 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=pass (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 u9si12365317edo.268.2020.01.15.07.36.08 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2020 07:36:08 -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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=jJgQiyRT; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:55920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkiF-0001Wu-DG for alex.bennee@linaro.org; Wed, 15 Jan 2020 10:36:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49087) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkKD-0007z9-EH for qemu-arm@nongnu.org; Wed, 15 Jan 2020 10:11:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irkKC-0008Jv-4p for qemu-arm@nongnu.org; Wed, 15 Jan 2020 10:11:17 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:47451 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 1irkKC-0008JR-0w for qemu-arm@nongnu.org; Wed, 15 Jan 2020 10:11:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579101075; 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=xP+XfDgYHSkn5jHLJWF0MPXwt9rUfzMHFz128ZKXP8M=; b=jJgQiyRTDiOU7OeMoi9d1BlNHz+l+wT1YKMtdFLJKHDjwcAQ5xHvqIsL/3zTy7Tl8CyHd1 wacwP8Q1rzZDCCieGLyrquMNu9FFfFVUGu+BY+0guCF6fWQGFtbL6z7j1DM4VcCFbmsnVN jnk4zCyuZy+wSTOFCaJQdCQPh5Dorvw= 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-202-pbdhUuMTMcymHj3K6npRnA-1; Wed, 15 Jan 2020 10:11:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E8C72112F0D8; Wed, 15 Jan 2020 15:11:12 +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 EC2DD19757; Wed, 15 Jan 2020 15:11:11 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 29/86] arm:sabrelite: use memdev for RAM Date: Wed, 15 Jan 2020 16:06:44 +0100 Message-Id: <1579100861-73692-30-git-send-email-imammedo@redhat.com> In-Reply-To: <1579100861-73692-1-git-send-email-imammedo@redhat.com> References: <1579100861-73692-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: pbdhUuMTMcymHj3K6npRnA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: peter.maydell@linaro.org, qemu-arm@nongnu.org, jcd@tribudubois.net Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 02YX0KiEF7fF 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 --- 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