From nobody Mon May 16 09:25:00 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 4A4B01ADFA1C; Mon, 16 May 2022 09:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L1v3d1XfJz3ppK; Mon, 16 May 2022 09:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652693101; 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=X14IonGiSE3DKH72VLQqqRm6JKZVkpRxUyWVzvn0E/M=; b=wnKVH07ZuHU5Qp1m1G6DxuPNAxu+2100JE+xrj0Otkv/gTbGfT8X1Q8aN5u5zC2U8kJv1Y DfMWa0PQB1qyYCGRZ61MEmBAJSw8OiTLdeVpfWolvchWbFY/8q9Ti3+CZssS2L8gKBMsj8 Pqfz1MFR/NxlWB6w7cQRBzmZonZs141QTh5thJKsT4MUUpTHYstfjibRPd7c0j5hyQv2Tk 2LnvMaaMf9jPOeDQGovmyQbcVOiHnThwJ4DbeIXYJ6bQT6roNK6gooZA1qDb1vSCtxVYyR D75AWLtu/NkZppYsepwgKU6mmYf0JtykIityqiUBpwwrMmb21hK7EVu95qcNHw== 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 107691D14B; Mon, 16 May 2022 09:25:01 +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 24G9P0eO013007; Mon, 16 May 2022 09:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24G9P0VD013006; Mon, 16 May 2022 09:25:00 GMT (envelope-from git) Date: Mon, 16 May 2022 09:25:00 GMT Message-Id: <202205160925.24G9P0VD013006@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: 5f8e7b0c7fdc - stable/13 - Map the ACPI tables into 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: 5f8e7b0c7fdcc87e4e1a49a5c1c8c816da9f271d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652693101; 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=X14IonGiSE3DKH72VLQqqRm6JKZVkpRxUyWVzvn0E/M=; b=hq8QIR4/IGKhFL/s6NOyfZhe+QKnCLBgb7/cewl8rMJkgDel49d4e1qs14AM3IOmv4uRHQ zulBYOahxyb2JtK+gyQu5BVd0QdNZG49jUoX7D2nMdIYbX31r8Sxu2Y//7TrtLMMfY52KG j5WGqmsVvRyuDtjWH8vcKdwo8nQdqipcxsY7SSX/46Yb5GLfIWsf2Lnb6/DVtujBmttNV1 qVwP959qPtzHncp1QZRaNSJ9wpN00QAWU3E1V5Woi4k6dRuja473KiUflmhWJcF5VlWeXV Bgf3uKp+uJX+aYnagsp/KuswZEGEPsWoW+mevotSQUX9e9a5/Sr5g+/oIDYf+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652693101; a=rsa-sha256; cv=none; b=UtUswYws2em4Gb1vunEgCXtm+RG1iNeVxQgDqLJbU8rW33RA5AkkHLJTDiCptVySs5+qM6 xg7SEZnZ7wYQuKW0PoJgYztlG4w6Mj2L/Cgm7Rehz2WwNgAkienv6KSSO9E4GPM8jpV1Iv rzsLpswRDxq1Df5T6CKtSgowteVEsP6AtWmofNL9TPF70miSj/B4BBjTyAZOpLxbxVZuXD uQsedK7VaAQoFPOQ7aiK6x0M4ytLSDW3Xz2EVvh1YklxCmoS4B0PPDWebST6CHg6zjl6Tp 72j0I4zCLVwXYer9obE4Z4Va9X3tlYDr02dCFp8nMRVa63PpN9k8wpADNgeKjg== 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=5f8e7b0c7fdcc87e4e1a49a5c1c8c816da9f271d commit 5f8e7b0c7fdcc87e4e1a49a5c1c8c816da9f271d Author: Andrew Turner AuthorDate: 2022-04-29 12:02:15 +0000 Commit: Andrew Turner CommitDate: 2022-05-16 08:32:59 +0000 Map the ACPI tables into the DMAP When we try to load these tables via acpidump(8) we need them to be in the DMAP for /dev/mem to access. Add the EFI ACPI reclaim memory type to the list of memory we map into DMAP but not used by the kernel as this is the recommended place to put these. Sponsored by: The FreeBSD Foundation (cherry picked from commit 5b651b501a466a0c2a8ec6b5afaae348c410f116) --- sys/arm64/arm64/machdep.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 7b135a3623ba..14d0dcbf6c2f 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -485,6 +485,11 @@ add_efi_map_entry(struct efi_md *p) { switch (p->md_type) { + case EFI_MD_TYPE_RECLAIM: + /* + * The recomended location for ACPI tables. Map into the + * DMAP so we can access them from userspace via /dev/mem. + */ case EFI_MD_TYPE_RT_CODE: /* * Some UEFI implementations put the system table in the