From nobody Sun Feb 8 22:57:59 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=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582129256; cv=none; d=zohomail.com; s=zohoarc; b=hJqKCjuhwxTsTRQbn3rci02XEyNz1njSkm0R0tIPj4kxtjVkKtU6YrEBT4omx8iUGjECGH/gDVLzsHJ0a9w4QJ1XELrdRF6EUHPNmIegR5RNc1ziM9Kz3DjGS5WPELNhKtX6WZU9MkgbCTao3RrkKcuDnSfvQGuJE+0njVCDeqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582129256; 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=5zbZSc0F00KT9TJ04qFC8LgJqv/4chjq8QbrGtQCWv0=; b=jJ47UU83cX4uKndPvd+9ZsMDHQGv7GVTK5YbPmyxw1RfXgr/mkBHIJilePA8eefsyoKXZ8YFSlkGsvCMTnwih5ODGuQtvVu3DFssVLIFqOeLIBOuGrLmtjjvR7ILmvxc0Lat4Ir0ZNETF3PulctBSTCw/BL6ZMcOoTPC0uS230k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 158212925697386.59664155334531; Wed, 19 Feb 2020 08:20:56 -0800 (PST) Received: from localhost ([::1]:55620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4S5n-00052v-S9 for importer@patchew.org; Wed, 19 Feb 2020 11:20:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37113) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4RvX-0002LF-8B for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:10:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4RvV-0000ZV-O1 for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:10:19 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24310 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4RvV-0000ZI-Jz for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:10:17 -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-414-FIg50ADeP2mwukE-g0BMxw-1; Wed, 19 Feb 2020 11:10:13 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 728B3107B7FF; Wed, 19 Feb 2020 16:10: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 9723348; Wed, 19 Feb 2020 16:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582128617; 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=5zbZSc0F00KT9TJ04qFC8LgJqv/4chjq8QbrGtQCWv0=; b=bBGWOszuTZI3jX4l5hGHTc/jldOzyNTUKdqc43X9QnNYEtpwozgzhKHYy2e5SJFtUxZsgb MRq7J64jZwng22RPrZ9l2x5Pvg+GxXgHDsfLAfBs+QbpCUmSSwbDS7LxHIgkiFVoEBietn NVIw9jPLGussYOAbKPpOvtbSriPQP2E= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v6 13/79] arm/digic_boards: use memdev for RAM Date: Wed, 19 Feb 2020 11:08:47 -0500 Message-Id: <20200219160953.13771-14-imammedo@redhat.com> In-Reply-To: <20200219160953.13771-1-imammedo@redhat.com> References: <20200219160953.13771-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: FIg50ADeP2mwukE-g0BMxw-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: 205.139.110.120 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: Paolo Bonzini , antonynpavlov@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 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 Reviewed-by: Andrew Jones Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v3: * move 'DigicState *s' declaration to the top of digic4_board_init() v2: * fix format string causing build failure on 32-bit host (Philippe Mathieu-Daud=C3=A9 ) CC: antonynpavlov@gmail.com --- hw/arm/digic_boards.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index ef3fc2b6a5..518a63e61d 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -35,39 +35,40 @@ #include "hw/loader.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h" +#include "qemu/units.h" +#include "qemu/cutils.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; + DigicState *s =3D DIGIC(object_new(TYPE_DIGIC)); + MachineClass *mc =3D MACHINE_GET_CLASS(machine); + + 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); + } =20 - DigicBoardState *s =3D g_new(DigicBoardState, 1); - - s->digic =3D DIGIC(object_new(TYPE_DIGIC)); - object_property_set_bool(OBJECT(s->digic), true, "realized", &err); + 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 +79,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 +119,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 +136,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 +150,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.18.1