From nobody Thu Mar 27 17:27:19 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 4ZNrFM4PjFz5rdvT; Thu, 27 Mar 2025 17:27:19 +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 4ZNrFM3nZyz3FJy; Thu, 27 Mar 2025 17:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743096439; 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=3aWkS6y8/ItMclvER2c4ZuOMJ5Zc3cnr6kfb7khGHpY=; b=JnGAwV3lV0Bxc0gkwC30scoTYxgKTpZWBJsRBXvs47U8XgCR/NYsqMJFpVsW6mxTG3wq21 hH5PTQ9ETuOBVmpl1tnkJZguSPyjuKD29ufSYoBIsEDLjtBxx8cgL1/Z+sz59ghJS9V3/D rBulL3cYEOKzw+wIRDWKzBWNyzXoDrNMplWAzgtaEfTjIoE626KF2XztD70zHR14Oj2F4V GuXHQDN4sw77vfLWxq1915G4pRK8KgrDK8RWytZhsKjn//y3NdC/4fyWk3tB5M0QCSNzWS P/boQFNZrnm0sie+pARR3Ak9iyOtfkczf3UGrhiod80zbd4QsJIYP2KpTSpLkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743096439; a=rsa-sha256; cv=none; b=D6gxijF5JRBeralIPb+LbofCqJZ8py71lSddwR/CSBF5Xp9Y86gu3Zetmgqtq4Mf/OdM4z 4t+PnryrwePCPkXRSTgxZkH4JmqWx1zNUnJXr18dgNtFcMjyb3XlgxlYbTVez5V+gubzPE s3Lg3r8vxi2tmSfio98FCBDJpeYBF0o7DalCHaVzrOjZ30ui2uPRoaanHYWj+76PcVD8FF I3p44+8B08rR4fdpgU+sLHZm9xzel3HNxxpX88fiKQLRDD+D9/DvbfPdwTuMK+K/Lc3gXU YlTsCCPD+b0bf/7tRQn4RmGuF/4lzQ2YV90ddOkvoCe8eQ/o20WQMnHrqeMfXA== 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=1743096439; 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=3aWkS6y8/ItMclvER2c4ZuOMJ5Zc3cnr6kfb7khGHpY=; b=dtCkC/6Zw3mO4Z5SWClDAuRtNcBUelNqNmiHqJ25/wx9NHj7jZp/yIZZmngXAjFA5gzfor +kDKfH/XDSw6X+nI6L4GOKO1KWCqu/tKAqQ4T1jhjI8BjXfy/iIQ4aPqcikMAmOcCcRfac Tizb8fvd6kryPatd1OoAB6PLWvM29x8CZgDqJnhAs4I/sk3g9/EkHTce42zBkZkd24GPjH 2844eBToCvFL3S8se2yfB/85rNSuCnfOq2W963o7xuVmaE0EYoRgSt9WDrBHJWQbzUuPH7 jyzOM7hLcXrIrCHbrQi3Zbpdo0qWMgqyqWI7RjpBDgHhU/unJINFiooN7i7XAg== 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 4ZNrFM3NLRz15WH; Thu, 27 Mar 2025 17:27:19 +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 52RHRJdn038416; Thu, 27 Mar 2025 17:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52RHRJh9038413; Thu, 27 Mar 2025 17:27:19 GMT (envelope-from git) Date: Thu, 27 Mar 2025 17:27:19 GMT Message-Id: <202503271727.52RHRJh9038413@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 3b496eb1bded - stable/14 - loader: Fix 32-bit compatibility 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: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3b496eb1bdedaf407fc45ba4ca68dc0598bfcb60 Auto-Submitted: auto-generated The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=3b496eb1bdedaf407fc45ba4ca68dc0598bfcb60 commit 3b496eb1bdedaf407fc45ba4ca68dc0598bfcb60 Author: Ahmad Khalifa AuthorDate: 2024-05-14 19:29:08 +0000 Commit: Enji Cooper CommitDate: 2025-03-27 17:21:55 +0000 loader: Fix 32-bit compatibility main.c - Fix rsdp cast. framebuffer.c - - Use temp variable instead of directly passing pointer when EFI_PHYSICAL_ADDRESS is expected. Also fix FreePages cast. - Mask framebuffer address given to us by UEFI. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1098 (cherry picked from commit 6818ff7797c6a9ab104e5d7e91d4e422874bf50d) --- stand/efi/loader/framebuffer.c | 21 +++++++++++++++------ stand/efi/loader/main.c | 3 ++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c index c954a2471340..ea4131b751c8 100644 --- a/stand/efi/loader/framebuffer.c +++ b/stand/efi/loader/framebuffer.c @@ -149,7 +149,16 @@ efifb_from_gop(struct efi_fb *efifb, EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *mode, { int result; - efifb->fb_addr = mode->FrameBufferBase; + /* + * The Asus EEEPC 1025C, and possibly others, + * require the address to be masked. + */ + efifb->fb_addr = +#ifdef __i386__ + mode->FrameBufferBase & 0xffffffff; +#else + mode->FrameBufferBase; +#endif efifb->fb_size = mode->FrameBufferSize; efifb->fb_height = info->VerticalResolution; efifb->fb_width = info->HorizontalResolution; @@ -555,6 +564,7 @@ efi_has_gop(void) int efi_find_framebuffer(teken_gfx_t *gfx_state) { + EFI_PHYSICAL_ADDRESS ptr; EFI_HANDLE *hlist; UINTN nhandles, i, hsize; struct efi_fb efifb; @@ -651,16 +661,15 @@ efi_find_framebuffer(teken_gfx_t *gfx_state) efifb.fb_mask_blue | efifb.fb_mask_reserved); if (gfx_state->tg_shadow_fb != NULL) - BS->FreePages((EFI_PHYSICAL_ADDRESS)gfx_state->tg_shadow_fb, + BS->FreePages((uintptr_t)gfx_state->tg_shadow_fb, gfx_state->tg_shadow_sz); gfx_state->tg_shadow_sz = EFI_SIZE_TO_PAGES(efifb.fb_height * efifb.fb_width * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData, - gfx_state->tg_shadow_sz, - (EFI_PHYSICAL_ADDRESS *)&gfx_state->tg_shadow_fb); - if (status != EFI_SUCCESS) - gfx_state->tg_shadow_fb = NULL; + gfx_state->tg_shadow_sz, &ptr); + gfx_state->tg_shadow_fb = status == EFI_SUCCESS ? + (uint32_t *)(uintptr_t)ptr : NULL; return (0); } diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 2588774b8457..819acbcd1fe5 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -923,7 +924,7 @@ acpi_detect(void) if ((rsdp = efi_get_table(&acpi)) == NULL) return; - sprintf(buf, "0x%016llx", (unsigned long long)rsdp); + sprintf(buf, "0x%016"PRIxPTR, (uintptr_t)rsdp); setenv("acpi.rsdp", buf, 1); revision = rsdp->Revision; if (revision == 0)