From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp7065754lff; Wed, 15 Jan 2020 07:30:57 -0800 (PST) X-Google-Smtp-Source: APXvYqyK6R59A8NXVnOBpGdzJiUZzFik9rMo0zG6s6pL6M9Mk6Rq3nzGdOlnjMnHUooOz9DNPni/ X-Received: by 2002:a05:6402:1343:: with SMTP id y3mr27562606edw.324.1579102257471; Wed, 15 Jan 2020 07:30:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579102257; cv=none; d=google.com; s=arc-20160816; b=smrfnc6O5UtDVX7bZ6iDn2NR3eoBa6ybajhiKc19xr4mMHJguc0JsSEdKkGiddT2V6 xGF70uRNiCOfxK4UAyTbxAw8BVjXcJR6dnKGqV8K2aN7qknFChDXiE33IiSTQhzbd1eU k/SG99Fj0epZErq068wskrfzcDcyrhbDmcGngVXn6zorEgRJi/+xHIApsm++1w5PmfRb +YOchZ5MeOkxWxzsYLdkIdYhKq/zKl6WabQFXuQrVJsVS0EU1tEEp+74nrtycn2cRmFD FPAYpMzTX/nUkTDF6dAF2VqOAAUqBmjrSnOcQnWs4AwJy5LH46BlYKoQ2yiKizXVhx5v we2Q== 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 :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=dHeo8mJXAQudy8sthHp4Y/+ytYw3XSWbgmK+1+JbFyM=; b=ELWh2qeQgpErD1yYu4QYOWnVKXedXjsr7z0kIRpZeN8FqL0GWViYFgl8tKHo/F2tPH 3zMezbNYxBWHE+TLoz5ue+IJir7VihzWDndN2KkgTH48syWGDcdRj1ndNfk7l9xH6epq oaqirWqFwu9SYWIvFOBg+hI9vnXVXf6FUUsSbRJ05eB/8mRzuwWOCT93Bs7/tdhnJO5e SmRloJ2d/UaULtrvYLydhEoSNVfzmxAhtyXnYuSnWtaJoBrLd1zpC6v2zJCCAqOr3D34 xTV9MC2CoW43wb6YDN76oesdbrOQeqU+tXFwH6AWR8hK0VxNHwBhW+V3PCpHiG9I5hj3 q4EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="ax/O8yLh"; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (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 m6si13605030ede.122.2020.01.15.07.30.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2020 07:30:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-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=fail header.i=@redhat.com header.s=mimecast20190719 header.b="ax/O8yLh"; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:55842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkdD-0003Vi-TD for alex.bennee@linaro.org; Wed, 15 Jan 2020 10:30:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49032) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkKA-0007sg-K8 for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irkK9-0008G5-A3 for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:14 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:50266 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 1irkK9-0008Fo-6p for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579101072; 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=dHeo8mJXAQudy8sthHp4Y/+ytYw3XSWbgmK+1+JbFyM=; b=ax/O8yLhlSSUSSLUlsSNyj/nNuOyItpT8kE4pxIKlBUGXX8hHdK0QzPut9IsuEs/bVkMOg 1RFgw7BdnzqtBTYrRTpq1l3n57KdHaONnlbM+nQGH33gfurwUmHMCpezGcRwhNcHELSXYj oWEx+ldFUM7NNRkG4FgAmpMo3oUYENk= 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-283-qfDdsHSoPOSwMu6avw4ttQ-1; Wed, 15 Jan 2020 10:11:11 -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 ECDA81098257; Wed, 15 Jan 2020 15:11:09 +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 EECD319757; Wed, 15 Jan 2020 15:11:08 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 27/86] arm:palm: use memdev for RAM Date: Wed, 15 Jan 2020 16:06:42 +0100 Message-Id: <1579100861-73692-28-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> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: qfDdsHSoPOSwMu6avw4ttQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 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: 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, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: S4vuJNvLHJNI 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: balrogg@gmail.com CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org --- hw/arm/palm.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 72eca8c..336ac4b 100644 --- a/hw/arm/palm.c +++ b/hw/arm/palm.c @@ -181,7 +181,6 @@ static void palmte_gpio_setup(struct omap_mpu_state_s *= cpu) =20 static struct arm_boot_info palmte_binfo =3D { .loader_start =3D OMAP_EMIFF_BASE, - .ram_size =3D 0x02000000, .board_id =3D 0x331, }; =20 @@ -195,15 +194,20 @@ static void palmte_init(MachineState *machine) static uint32_t cs2val =3D 0x0000e1a0; static uint32_t cs3val =3D 0xe1a0e1a0; int rom_size, rom_loaded =3D 0; - MemoryRegion *dram =3D g_new(MemoryRegion, 1); + MachineClass *mc =3D MACHINE_GET_CLASS(machine); MemoryRegion *flash =3D g_new(MemoryRegion, 1); MemoryRegion *cs =3D g_new(MemoryRegion, 4); =20 - memory_region_allocate_system_memory(dram, NULL, "omap1.dram", - palmte_binfo.ram_size); - memory_region_add_subregion(address_space_mem, OMAP_EMIFF_BASE, dram); + if (machine->ram_size !=3D mc->default_ram_size) { + error_report("Invalid RAM size, should be " RAM_ADDR_UFMT " Bytes"= , + mc->default_ram_size); + exit(EXIT_FAILURE); + } + + memory_region_add_subregion(address_space_mem, OMAP_EMIFF_BASE, + machine->ram); =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, "palmte.flash", flash_size, @@ -265,6 +269,8 @@ static void palmte_machine_init(MachineClass *mc) mc->init =3D palmte_init; mc->ignore_memory_transaction_failures =3D true; mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("ti925t"); + mc->default_ram_size =3D 0x02000000; + mc->default_ram_id =3D "omap1.dram"; } =20 DEFINE_MACHINE("cheetah", palmte_machine_init) --=20 2.7.4