From nobody Sun Feb 8 15:53:53 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=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1577987199; cv=none; d=zohomail.com; s=zohoarc; b=MTET97aYD4k3c+VGQZ/ezkiNmE4n6QfQL38DNgEjBVYCQEOY2XGXBCDPLbr4c0CnDVrvFHYWYTU+TXP3vQtx/3PEigW2nv+/sDXk+1FKZSc8XQQayGRPd5pHiuyAhyMGixnxiQXmrdf+N7gKEleDJHQ7Pgj/Z8Vyvz5XAWR8Xvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1577987199; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=nDDqN7g26U8zuH38kvSnI15LesENUQRcKXte7/XrQDs=; b=nbD01zBnBWhR9KhvrostFeB7jYUx1cFwmhw1w5zX4lOTVhLnpeMORi662Y/3kdtYhdBV3hPaGifoLQDleANXrE+dKiZ48YhtwIEHw84hy7XMiMNhLF47+3eOQIY0HgqcB/gC1nGTPNND46kUlCk7xiBKRrycLN7XOQ14NK8rlVk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 157798719971230.722056150070102; Thu, 2 Jan 2020 09:46:39 -0800 (PST) Received: from localhost ([::1]:43562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1in4YP-0004l4-KI for importer@patchew.org; Thu, 02 Jan 2020 12:46:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37770) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1in4Xg-0004Jh-FR for qemu-devel@nongnu.org; Thu, 02 Jan 2020 12:45:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1in4Xe-0000J2-1R for qemu-devel@nongnu.org; Thu, 02 Jan 2020 12:45:51 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:25296 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 1in4Xd-0000Hu-OU for qemu-devel@nongnu.org; Thu, 02 Jan 2020 12:45:49 -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-355-gRynIDmlOnudxcIrvpYbNw-1; Thu, 02 Jan 2020 12:45:45 -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 04A671005502; Thu, 2 Jan 2020 17:45:44 +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 C2BD9271A7; Thu, 2 Jan 2020 17:45:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1577987148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nDDqN7g26U8zuH38kvSnI15LesENUQRcKXte7/XrQDs=; b=EKAsA4vDaPuz7n9NHwaiEzKIKXb8zCA0q4tuEKr9zqjvzdE2XT6bdf7O4Zu4t6u8FZmO/9 S0yew+skwYtBF9iPLM55O36uemKQcxjtq3EsXCSJXivqEOtHguxwe6uRpmBbeBWx7bvn1N VrzX7dQkBuFGHFfSw4nQrOAktXHyrhc= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v2] hppa: allow max ram size upto 4Gb Date: Thu, 2 Jan 2020 18:46:02 +0100 Message-Id: <1577987162-150529-1-git-send-email-imammedo@redhat.com> In-Reply-To: <27c3e31d-82ae-e62f-caba-a0a3fbd55e7c@redhat.com> References: <27c3e31d-82ae-e62f-caba-a0a3fbd55e7c@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: gRynIDmlOnudxcIrvpYbNw-1 X-Mimecast-Spam-Score: 0 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.81 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, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Previous patch drops silent ram_size fixup and makes QEMU error out with: "RAM size more than 3840m is not supported" when user specified -m X more than supported value. User shouldn't be bothered with starting QEMU with valid CLI, so for the sake of user convenience allow using -m 4G vs -m 3840M. Requested-by: Helge Deller Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2: - make main ram -1 prio, so it wouldn't conflict with other regions starting from 0xf9000000 I dislike it but if you feel it's really necessary feel free to ack it. should be applied on top of: "hppa: drop RAM size fixup" --- hw/hppa/machine.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index ebbf44f..0302983 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 a= ddr) =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,12 +89,14 @@ 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", FIRMWARE_ST= ART); + 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); + memory_region_add_subregion_overlap(addr_space, 0, machine->ram, -1); =20 /* Init Dino (PCI host bus chip). */ pci_bus =3D dino_init(addr_space, &rtc_irq, &serial_irq); @@ -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); } @@ -204,7 +205,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 +233,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 +256,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 2.7.4