From nobody Wed Mar 26 01:29:00 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZMq254Zpdz5s5ml; Wed, 26 Mar 2025 01:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZMq241Qm2z3rRs; Wed, 26 Mar 2025 01:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742952540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TEY1fT9ns1535zXPtD8mHA9zPZQRcAzif4iCn9TaK3A=; b=OU8pCGGM+REuzxbS4R3MyOYS0I/5Ytkf1jeJuqGOBkIoRKqf7UprOVAKFygt9nfa57gpbj H6SxW5XtVJEKrTgOG2kpOGp6joBelV8QDXNPmn+HIMg0XSPnSkoiSyWtr/AvdCP9I2UUFS E5Gd99JDJ7Nw+7sGTgK8D7F8x1l2Eo3fWcPZ0+qTTNUD401JQhsIpPb/pwGuAImRh/t7gD 4xQFfCWTkF5+5NWtp/qSNWHm72BANWH/2DIQKHkN7p2k/KwQGtKJ7RngrOvEaSiWuY1krh j97lY1wmWZYQr8BiJHtpKFm+zNNLILe+/F/E5Z1a5jTuLpc9TIxlf73RPkMzXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742952540; a=rsa-sha256; cv=none; b=FevjFpjb/VgzbOtD6/pgtiQ6IPbeSiH1gyagYkhWFkMk8mVJxTrEAWdaMAlESx/Qzhm0qN A9+QLcNh1luSqyP0z0uPrvpiglEprXVWQJObWKNWx0sEycZWYLuXrnnG3ltC7fSTbqb8EJ YmzpOFN1Bi4GWPbsD7/XG8cwKprOq79NIxgJFgw08wxIIBR3hqSuyQLTnaKK/QbzpiXwp0 zf+rKtfHE9CBLyyzy60P4lsjl9F2yBMZwGYcPzGREXFk70I2WWdwBFi1qh2zvLUS94m/HZ poj1T5fADDToXKH74qUC9JOELMUwchuB5VzKX8QfYqaMrvVRJIqdlAxToiBn9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742952540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TEY1fT9ns1535zXPtD8mHA9zPZQRcAzif4iCn9TaK3A=; b=hX9lsr353K107zJ6n32SqKKLCNZZXbeSi+eq2ZB0+F8cq0o/czIivF9RbNEZt5gY28xpsF psgxVlX/A5Fvp1x6TYUUmQ+kHgOloF1RtmtRyj906IilT0FZj/Y5+M4fAH0eDBEW/vPbj0 C3NwgXzxSa8CPMET1cL46V+P/1yvgcRGvc3osz0Kln55TwJfZrKsxDEghOv2oZDZYYnZmq Sr9OW+IDB5z+dSsbQ8bfdgrWtNAwQFSqHU5+z3XC6BFOnAwrZJ9rYrHI9ePKtWyR8FJ8bi 2NRlS5LsuzMLUAOKjILPTbyo149WWgx1AZX8onO2QEzgwTr2Mciz969W/OGxOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZMq240xmXz14cH; Wed, 26 Mar 2025 01:29:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52Q1T00G047283; Wed, 26 Mar 2025 01:29:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52Q1T0cZ047280; Wed, 26 Mar 2025 01:29:00 GMT (envelope-from git) Date: Wed, 26 Mar 2025 01:29:00 GMT Message-Id: <202503260129.52Q1T0cZ047280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 92aa078752ee - stable/14 - loader: Fix shadow_fb allocation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 92aa078752ee7ae7347710f6be425b3d4c6802eb Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=92aa078752ee7ae7347710f6be425b3d4c6802eb commit 92aa078752ee7ae7347710f6be425b3d4c6802eb Author: Ahmad Khalifa AuthorDate: 2024-05-31 09:41:32 +0000 Commit: Warner Losh CommitDate: 2025-03-26 01:28:38 +0000 loader: Fix shadow_fb allocation Using AllocateMaxAddress here means that gfx_state->tg_shadow_fb is treated as the highest address we can receive. Since gfx_state->tg_shadow_fb is NULL, we never receive anything. Use AllocateAnyPages instead. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 (cherry picked from commit 95f75b0e6e5f71d34e4eef151f43822e33838663) --- stand/efi/loader/framebuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c index 2f580309c2f3..c954a2471340 100644 --- a/stand/efi/loader/framebuffer.c +++ b/stand/efi/loader/framebuffer.c @@ -656,7 +656,7 @@ efi_find_framebuffer(teken_gfx_t *gfx_state) gfx_state->tg_shadow_sz = EFI_SIZE_TO_PAGES(efifb.fb_height * efifb.fb_width * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); - status = BS->AllocatePages(AllocateMaxAddress, EfiLoaderData, + status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData, gfx_state->tg_shadow_sz, (EFI_PHYSICAL_ADDRESS *)&gfx_state->tg_shadow_fb); if (status != EFI_SUCCESS)