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.6 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 E700BC2D0C2 for ; Thu, 2 Jan 2020 17:37:32 +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 AFDBD2072C for ; Thu, 2 Jan 2020 17:37:32 +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="XTKpkzYi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFDBD2072C 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]:43490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1in4Pb-000084-T5 for qemu-devel@archiver.kernel.org; Thu, 02 Jan 2020 12:37:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:36961) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1in4Om-0007ki-F3 for qemu-devel@nongnu.org; Thu, 02 Jan 2020 12:36:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1in4Ok-0003Ar-KY for qemu-devel@nongnu.org; Thu, 02 Jan 2020 12:36:39 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:25467 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 1in4Ok-0003AN-Gy for qemu-devel@nongnu.org; Thu, 02 Jan 2020 12:36:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577986597; 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=8DPJrr+j6waZ+vbXH9xZpzahkjncHVqx+Yae5gtlKik=; b=XTKpkzYi6hjpq33MgLF1VfWw3LcSd8mbN7N+UQbz1h3ZtKuy7ryTHmTHZoLGN0ZiOFkME2 4MTfaKT0TGkBb9igzUSKB4XovwRrGqLIFm/uAlbnYJJuDqu3qWQHVfcEmPB4uVQfQHbB2I 2m9sYOAp38EwdTPsTuSjlkgzumthVYg= 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-231-_4TrPJreMzC0xiTrBTksGg-1; Thu, 02 Jan 2020 12:36:34 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10180911E8; Thu, 2 Jan 2020 17:36:33 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 319A960C18; Thu, 2 Jan 2020 17:36:29 +0000 (UTC) Date: Thu, 2 Jan 2020 18:36:28 +0100 From: Igor Mammedov To: Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= Subject: Re: [PATCH] hppa: allow max ram size upto 4Gb Message-ID: <20200102183628.259ead79@redhat.com> In-Reply-To: <27c3e31d-82ae-e62f-caba-a0a3fbd55e7c@redhat.com> References: <1577797450-88458-44-git-send-email-imammedo@redhat.com> <1577984917-143579-1-git-send-email-imammedo@redhat.com> <27c3e31d-82ae-e62f-caba-a0a3fbd55e7c@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: _4TrPJreMzC0xiTrBTksGg-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.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: deller@gmx.de, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 2 Jan 2020 18:15:02 +0100 Philippe Mathieu-Daud=C3=A9 wrote: > On 1/2/20 6:08 PM, Igor Mammedov wrote: > > Previous patch drops silent ram_size fixup and makes > > QEMU error out with: > >=20 > > "RAM size more than 3840m is not supported" > >=20 > > when user specified -m X more than supported value. > >=20 > > User shouldn't be bothered with starting QEMU with valid CLI, > > so for the sake of user convenience to allow using -m 4G vs -m 3840M. > >=20 > > Requested-by: Helge Deller > > Signed-off-by: Igor Mammedov > > --- > > I dislike it but if you feel it's really necessary feel free to ack it. > >=20 > > should be applied on top of: > > "hppa: drop RAM size fixup" > > --- > > hw/hppa/machine.c | 22 ++++++++++++---------- > > 1 file changed, 12 insertions(+), 10 deletions(-) > >=20 > > diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c > > index ebbf44f..7f8c92f 100644 > > --- a/hw/hppa/machine.c > > +++ b/hw/hppa/machine.c > > @@ -54,6 +54,7 @@ static uint64_t cpu_hppa_to_phys(void *opaque, uint64= _t addr) > > =20 > > static HPPACPU *cpu[HPPA_MAX_CPUS]; > > static uint64_t firmware_entry; > > +static ram_addr_t clamped_ram_size; > > =20 > > static void machine_hppa_init(MachineState *machine) > > { > > @@ -74,8 +75,6 @@ static void machine_hppa_init(MachineState *machine) > > long i; > > unsigned int smp_cpus =3D machine->smp.cpus; > > =20 > > - ram_size =3D machine->ram_size; > > - > > /* Create CPUs. */ > > for (i =3D 0; i < smp_cpus; i++) { > > char *name =3D g_strdup_printf("cpu%ld-io-eir", i); > > @@ -90,10 +89,12 @@ static void machine_hppa_init(MachineState *machine= ) > > } > > =20 > > /* Limit main memory. */ > > - if (ram_size > FIRMWARE_START) { > > - error_report("RAM size more than %d is not supported", FIRMWAR= E_START); > > + if (machine->ram_size > 4 * GiB) { > > + error_report("RAM size more than 4Gb is not supported"); > > exit(EXIT_FAILURE); > > } > > + clamped_ram_size =3D machine->ram_size > FIRMWARE_START ? > > + FIRMWARE_START : machine->ram_size; > > =20 > > memory_region_add_subregion(addr_space, 0, machine->ram); > > =20 > > @@ -151,7 +152,7 @@ static void machine_hppa_init(MachineState *machine= ) > > qemu_log_mask(CPU_LOG_PAGE, "Firmware loaded at 0x%08" PRIx64 > > "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 ".\n", > > firmware_low, firmware_high, firmware_entry); > > - if (firmware_low < ram_size || firmware_high >=3D FIRMWARE_END) { > > + if (firmware_low < clamped_ram_size || firmware_high >=3D FIRMWARE= _END) { > > error_report("Firmware overlaps with memory or IO space"); > > exit(1); > > } > > @@ -160,7 +161,8 @@ static void machine_hppa_init(MachineState *machine= ) > > rom_region =3D g_new(MemoryRegion, 1); > > memory_region_init_ram(rom_region, NULL, "firmware", > > (FIRMWARE_END - FIRMWARE_START), &error_fa= tal); > > - memory_region_add_subregion(addr_space, FIRMWARE_START, rom_region= ); > > + memory_region_add_subregion_overlap(addr_space, FIRMWARE_START, ro= m_region, > > + 1); =20 >=20 > I don't think this is enough because we also have: >=20 > (qemu) info mtree > address-space: memory > 00000000f9000000-00000000f90007ff (prio 0, i/o): isa-io > 00000000fff80000-00000000fff80fff (prio 0, i/o): dino > 00000000fff83800-00000000fff83807 (prio 0, i/o): serial > 00000000fffb0000-00000000fffb0003 (prio 0, i/o): cpu0-io-eir >=20 > Which is why I went the other way around, using prio=3D-1 for the ram. True (you see it just snowball of un-obvious changes for user convenience) >=20 > > =20 > > /* Load kernel */ > > if (kernel_filename) { > > @@ -204,7 +206,7 @@ static void machine_hppa_init(MachineState *machine= ) > > (1) Due to sign-extension problems and PDC, > > put the initrd no higher than 1G. > > (2) Reserve 64k for stack. */ > > - initrd_base =3D MIN(ram_size, 1 * GiB); > > + initrd_base =3D MIN(clamped_ram_size, 1 * GiB); > > initrd_base =3D initrd_base - 64 * KiB; > > initrd_base =3D (initrd_base - initrd_size) & TARGET_PAGE= _MASK; > > =20 > > @@ -232,7 +234,7 @@ static void machine_hppa_init(MachineState *machine= ) > > * various parameters in registers. After firmware initialization= , > > * firmware will start the Linux kernel with ramdisk and cmdline. > > */ > > - cpu[0]->env.gr[26] =3D ram_size; > > + cpu[0]->env.gr[26] =3D clamped_ram_size; > > cpu[0]->env.gr[25] =3D kernel_entry; > > =20 > > /* tell firmware how many SMP CPUs to present in inventory table = */ > > @@ -255,11 +257,11 @@ static void hppa_machine_reset(MachineState *ms) > > } > > =20 > > /* already initialized by machine_hppa_init()? */ > > - if (cpu[0]->env.gr[26] =3D=3D ram_size) { > > + if (cpu[0]->env.gr[26] =3D=3D clamped_ram_size) { > > return; > > } > > =20 > > - cpu[0]->env.gr[26] =3D ram_size; > > + cpu[0]->env.gr[26] =3D clamped_ram_size; > > cpu[0]->env.gr[25] =3D 0; /* no firmware boot menu */ > > cpu[0]->env.gr[24] =3D 'c'; > > /* gr22/gr23 unused, no initrd while reboot. */ > > =20 >=20 >=20