From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:c345:0:0:0:0:0 with SMTP id t66csp7053500lff; Wed, 15 Jan 2020 07:21:10 -0800 (PST) X-Google-Smtp-Source: APXvYqwTmQ1j6C4wIXGUv/sIyWYUCh8SOpeOohNfTOZ1sXM/9yyPBIVfXPGeKo9CQhLTDFasSlf+ X-Received: by 2002:a05:6402:22d4:: with SMTP id dm20mr27083127edb.353.1579101670599; Wed, 15 Jan 2020 07:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579101670; cv=none; d=google.com; s=arc-20160816; b=SaUghncQBZ0tbdXuFgpHSpzQ4kscsk8d0wIwwLiS3y2gNMpPpmC3Nokkmm6LJoJenq xlHJFsTgw7YkXPRSFYKtgtzF5191DysumIfL5wZ3Qp1tjX15nBV9SCFO5ThANE4ZPY67 nlqIu1ZaUH94oYO9pMKW0iXJbs307Y8GtV1qrpj0ObrnxOhwp/0jir8qkVqAKESvxApL 6zl+0wuR92K74Q2m8eKH9SI1GS5NQYemCaCFD2v56Mkuay3JnxH98ceYBtjQ/lBDZU9f +obBLp+/3btN8+Dpsbqv7YkNW3Qk4Ry0/Hbn0Pwn5vVI2cfcxMDHXjMdg2kZ3Hmoe+Pd fGcQ== 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=UVE2+gHs9Or+VE8ba2VQCLVxvDchVeA3YkOiGVofBpg=; b=VS4ammi+fJdms+Ie/gMuT95kQjuPjRJVMt7mOFNna1UWTmzqb/tjIb0xesiXveUu4g iDsgAj7ao15LMK6lJZU8zJ0V3r87rJgaDAsxQH8jeR/b/0/i11W1bsIsJpb+GrPEbkJ0 t6Nb3sdwZgcuKXLm7DxdbrCAFAUnDWJv5eEUXEVVZ+YChKrsQdPas51BKDLCJfUwwkt2 HnW4ByT4VGWuGRMkLqL+zd6DH193UkC63U8Ch3eAJNDL3maqA7supYjpNtOcxSfkHGSm 58XNHarlde8VuADA4SoLy3nMfGwzglZ6qXqQuFTt0kCqE59qwchlzM6vVUDzXFmDxCP+ clsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=gQ2DQig1; 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 gh3si11590967ejb.180.2020.01.15.07.21.10 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2020 07:21:10 -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=gQ2DQig1; 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]:55675 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkTk-0004R9-OF for alex.bennee@linaro.org; Wed, 15 Jan 2020 10:21:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48732) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irkJu-0007Tv-FQ for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:11:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irkJs-00082o-Sx for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:10:58 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:38334 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 1irkJs-00082N-PD for qemu-devel@nongnu.org; Wed, 15 Jan 2020 10:10:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579101056; 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=UVE2+gHs9Or+VE8ba2VQCLVxvDchVeA3YkOiGVofBpg=; b=gQ2DQig113VT+qjmE/FyqTrnS3dB3I88uH/M6hfcLfVlrTbVxp5c0am5ZJ/CyA/eY9ZSxp bg7gu0C1LMWm4q7fBlsk/T+6xaJ5ClV1CrJOhgWcXg7Bri7jWIxGOETehvY5gfMgxw+WYj gJ3LHD52TyBOxKmNBN6gse6ii+LisLA= 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-302-GGy2GM2eMLWhhIpsz6chAg-1; Wed, 15 Jan 2020 10:10:53 -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 DE23D1924403; Wed, 15 Jan 2020 15:10:51 +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 A120F47385; Wed, 15 Jan 2020 15:10:50 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2 13/86] arm:digic_boards: use memdev for RAM Date: Wed, 15 Jan 2020 16:06:28 +0100 Message-Id: <1579100861-73692-14-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: GGy2GM2eMLWhhIpsz6chAg-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: 205.139.110.61 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, antonynpavlov@gmail.com Errors-To: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-devel" X-TUID: L7pUFEWv+nBA 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 DigicBoardState PS2: 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: antonynpavlov@gmail.com CC: peter.maydell@linaro.org CC: qemu-arm@nongnu.org --- hw/arm/digic_boards.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index ef3fc2b..9f094d4 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -35,39 +35,38 @@ #include "hw/loader.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "qemu/units.h" =20 #define DIGIC4_ROM0_BASE 0xf0000000 #define DIGIC4_ROM1_BASE 0xf8000000 #define DIGIC4_ROM_MAX_SIZE 0x08000000 =20 -typedef struct DigicBoardState { - DigicState *digic; - MemoryRegion ram; -} DigicBoardState; - typedef struct DigicBoard { - hwaddr ram_size; - void (*add_rom0)(DigicBoardState *, hwaddr, const char *); + void (*add_rom0)(DigicState *, hwaddr, const char *); const char *rom0_def_filename; - void (*add_rom1)(DigicBoardState *, hwaddr, const char *); + void (*add_rom1)(DigicState *, hwaddr, const char *); const char *rom1_def_filename; } DigicBoard; =20 -static void digic4_board_init(DigicBoard *board) +static void digic4_board_init(MachineState *machine, DigicBoard *board) { Error *err =3D NULL; + MachineClass *mc =3D MACHINE_GET_CLASS(machine); =20 - DigicBoardState *s =3D g_new(DigicBoardState, 1); + 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); + } =20 - s->digic =3D DIGIC(object_new(TYPE_DIGIC)); - object_property_set_bool(OBJECT(s->digic), true, "realized", &err); + DigicState *s =3D DIGIC(object_new(TYPE_DIGIC)); + object_property_set_bool(OBJECT(s), true, "realized", &err); if (err !=3D NULL) { error_reportf_err(err, "Couldn't realize DIGIC SoC: "); exit(1); } =20 - memory_region_allocate_system_memory(&s->ram, NULL, "ram", board->ram_= size); - memory_region_add_subregion(get_system_memory(), 0, &s->ram); + memory_region_add_subregion(get_system_memory(), 0, machine->ram); =20 if (board->add_rom0) { board->add_rom0(s, DIGIC4_ROM0_BASE, board->rom0_def_filename); @@ -78,7 +77,7 @@ static void digic4_board_init(DigicBoard *board) } } =20 -static void digic_load_rom(DigicBoardState *s, hwaddr addr, +static void digic_load_rom(DigicState *s, hwaddr addr, hwaddr max_size, const char *def_filename) { target_long rom_size; @@ -118,7 +117,7 @@ static void digic_load_rom(DigicBoardState *s, hwaddr a= ddr, * Samsung K8P3215UQB * 64M Bit (4Mx16) Page Mode / Multi-Bank NOR Flash Memory */ -static void digic4_add_k8p3215uqb_rom(DigicBoardState *s, hwaddr addr, +static void digic4_add_k8p3215uqb_rom(DigicState *s, hwaddr addr, const char *def_filename) { #define FLASH_K8P3215UQB_SIZE (4 * 1024 * 1024) @@ -135,14 +134,13 @@ static void digic4_add_k8p3215uqb_rom(DigicBoardState= *s, hwaddr addr, } =20 static DigicBoard digic4_board_canon_a1100 =3D { - .ram_size =3D 64 * 1024 * 1024, .add_rom1 =3D digic4_add_k8p3215uqb_rom, .rom1_def_filename =3D "canon-a1100-rom1.bin", }; =20 static void canon_a1100_init(MachineState *machine) { - digic4_board_init(&digic4_board_canon_a1100); + digic4_board_init(machine, &digic4_board_canon_a1100); } =20 static void canon_a1100_machine_init(MachineClass *mc) @@ -150,6 +148,8 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->desc =3D "Canon PowerShot A1100 IS"; mc->init =3D &canon_a1100_init; mc->ignore_memory_transaction_failures =3D true; + mc->default_ram_size =3D 64 * MiB; + mc->default_ram_id =3D "ram"; } =20 DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init) --=20 2.7.4