From nobody Mon Jul 7 04:09:58 2025 X-Original-To: dev-commits-src-main@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 4bb9kG5X21z61DcS; Mon, 07 Jul 2025 04:09:58 +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 4bb9kG4Yjbz3TLm; Mon, 07 Jul 2025 04:09:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751861398; 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=4RNH2yP8VDzXrbxrGF85XFa1W6b32zu14nbae0xOhtE=; b=uEi5Wy86IeX7jG8G99mQYy/EU4PtzTkz/TjILdEJ4B8QJPK3KiejYsUYgTsdo1ngJXpCzB DuhlnPY6fJTJHtUG+d2U2yzpyEXsUcuY4pw8AnbnHNkXDpjvC8yRC22MZ23DYp6/myLvju lzrN9JZ9nJcSmSgA3BqueGQRSHUZ060CpcuRhkn1qne26HKDrVVGJN3/rRzLNtxMAY7cU5 Uy0/4E/ESXEaeZEjeUrA8YCS5HjYhe3TuARrs6APhwDLUlEHdIIZE7r5+eqXMtEomokt34 BCUU12xwAJN1B2K+Q6CE0oZq6/y5+bIudImfoG5HlfG/8nGj4ILwqmJf5UF74Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751861398; 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=4RNH2yP8VDzXrbxrGF85XFa1W6b32zu14nbae0xOhtE=; b=jZcp/0lxbJeyCNJm6W19f46pyYmknuHvpl689T/tfJGB5NAzDNJlDUwjP9Xyh3V4CHy3lN p4KCkT8kH6UGGef5YbH5vPqs/bB/khcpWRsQDiRNJMiMIBBlVl4CsuUDok9ktECXcBSNfy ATK9oU5E4ztlBL+COxj8VwyhTJmVFBiyJD5GIxQnfIhOhmoeN6y0KWraKVYZOebO5f3R3M Q2rXsC89S0w9rSwbu/lccfWUP73VPdKoAyFW/EsyQ7VLimxkoaPSWgbj0HOFVHUoP4VWZJ mfURnoOGaieo8MiBOlMMd1Fqzs2FCr4Qte2KWRqhQmzCLXZMmAxof7oIb6C8JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751861398; a=rsa-sha256; cv=none; b=aT1Rzn89hBJ5F0KoxVoMbxdNqjFTNvTIy48Kce5gBDEu56Vb0ZwX2v1QiBWmDvkHGjkinM teF1gbklQI5cAAz9aFy0Mbarhq1zeYqs9h6ECd+027aMYl2tG5K83+BQm/DQIHu79RSfsS 3Yy6XHNw/EyEpyBgsAFtBlXViTzIpcwCaiA8hplnzxpbo647PuI63ENsUPhT6ktMhZ8fo7 jx6yy0mVPXrHoEZNT4Et+gUys2if58xYLV9vtbpFqADeLZpfb006d20N12tLemrf1q5vFZ 9biYvvuCoA0IixkNuwQST+x0g/weId4590Y8eej4OaK77MQau4fgpUGQzcNkNQ== 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 4bb9kG49JNzbvx; Mon, 07 Jul 2025 04:09:58 +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 56749wrw075883; Mon, 7 Jul 2025 04:09:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56749waZ075880; Mon, 7 Jul 2025 04:09:58 GMT (envelope-from git) Date: Mon, 7 Jul 2025 04:09:58 GMT Message-Id: <202507070409.56749waZ075880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: e05999a8c5a9 - main - amd64: move efi_map_regs definition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e05999a8c5a9bfb2f5c91fbc1dc397d46eed5bbb Auto-Submitted: auto-generated The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=e05999a8c5a9bfb2f5c91fbc1dc397d46eed5bbb commit e05999a8c5a9bfb2f5c91fbc1dc397d46eed5bbb Author: Ahmad Khalifa AuthorDate: 2025-07-07 04:07:15 +0000 Commit: Ahmad Khalifa CommitDate: 2025-07-07 04:07:15 +0000 amd64: move efi_map_regs definition Since efi_map_regs is used in machdep.c, efirt being compiled as a module causes it to be left undefined. Fixes: 85dcdb7aad85498b3f497b8752e69b8612b27cb7 Noticed by: kib Reviewed by: kib, markj Approved by: imp (mentor) Differential Revision: https://reviews.freebsd.org/D51183 --- sys/amd64/amd64/efirt_machdep.c | 2 -- sys/amd64/amd64/machdep.c | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index f70e235a0150..fe5d60c978dd 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -63,8 +63,6 @@ 1u << EFI_MD_TYPE_FIRMWARE \ ) -uint32_t efi_map_regs; - static pml5_entry_t *efi_pml5; static pml4_entry_t *efi_pml4; static vm_object_t obj_1t1_pt; diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 1e8f9b22bd19..f46462b39fa3 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -188,6 +188,12 @@ struct init_ops init_ops = { */ vm_paddr_t efi_systbl_phys; +/* + * Bitmap of extra EFI memory region types that should be preserved and mapped + * during runtime services calls. + */ +uint32_t efi_map_regs; + /* Intel ICH registers */ #define ICH_PMBASE 0x400 #define ICH_SMI_EN ICH_PMBASE + 0x30