From owner-dev-commits-src-all@freebsd.org Mon Mar 22 22:08:28 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE7615BC03D for ; Mon, 22 Mar 2021 22:08:28 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F47tN5HJvz4pNN for ; Mon, 22 Mar 2021 22:08:28 +0000 (UTC) (envelope-from sobomax@sippysoft.com) Received: by mail-ed1-f45.google.com with SMTP id w18so21279979edc.0 for ; Mon, 22 Mar 2021 15:08:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Gck2RxCOxD/cT4uzEpoa7zKSHw2ZgYnpyIZbZFy+Sug=; b=lqz8Lpky6T4+4/IdO/DZD7BRzIbPxa/UEB2xtXYhPXtETIyiCu4NNZOrx/bZ1QwVW9 CxX2XXNyTTIdQxsmsJ+Y9w+bWwqrQiL+4VLgFDw5ytVgGmaQl4sPkXcZhbaBoRYbU5Nc RDgCPDETypIdzrpoa017ouOH5JksFYE3itIr0vwUEa7g2ZGQaXnuzI8YGCObcBjWW/I4 2bcbYttuhnk3Yb2JUisv4xm8mdupGTTP7le7gviqNOUYbWsDccp+E6sUzlKo8O6iZ8GS OYdruPv8er823WBSWwTY0rp8bj8JKtcPfFrxYathx70vIjzQESIirIunwRSlq6iRZA+e /hiA== X-Gm-Message-State: AOAM533jIDsXfmllf17raPXYHSLc5JQw4lidniwtVMkJEbKMWuMLQWhA FOY2QUKt2vXGPNFhf0YhuG79aGYcDm9PsshFX509GQ== X-Google-Smtp-Source: ABdhPJzs/vHMGDHYXx8Dq3tAIqOsrRxPodouhfLHdiAPUT6I76yQ8AqnmDKmA8iT41Sh8vrg2N/pVlUDkxqU8GejTaY= X-Received: by 2002:aa7:cc94:: with SMTP id p20mr1689022edt.353.1616450907245; Mon, 22 Mar 2021 15:08:27 -0700 (PDT) MIME-Version: 1.0 References: <202103222148.12MLm6Wl074553@gitrepo.freebsd.org> In-Reply-To: <202103222148.12MLm6Wl074553@gitrepo.freebsd.org> From: Maxim Sobolev Date: Mon, 22 Mar 2021 15:08:16 -0700 Message-ID: Subject: Re: git: b304cd9789ca - stable/12 - Drop EFI_STAGING_SIZE back down to 64M To: Ryan Moeller Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org X-Rspamd-Queue-Id: 4F47tN5HJvz4pNN X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Mar 2021 22:08:28 -0000 Hmm, that's really annoying, reminiscent of the old DOS days, where you might have few megs of memory, but won't be able to use it due to some bios/motherboard quirk. :-/ Can we at least have some specific section for VMWare to teak that in? We already have the HYPER-V section in that file, so it's not unheard of. At the very least other virtual machines (i.e. VirtualBox in the EFI mode or majority "real" EFI servers) do not have this restriction. Thanks! -Max On Mon, Mar 22, 2021 at 2:48 PM Ryan Moeller wrote: > The branch stable/12 has been updated by freqlabs: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=b304cd9789ca7ff3df629af42a976450e8660a11 > > commit b304cd9789ca7ff3df629af42a976450e8660a11 > Author: Warner Losh > AuthorDate: 2020-12-17 17:02:09 +0000 > Commit: Ryan Moeller > CommitDate: 2021-03-22 20:30:23 +0000 > > Drop EFI_STAGING_SIZE back down to 64M > > vmware can't cope with anything larger than 64MB. Drop this back to > 64MB everywhere but arm. > > PR: 251866 > MFC After: 1 week > > (cherry picked from commit 4d6047edb675e52b8fad57135ab3ded8e66d0dac) > --- > stand/efi/loader/copy.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c > index 6499a44b9bbe..6ad673d62897 100644 > --- a/stand/efi/loader/copy.c > +++ b/stand/efi/loader/copy.c > @@ -176,9 +176,7 @@ out: > #endif /* __i386__ || __amd64__ */ > > #ifndef EFI_STAGING_SIZE > -#if defined(__amd64__) > -#define EFI_STAGING_SIZE 100 > -#elif defined(__arm__) > +#if defined(__arm__) > #define EFI_STAGING_SIZE 32 > #else > #define EFI_STAGING_SIZE 64 > >