From nobody Mon May 22 19:50:11 2023 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 4QQ7Mm1pqKz4CN7Q; Mon, 22 May 2023 19:50:12 +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 4QQ7Ml6rSHz442s; Mon, 22 May 2023 19:50:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684785012; 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=MyKBO6wIddvIyJ9fWHlJcubkG+cnTIeSZN7u2QrN1+U=; b=oSU9ePLQvgJaGnHfkL6dbQ57EHVLuIUu9v6mkd/u9Q80S5sUIjqHpf77SogO4OI+KxwQSA yLj2pF+7NniHHEOExkgzQEgecYVhJr8DC97K31n56UHLCUS7YK0pylVzQA/y9RMh97eYwK 9yXgj0TSpvYm2KPjTOxNZnCn6lQ4FeBmcdT9dyhnFA4kkM5CTm5mkmykZEKp3gZi54uuFm rM0K7aIIgphAQ/SPo9B8BhI5MuUebjQslwT/Xj4IOSWLCTumhS5SYexvObgHGlg+Jlz5I6 +MobQAQ/7kufuRwODfxcP+LBKyrWeBBgNNx/AhKW9xOAxcqVubC16kKWtjb4LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684785012; 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=MyKBO6wIddvIyJ9fWHlJcubkG+cnTIeSZN7u2QrN1+U=; b=rmcNAhiNimYiK4NqR5+tBdabXBOdu4sjOUgABtnHLCnhcEd5fZtDnoPB5iFObnfRuJJ6gJ GP9IQbJiyhGeDHRDGQxmKduGhwgo10JN70KejU3n3nkN3V9UQ9f2kVz/5Q77DBEKHdInuD rFqPjoGGOM9LsaCUl3+bAffwZWVAFfaoCCPZdPvNAiUo5Gw9+AxcxtO30BxzljyEyEsU5H cNwzakGswRVQMwikazDye6EB92ISJuKIK0nhc+JJ6MI+JTtInZe3qmfn923DJ8Y5amXmwP JbFbo+x563XdEYflzE5Inl4K6OeYaUfBopr+iVTjAO8AFB5DWAmmrKd5xao8ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684785012; a=rsa-sha256; cv=none; b=Mu2NxvDreoGAPFp5RIWyvtnA4QrOtX4K/cusvsZVfsIF8ov58LWLBB3v9HNxrIonoF78RV EzxmRuaicq8mSsADLVjTtbYRoECBZVo5Okpd1Zr13fKVU/nPDx3MOyv3bjQFGiXZlGlZG9 iIhsWI2TsZs7NxTV5l3k6rdT8EpuRJ1I5voy92noRCR79uEKT/dCJHy7aWMa3iXaVDjiph 7F9NiYjr3UmgsR+3wcl1TNHfBUvC8smD9Oi7upO9EIFJarrMhCeZSc3xmtC9aeJbAansAv ZApDZ+mz87wliVZboL075FJRAimKBfb6ugGkkH8tpjoMiE26mT1q+inKgj68yQ== 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 4QQ7Ml5yd4zVrF; Mon, 22 May 2023 19:50:11 +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 34MJoB6O076158; Mon, 22 May 2023 19:50:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MJoBU2076152; Mon, 22 May 2023 19:50:11 GMT (envelope-from git) Date: Mon, 22 May 2023 19:50:11 GMT Message-Id: <202305221950.34MJoBU2076152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 136b8bd610c5 - main - arm64: use PSR_DAIF instead of each individual flag 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 136b8bd610c5e5e3e3c4cf0491523fb35733d2df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=136b8bd610c5e5e3e3c4cf0491523fb35733d2df commit 136b8bd610c5e5e3e3c4cf0491523fb35733d2df Author: Christos Margiolis AuthorDate: 2023-05-22 19:49:33 +0000 Commit: Christos Margiolis CommitDate: 2023-05-22 19:49:33 +0000 arm64: use PSR_DAIF instead of each individual flag No functional change intended. Reviewed by: mhorne, andrew Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D40165 --- sys/arm64/arm64/locore.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index e26003b6c926..79affe82a434 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -321,7 +321,7 @@ LENTRY(drop_to_el1) /* Zero vttbr_el2 so a hypervisor can tell the host and guest apart */ msr vttbr_el2, xzr - mov x2, #(PSR_F | PSR_I | PSR_A | PSR_D | PSR_M_EL1h) + mov x2, #(PSR_DAIF | PSR_M_EL1h) msr spsr_el2, x2 /* Configure GICv3 CPU interface */