From nobody Mon Sep 16 19:35:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of seabios.org designates 78.46.105.101 as permitted sender) smtp.mailfrom=seabios-bounces@seabios.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1651044163419544.3176698559683; Wed, 27 Apr 2022 00:22:43 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id 7B96016E3D1F; Wed, 27 Apr 2022 07:22:39 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id A417F16E36E4 for ; Wed, 27 Apr 2022 07:22:09 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-240-30oqqQ3yPN6YxwVwso6kwA-1; Wed, 27 Apr 2022 03:22:06 -0400 Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A6D743C0F084 for ; Wed, 27 Apr 2022 07:22:06 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 77ABE463DF5; Wed, 27 Apr 2022 07:22:06 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) id E32261800D4F; Wed, 27 Apr 2022 09:22:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651044128; 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=cQLz7RNpUFjegjasH/CMksX29c9ispzA8Sc9O5a8byo=; b=OJvSyzUCI39W5CN+pXGVMq3hnyAlnA0bt8QZesk4uUg45Jt9a2Q49Vj4Nkf9SBN+xntKWB YRFnzwTFE2PINmyLb/6n8mc7L2R213P6USqBh11F1YiJCRb2YcrCQIgmg8cF3nYUVntxVB AChrG0Co4PX4x+oPuDvfxGsdZDK8OuI= X-MC-Unique: 30oqqQ3yPN6YxwVwso6kwA-1 From: Gerd Hoffmann To: seabios@seabios.org Date: Wed, 27 Apr 2022 09:22:03 +0200 Message-Id: <20220427072204.2781045-2-kraxel@redhat.com> In-Reply-To: <20220427072204.2781045-1-kraxel@redhat.com> References: <20220427072204.2781045-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: 27TPQXYMDCXERFEEHLMLTW3PEIGV53ZY X-Message-ID-Hash: 27TPQXYMDCXERFEEHLMLTW3PEIGV53ZY X-MailFrom: kraxel@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Gerd Hoffmann X-Mailman-Version: 3.3.5rc1 Precedence: list Subject: [SeaBIOS] [PATCH v4 1/2] malloc: use variable for ZoneHigh size List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org X-Spamd-Bar: ------ X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651044165670100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Use the variable highram_size instead of the BUILD_MAX_HIGHTABLE #define for the ZoneHigh size. Initialize the new variable with the old #define, so behavior does not change. This allows to easily adjust the ZoneHigh size at runtime in a followup patch. Signed-off-by: Gerd Hoffmann --- src/malloc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/malloc.c b/src/malloc.c index 3733855caf2c..ecd8c9ac78d2 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -422,7 +422,8 @@ malloc_preinit(void) e820_add(BUILD_BIOS_ADDR, BUILD_BIOS_SIZE, E820_RESERVED); =20 // Populate temp high ram - u32 highram =3D 0; + u32 highram_start =3D 0; + u32 highram_size =3D BUILD_MAX_HIGHTABLE; int i; for (i=3De820_count-1; i>=3D0; i--) { struct e820entry *en =3D &e820_list[i]; @@ -432,10 +433,10 @@ malloc_preinit(void) if (en->type !=3D E820_RAM || end > 0xffffffff) continue; u32 s =3D en->start, e =3D end; - if (!highram) { - u32 newe =3D ALIGN_DOWN(e - BUILD_MAX_HIGHTABLE, MALLOC_MIN_AL= IGN); + if (!highram_start) { + u32 newe =3D ALIGN_DOWN(e - highram_size, MALLOC_MIN_ALIGN); if (newe <=3D e && newe >=3D s) { - highram =3D newe; + highram_start =3D newe; e =3D newe; } } @@ -444,9 +445,9 @@ malloc_preinit(void) =20 // Populate regions alloc_add(&ZoneTmpLow, BUILD_STACK_ADDR, BUILD_EBDA_MINIMUM); - if (highram) { - alloc_add(&ZoneHigh, highram, highram + BUILD_MAX_HIGHTABLE); - e820_add(highram, BUILD_MAX_HIGHTABLE, E820_RESERVED); + if (highram_start) { + alloc_add(&ZoneHigh, highram_start, highram_start + highram_size); + e820_add(highram_start, highram_size, E820_RESERVED); } } =20 --=20 2.35.1 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org