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 8E07EC2D0DB for ; Thu, 23 Jan 2020 15:51:54 +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 58F81214AF for ; Thu, 23 Jan 2020 15:51:54 +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="ZsGAtkSs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58F81214AF 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]:59778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuelt-00025T-99 for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 10:51:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49056) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuciB-0001ay-Fk for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:39:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuci9-0000RR-Sl for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:39:55 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:34017 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 1iuci9-0000Qk-PL for qemu-devel@nongnu.org; Thu, 23 Jan 2020 08:39:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579786793; 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=b+l3kQ8+aCZ03qp1W/gJ9AwYwFtBqPyA0eXu0waMUEM=; b=ZsGAtkSsJrDughdVIATCEJQiT9QHFyVqnCZQ95zUBl/Iv1KztRVRa3LLoPVlV8WNFEGvlB CFubBFKZau4KXvaqXQvlw5cqPLwtyb/GB5of/bef3iaVMCElx2SQD4XFZRUhiDt1x8Atbm Rc3vfRkzmW5bIixbM1/FFhrI25stoPw= 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-215-mUU0EsbOOnuQJHw3DHmPdg-1; Thu, 23 Jan 2020 08:39:51 -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 6A1E0801E67; Thu, 23 Jan 2020 13:39:50 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44FB319C69; Thu, 23 Jan 2020 13:39:49 +0000 (UTC) Date: Thu, 23 Jan 2020 14:39:48 +0100 From: Igor Mammedov To: Andrew Jones Subject: Re: [PATCH REPOST v3 20/80] arm/mps2-tz: use memdev for RAM Message-ID: <20200123143948.4ef7b702@redhat.com> In-Reply-To: <20200123125909.p2aq3ad2x5l24zq5@kamzik.brq.redhat.com> References: <1579779525-20065-1-git-send-email-imammedo@redhat.com> <1579779525-20065-21-git-send-email-imammedo@redhat.com> <20200123125909.p2aq3ad2x5l24zq5@kamzik.brq.redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: mUU0EsbOOnuQJHw3DHmPdg-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: 207.211.31.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: peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 23 Jan 2020 13:59:09 +0100 Andrew Jones wrote: > On Thu, Jan 23, 2020 at 12:37:45PM +0100, 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. > >=20 > > Signed-off-by: Igor Mammedov > > --- > > v2: > > * fix format string causing build failure on 32-bit host > > (Philippe Mathieu-Daud=C3=A9 ) > >=20 > > CC: drjones@redhat.com > > CC: peter.maydell@linaro.org > > CC: qemu-arm@nongnu.org > > --- > > hw/arm/mps2-tz.c | 15 +++++++++++---- > > 1 file changed, 11 insertions(+), 4 deletions(-) > >=20 > > diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c > > index f8b620b..06dacf6 100644 > > --- a/hw/arm/mps2-tz.c > > +++ b/hw/arm/mps2-tz.c > > @@ -39,6 +39,7 @@ > > =20 > > #include "qemu/osdep.h" > > #include "qemu/units.h" > > +#include "qemu/cutils.h" > > #include "qapi/error.h" > > #include "qemu/error-report.h" > > #include "hw/arm/boot.h" > > @@ -79,7 +80,6 @@ typedef struct { > > MachineState parent; > > =20 > > ARMSSE iotkit; > > - MemoryRegion psram; > > MemoryRegion ssram[3]; > > MemoryRegion ssram1_m; > > MPS2SCC scc; > > @@ -388,6 +388,13 @@ static void mps2tz_common_init(MachineState *machi= ne) > > exit(1); > > } > > =20 > > + 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); > > + } > > + > > sysbus_init_child_obj(OBJECT(machine), "iotkit", &mms->iotkit, > > sizeof(mms->iotkit), mmc->armsse_type); > > iotkitdev =3D DEVICE(&mms->iotkit); > > @@ -458,9 +465,7 @@ static void mps2tz_common_init(MachineState *machin= e) > > * tradeoffs. For QEMU they're all just RAM, though. We arbitraril= y > > * call the 16MB our "system memory", as it's the largest lump. > > */ > > - memory_region_allocate_system_memory(&mms->psram, > > - NULL, "mps.ram", 16 * MiB); > > - memory_region_add_subregion(system_memory, 0x80000000, &mms->psram= ); > > + memory_region_add_subregion(system_memory, 0x80000000, machine->ra= m); > > =20 > > /* The overflow IRQs for all UARTs are ORed together. > > * Tx, Rx and "combined" IRQs are sent to the NVIC separately. > > @@ -642,6 +647,7 @@ static void mps2tz_class_init(ObjectClass *oc, void= *data) > > =20 > > mc->init =3D mps2tz_common_init; > > iic->check =3D mps2_tz_idau_check; > > + mc->default_ram_id =3D "mps.ram"; > > } > > =20 > > static void mps2tz_an505_class_init(ObjectClass *oc, void *data) > > @@ -657,6 +663,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc= , void *data) > > mc->default_cpu_type =3D ARM_CPU_TYPE_NAME("cortex-m33"); > > mmc->scc_id =3D 0x41045050; > > mmc->armsse_type =3D TYPE_IOTKIT; > > + mc->default_ram_size =3D 16 * MiB; =20 >=20 > Shouldn't this line be added to mps2tz_class_init ? Yep, it should be there >=20 > Thanks, > drew >=20 > > } > > =20 > > static void mps2tz_an521_class_init(ObjectClass *oc, void *data) > > --=20 > > 2.7.4 > > =20