From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68035C34047 for ; Wed, 19 Feb 2020 13:44:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30B6220801 for ; Wed, 19 Feb 2020 13:44:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Bp5CHydN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30B6220801 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4Pep-0001mN-4H for qemu-devel@archiver.kernel.org; Wed, 19 Feb 2020 08:44:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41625) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4Pe8-000112-VN for qemu-devel@nongnu.org; Wed, 19 Feb 2020 08:44:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4Pe7-0006TI-E6 for qemu-devel@nongnu.org; Wed, 19 Feb 2020 08:44:12 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:51322 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 1j4Pe7-0006Sn-1G for qemu-devel@nongnu.org; Wed, 19 Feb 2020 08:44:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582119849; 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=wS9UbbunewIOdvWugtPQcbscNtdup8VeENeOhNUpNac=; b=Bp5CHydN8irOBmFN79n1ogNjwfGsD6WS84CMYThALaZMNQD9bvWtjQyV7qqUrbMi4uVNlH 4Zf6RzoVFTXPtlkRKjYwlBFe0ZkjIfDQBckacMmSId3+NE+sobSqpJYxBifqphC5bIlinF 3JWpR4qYPjlOcd0DV1dX4XCshZsEDsk= 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-108--uffTq8yP_CxncA3-FGgRw-1; Wed, 19 Feb 2020 08:44:08 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64E8E1053C77 for ; Wed, 19 Feb 2020 13:44:07 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72BD48B563; Wed, 19 Feb 2020 13:44:03 +0000 (UTC) Date: Wed, 19 Feb 2020 14:44:02 +0100 From: Igor Mammedov To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH v5 11/79] arm/collie: use memdev for RAM Message-ID: <20200219144402.51cf1213@redhat.com> In-Reply-To: <6ab7280b-cc57-e714-6908-163bab7c898c@redhat.com> References: <20200217173452.15243-1-imammedo@redhat.com> <20200217173452.15243-12-imammedo@redhat.com> <6ab7280b-cc57-e714-6908-163bab7c898c@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: -uffTq8yP_CxncA3-FGgRw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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] 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: Paolo Bonzini , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 18 Feb 2020 18:16:14 +0100 Philippe Mathieu-Daud=C3=A9 wrote: > Hi Igor, >=20 > On 2/17/20 6:33 PM, Igor Mammedov wrote: > > 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. > >=20 > > PS: > > - while at it add check for user supplied RAM size and error > > out if it mismatches board expected value. > > - introduce RAM_ADDR_UFMT to avoid build errors on 32-bit hosts > > when specifying format string for ram_addr_t type =20 >=20 > Since v3 the 2nd comment is not valid anymore (also in other patches=20 > from this series). I looks like the last remnant of RAM_ADDR_UFMT I'll remove it in v6 > >=20 > > Signed-off-by: Igor Mammedov > > Reviewed-by: Andrew Jones > > --- > > v2: > > * fix format string causing build failure on 32-bit host > > (Philippe Mathieu-Daud=C3=A9 ) > > v3: > > * instead of RAM_ADDR_UFMT adding use size_to_str() > > Philippe Mathieu-Daud=C3=A9 > > --- > > hw/arm/collie.c | 17 ++++++++++++----- > > 1 file changed, 12 insertions(+), 5 deletions(-) > >=20 > > diff --git a/hw/arm/collie.c b/hw/arm/collie.c > > index 970a4405cc..024893fc9e 100644 > > --- a/hw/arm/collie.c > > +++ b/hw/arm/collie.c > > @@ -10,6 +10,7 @@ > > */ > > #include "qemu/osdep.h" > > #include "qemu/units.h" > > +#include "qemu/cutils.h" > > #include "hw/sysbus.h" > > #include "hw/boards.h" > > #include "strongarm.h" > > @@ -20,20 +21,24 @@ > > =20 > > static struct arm_boot_info collie_binfo =3D { > > .loader_start =3D SA_SDCS0, > > - .ram_size =3D 0x20000000, =20 >=20 > This doesn't seem correct, this field is used do_cpu_reset() ->=20 > set_kernel_args() (see hw/arm/boot.c). Thanks, fixed in v6. I'll respin series as already several amended patches accumulated by this t= ime. >=20 > > }; > > =20 > > static void collie_init(MachineState *machine) > > { > > StrongARMState *s; > > DriveInfo *dinfo; > > - MemoryRegion *sdram =3D g_new(MemoryRegion, 1); > > + 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 > > s =3D sa1110_init(machine->cpu_type); > > =20 > > - memory_region_allocate_system_memory(sdram, NULL, "strongarm.sdram= ", > > - collie_binfo.ram_size); > > - memory_region_add_subregion(get_system_memory(), SA_SDCS0, sdram); > > + memory_region_add_subregion(get_system_memory(), SA_SDCS0, machine= ->ram); > > =20 > > dinfo =3D drive_get(IF_PFLASH, 0, 0); > > pflash_cfi01_register(SA_CS0, "collie.fl1", 0x02000000, > > @@ -57,6 +62,8 @@ static void collie_machine_init(MachineClass *mc) > > mc->init =3D collie_init; > > mc->ignore_memory_transaction_failures =3D true; > > mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("sa1110"); > > + mc->default_ram_size =3D 0x20000000; > > + mc->default_ram_id =3D "strongarm.sdram"; > > } > > =20 > > DEFINE_MACHINE("collie", collie_machine_init) > > =20 >=20 >=20