From nobody Mon Jun 10 15:29:40 2024 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 4VybMT0Mx9z5M6J2; Mon, 10 Jun 2024 15:29:41 +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 4VybMS6jFZz4jmV; Mon, 10 Jun 2024 15:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718033380; 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=0STohXSZ/sbaluk5jFU8iEUUNyU3uQfZ8P+yNdr1izk=; b=Ugy3gYiXACwidJOzGoXHIAkrvBmhq4PiZ5cpTd67doRObFIL1jZrhgUklvXwH498KAU1Yl EAR8GQWt0EGfxTNkS6mjYkXsaaLtK37ttZyR3UUNPzZZfHheDdgXg+yF0awLeNhmIkegCh WbX1ghoDt/VDsQvviMpR+sPm9N7hR2LQg5HCQPVbpbARba8FSY/fVBgT2b49zrCgBTsmMu M6fxvE47lSuYETWrsCyfb4uLgUQ+aUpr37SBXFTsoLsFST+hvEa0n2LQkLpl88Wa9c/A4o f62A8Mrx8rvEpxF+AvML0csKNF4INSG7hqmh6d90O0BtI8ZtK0G+ZRcWb86ngQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718033380; a=rsa-sha256; cv=none; b=WbpuAD6uaCKtf6gz6JkMz4GRwjhOC8ugD+3SogE3OXoHPuDeMHkg44uCIyA5Vg0ceLRikf X7UKA3+/6kJf182KTsjfPnQDQEJNfPWGhgIpgBkqZ6ItzHLtScbePIW9WjtYwSk2M4IiOt wIvBTABb6ORWQWy5crc1DghZE3ghQBCLLbnT3YpHHWNXOQhych9yDe7EupaZYptXeC2mFY /0zv2rNyhofV8Az3Qo/3bHZGZUXLWBIhH+ZlpoD0LbtdUKromLGcffHboO1b3pHeOzzWIz Sgtd1Pa3U7rE8v+vIE/jp/1p9E8aY0ft0CeBXEtxumNUfTlglQtIm7QBxRJSsw== 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=1718033380; 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=0STohXSZ/sbaluk5jFU8iEUUNyU3uQfZ8P+yNdr1izk=; b=DSh+ijhnCSjkehL+mYgdu5zXRIL90HSR1JfgGVUyiBQ+urJrt7H4hylJOYQ83FuYb/Q5ja VTlYdrqES3TYU9YfcQ7VMPdEtMWcsW8Xg67vVeO3ZUeK69KiCR62+yslijTSCel32V1hvn /RhO7jNnElQO1UbpvWuoUW7+qc2EkbVSC9OaNC8PZsg0aY+/qYqohwCRjfEt2vrmXHysrh 7vT6bU9HqsFLvD/ObiE+g9Pf7cEQg3AH8/Xxz0Xo4ewAHo17Zr0avwPfbd2kih7FSlxayF XcJ9YFnMCm6dYMYk7Y9fXBkoULaY9RDKYzsbs9hqYiE6QjjgslabAR+z/1m6CQ== 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 4VybMS6FRlzX87; Mon, 10 Jun 2024 15:29:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45AFTeiV039277; Mon, 10 Jun 2024 15:29:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AFTeB5039274; Mon, 10 Jun 2024 15:29:40 GMT (envelope-from git) Date: Mon, 10 Jun 2024 15:29:40 GMT Message-Id: <202406101529.45AFTeB5039274@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: 63f7a383434a - main - vmm: Only link the arm64 hyp code in vmm.ko once 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 63f7a383434ae81cdccc6250045f637f8ae9615a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=63f7a383434ae81cdccc6250045f637f8ae9615a commit 63f7a383434ae81cdccc6250045f637f8ae9615a Author: Andrew Turner AuthorDate: 2024-06-10 14:58:15 +0000 Commit: Andrew Turner CommitDate: 2024-06-10 15:16:10 +0000 vmm: Only link the arm64 hyp code in vmm.ko once This code runs at EL2 while the kernel runs at EL1. We build these files for EL2 through a dependency in vmm_hyp_blob.elf.full so there is no need to include them in SRCS. Reviewed by: imp, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45467 --- sys/modules/vmm/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6737d868f2ea..8f6eb915290a 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -34,8 +34,7 @@ SRCS+= vgic.c \ vgic_v3.c \ vtimer.c -SRCS+= vmm_hyp_exception.S vmm_hyp.c - +CLEANFILES+= vmm_hyp_exception.o vmm_hyp.o CLEANFILES+= vmm_hyp_blob.elf.full CLEANFILES+= vmm_hyp_blob.elf vmm_hyp_blob.bin