From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0634C4167B for ; Tue, 27 Dec 2022 17:07:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+U78i2k2WRu3wV33CVwm0+alnOU4fBhOcOLZhd7IEoo=; b=DCT32GI8TCIK+9 E7ULTiiUy3t/TnebbQu5WwtyMBfHqieBHvb6WE0IndVmNK2f5pb9iBcvne1MD7zS6ukZ4HiBUzqCq QYItOOoW+GZ933OoZ4DTQIAa6D/x1dqi3QH7wGM84vGDkO4ecHk7Pa7nuEXgMEV8abOEFnDEKhwtE G57+rdbFRdpGXxvuk7kcR37ltMNR44nk/ABQLQLCD/52uhPkpqXI+gRECI5oWzX4B9n329auw2b8o nhpLwZh0wY6EYOWlp8me8xmB5F9zqhqPPOFH6mnOvLfQ629YkC2pEMBWqmwhoBfC5xokjb43OqjWD UiZiRyWEEmr64yNduCHg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pADOp-00Ekcm-Ka; Tue, 27 Dec 2022 17:05:59 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pADOV-00EkUZ-9F for linux-arm-kernel@lists.infradead.org; Tue, 27 Dec 2022 17:05:40 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id D412AB8106C; Tue, 27 Dec 2022 17:05:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58521C433F0; Tue, 27 Dec 2022 17:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672160736; bh=qsXdvuxsIsQ0RJ6r2ryN12iEQ7awbL7XBJ6twbWpy0M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RTzNt5SubQ47XEdE5i7Db6/ySJ1yGTUKnJiCtI8gw3GvvEkKJSSBuzPeC2D/SFbPk UGyYP71hECx1vR5R/NHUHwQmOJXWsDvYczcFHmjiKS0Rc21S5hRwaYCPfw10bwF8YT KY6qE+yOSev5u8C+mmur8XZpRn3StznZ4jwqq85hVrid/5vfbvhr1CxUcKjM6vhL76 WHfTVrLgCQNSVX0SYmbfirTLic6d9GFC3CfIt1TEnxasNXqepcuTB8TVjBSC2g30Cw VpVoEZIAEHILQYsF3jHH29qi8aOc7YGzb7e2abpkqGVpJZDXcKzkUBF0C6LPjDop8i IsRP3+9eEAuHg== From: Mark Brown Date: Tue, 27 Dec 2022 17:05:05 +0000 Subject: [PATCH v2 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A MIME-Version: 1.0 Message-Id: <20221208-arm64-isr-el1-v2-3-89f7073a1ca9@kernel.org> References: <20221208-arm64-isr-el1-v2-0-89f7073a1ca9@kernel.org> In-Reply-To: <20221208-arm64-isr-el1-v2-0-89f7073a1ca9@kernel.org> To: Catalin Marinas , Will Deacon Cc: Marc Zyngier , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Mark Brown X-Mailer: b4 0.12-dev-7ab1d X-Developer-Signature: v=1; a=openpgp-sha256; l=828; i=broonie@kernel.org; h=from:subject:message-id; bh=qsXdvuxsIsQ0RJ6r2ryN12iEQ7awbL7XBJ6twbWpy0M=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBjqyXZUsFPCghBp31WO9f0pNOe2wRT/ucx6EDQktXG T6JCrbWJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY6sl2QAKCRAk1otyXVSH0EdqB/ 9EaUv/a5mcIA/DKN3fXJ7Ys2HkyT9PsDW4sMLQlXG2KVRjxdZl0z1iDNJaIt5bdbQRAfMIEgmUCpHh 2mfXlWzQ4ApSGJko43miI2obvGop0OVpQWAg6JsvUr/nKcEkVHT2GhhPeeEzDGE3Br6qi1AbXnbpQ2 6cbd0gOTLhRE6Fz7DO2O5TWR7Z5L7uyh+jX6JPY6eX4QcOfC3AAklZ6wm2yQhJrob9vy3WEw4uA0XZ ScCZzH4LwJrHLHpwfnFUqo28rHt0/eL/3HkEEJ7VXIy3At1V9Dla6TOZusrN7PdecWafh6epJY2kNz SDd+19xEflwN+lK2ean5XRt8W7dt7N X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221227_090539_672322_4239CAEC X-CRM114-Status: GOOD ( 11.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Now that we are generating ISR_EL1 we have acquired a constant for ISR_EL1.A, use it rather than the magic number we had been using in the KVM entry code. Suggested-by: Marc Zyngier Acked-by: Marc Zyngier Signed-off-by: Mark Brown --- arch/arm64/kvm/hyp/entry.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 435346ea1504..f3aa7738b477 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -171,7 +171,7 @@ alternative_else dsb sy // Synchronize against in-flight ld/st isb // Prevent an early read of side-effect free ISR mrs x2, isr_el1 - tbnz x2, #8, 2f // ISR_EL1.A + tbnz x2, #ISR_EL1_A_SHIFT, 2f ret nop 2: -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel