From nobody Sun Apr 10 08:56:18 2022 X-Original-To: dev-commits-src-all@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 0D3711A9394E; Sun, 10 Apr 2022 08:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kbm766gw2z3mrr; Sun, 10 Apr 2022 08:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649580978; 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=kez65n3FpkUwWc7EZufOvVdsdXaggO3bPylkbEXGeHo=; b=Dp4yjE7zHsaQ8qbKTIGO453OAglZN6fO4pqpiSDvcp0LH5Olu93FktgB8v3lYe6gPW4SQ8 eTQ6o8tr5iZAyoey5fgu+DziOvRJwnUJlCMI0MutelI3DVmRK7TfNQTazhssZIKfCBb2Af wjLZrLc0w06/T7jqM90KgKnAgwqspykjnOGEXBYDl9Kne4V8M02sTWzPy+tUYjoEhyzT62 VTHmSgabGbpqa+yYcshY5uNAmblFgpR3zsGLNGbm8jRD+xfqqbZsFz8lalVB894vU7uhAF bPCxt5BieROcu8MOdOw6v5/N1P6l//Jffr6aMBcXfa0XMnvShcr6OurRMr2keA== 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 C209932B6; Sun, 10 Apr 2022 08:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23A8uIgn094408; Sun, 10 Apr 2022 08:56:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23A8uIoV094407; Sun, 10 Apr 2022 08:56:18 GMT (envelope-from git) Date: Sun, 10 Apr 2022 08:56:18 GMT Message-Id: <202204100856.23A8uIoV094407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 57e47ae514b6 - main - Include the EFI Runtime Code in the DMAP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57e47ae514b6ab605298b4595e0219048f59ab7a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649580978; 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=kez65n3FpkUwWc7EZufOvVdsdXaggO3bPylkbEXGeHo=; b=Yyl6tJrM2i2qAxHs2suxFwvaa7VFizxLYNRpAiVS2knsbnb1wY8YQVET7xVzHxP9G+4pDM zCYhsy+CT9pfW9l3jDx/yaAG5QlBYDQB/3SxXginzuZSN1SsRg6dpvU4ocOI9Bkfq2yglS ZfTVrk4Ukd96AdzJ8DaS1GclHONTYgn4SaONpinVlYXaXtWHtimuzRre9lL9owgO9i62sm suoZ6Gp50GTaQk04o8dD7zOZQBVoqw85DHs/Dja/l7ZG8s3Zbe/JMNMV1A+Lgb4F+OE1Zp zKBsWd40DdpuoqA32nEtHQzPH1FVIcomu1eFqfE2jwZNuxy5qajJcRWhemRpbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649580978; a=rsa-sha256; cv=none; b=UTxSY9/48Xe0gE9TskVhRnCvzvWfjtMKYj304vSnJPwapTaULlcN25HpC2Z8Jw5edAovIH P2w/zVjqlapn9N/OcUovxpxJPQs9qd53XNBZxIQKE1ygD3UtS0/oLvo9Yj7sLMl0vwFvYp 1vghnbH8CahZx7ZkFn3pSf4W+8+a76qUEj/URD2Wc/tN9ulkDNhR0aB4M3kAiQxCfS4B3a 5/yDJMgbjZGnvEtIbfJYpF1TmjicsqWYFyiwulEmqhjLp9K19aW6Pb8g5s5AeAIKAeA2KU +sOvZKCVrTHBRVAM9suoUZrUllkA2RiROkNXd9Tgxtmd+BGOIQKeEFuyyjCkgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=57e47ae514b6ab605298b4595e0219048f59ab7a commit 57e47ae514b6ab605298b4595e0219048f59ab7a Author: Andrew Turner AuthorDate: 2022-04-09 20:17:43 +0000 Commit: Andrew Turner CommitDate: 2022-04-10 08:41:54 +0000 Include the EFI Runtime Code in the DMAP Some UEFI implementations place the system table in a runtime code memory region. Include it in the DMAP so we can read it later. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D34861 --- sys/arm64/arm64/machdep.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index b673a38ee385..4568f3752938 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -486,6 +486,12 @@ add_efi_map_entry(struct efi_md *p) { switch (p->md_type) { + case EFI_MD_TYPE_RT_CODE: + /* + * Some UEFI implementations put the system table in the + * runtime code section. Include it in the DMAP, but will + * be excluded from phys_avail later. + */ case EFI_MD_TYPE_RT_DATA: /* * Runtime data will be excluded after the DMAP