From nobody Tue May 03 14:04:47 2022 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 171D01ABA1CF; Tue, 3 May 2022 14:04:48 +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 4Kt1tR35PRz3gyB; Tue, 3 May 2022 14:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651586687; 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=Ir1RzOVM8E8jBcqBtZDsyKa5PROLDZsCvAwwjYwsYz4=; b=JCgOPfLOvT4lydzvnprKDfl9ZTy4JXZGuqMY8JVOtPyuCC0q/yJexzSye9g8W+SUbU98EJ kCp1RdBoO5LUOJht5ZSTrEvk5qVYcBxMqy3577hlYEsLkn2U6fa9m/IieblfAGAniBzUAV MP/fSjbpFxEALx6LpNnjLutEjPXyBdt/NMfhtDDOPSTWgzncLOCvyA2esrcHZG0uX0EGzQ qLxoC5xlzafI2uHVUpdssMjupKPoYwI08ZaPHqOdze0LBAWyCuPnpCqT/mUsJ6EYezOkDH D1DEC10xRH5+FbHPzxWHLBxrGWjNNvxTvaINik86pd60+tZsGSSN/trtjHBF+A== 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 3A31D1F9C6; Tue, 3 May 2022 14:04:47 +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 243E4ltQ077977; Tue, 3 May 2022 14:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243E4lg5077976; Tue, 3 May 2022 14:04:47 GMT (envelope-from git) Date: Tue, 3 May 2022 14:04:47 GMT Message-Id: <202205031404.243E4lg5077976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 1d16a1306ae3 - stable/13 - Include the EFI Runtime Code in the DMAP 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d16a1306ae3d27eabe50ddda14c1d33c855c39d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651586687; 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=Ir1RzOVM8E8jBcqBtZDsyKa5PROLDZsCvAwwjYwsYz4=; b=gL6kSv00D61NWFmijlSMZoIpMglC+S1Drea+sK8qlpy7Rv8uGL5aS3yyRrtUoSbhFvzgN/ 6RzfO3I6OA2iOdDMS0xOSPuNcYxPMTr8fHBhI7+ASgfWVvKGMCYVZ8IeugGe5j4fD/oYt0 qjQEdgTWiz0vsY12TeyzfhKZYkVsVLVFR5OWWgAsSG/JozWVk1Lkk4aq/GhEEB1k6QMxLF a9uV8eMjRa3OxojgZjB/BEZ/3xGc7YikrkAfptbMlWeRO+Kw6BG8Hju3rsKEcH7l/f5OTj MzUKG3jbm3X8o+GjXEagVvp0EGoNOkdpsOsCxN/p0wladHeKGcfB57BzCj/ikg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651586687; a=rsa-sha256; cv=none; b=MsbQdYD0PrmhZLpZE9Mc0ATAY5zAISrmwI17NSzso300wrtTi1CEoclyWx125Voadcfh6I TMG3arVYAnWIa2uvXwU7v+VyhXEpYcG3Xf1zH1QjRB3YMkKCX7ZMopSYu1g2iy58fZJ0U5 XQQ4ebd52pMJPWlFcYzrUs2GMSMtfqHhha+1OkMk6H2boRqojFlt07WDk0y32sVFYbz+Mp HYOSVJF9hrEhG7TZrowD861igivmt6dyo9omTPWmur64qX9fp6xbcCWDI57QU7iX3YKH+H C0lvRlJlRC0H7ZSHCw7n9CyH8W9Ni3S8O4WcKU/VwUj6gA4t/OXmy2YT/J3yEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1d16a1306ae3d27eabe50ddda14c1d33c855c39d commit 1d16a1306ae3d27eabe50ddda14c1d33c855c39d Author: Andrew Turner AuthorDate: 2022-04-09 20:17:43 +0000 Commit: Andrew Turner CommitDate: 2022-05-03 14:04:04 +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 (cherry picked from commit 57e47ae514b6ab605298b4595e0219048f59ab7a) --- 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 c4a2c48ff8ba..28105661c120 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -485,6 +485,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