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 585D7C352A1 for ; Tue, 6 Dec 2022 13:14:45 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+3wM1bSSJdjLRba27pFzpg/M7sPvQ+VTCAg8XKuRPJE=; b=cSvH8dRXRy/vwB 97a7XhhsPh9TC9eHXtz9Gxg+W7dEfM9gsOlg/dafdqt7VoiGIb3pSW+EbFOuAKYcmuFArmKcm4STo SxNryEoC5DwADndTl2j7GtLnibvoVIA++dhO786T6eHWSxpGmJtayZ3PYNNpK4wZBFWZPpkWS5k6H aUtb/Z8I16kJ5MH7c8jEtRJ5/QqDFYtCOWiKe6VVeEyZCktrqHlA354wUmQAff+Jysc2qkGzSEQt6 ofqvh7psoNgq1NYXRLnJWIkuZIGj9Hz7K7ds+LK1hvmbSjcFuxf/O/6x0aMaS/v22mW/qef2yl26i sge9t2z6+GZDkWCL83aA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2Xl9-009Zi8-PI; Tue, 06 Dec 2022 13:13:19 +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 1p2XkI-009ZJz-Js for linux-arm-kernel@lists.infradead.org; Tue, 06 Dec 2022 13:12:30 +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 4153FB81714; Tue, 6 Dec 2022 13:12:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD0CAC433B5; Tue, 6 Dec 2022 13:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670332344; bh=AVe3iiTcAbKWYIlJRS5PBz2jo1fL/vp6GINYGTQfy/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a/n9oRjWp3hVoZkKoFtw44s+n8U05UfdmNuN8tUuZLtm+k/hQ6X/0Idt8++DeeMZD I3RrBj4s37ig9GtHOL9kXN8o0DW4D7wp3QztNVivIBj37uzJOLmGzqir0Ha8MzWWdm NFvf0xTgH90IRKTXXfz8oAa8F6PM2hGaadYQGs+XpJsfex5CGEccCICLOB9GobjFjq rt8IOWH1Q8IYp873GolOeDVXRMBqTPrtQbtm2RdcEsM4d/F+pE+dulmXL9TLJGIRzd 1MtW1KTVkFy4tycNeVRLQv5FimvVELezUWr/1N3U6WU81Txgwcz0xW3w7sUHEUIToi 6HISLorjSCvng== From: Mark Brown To: Catalin Marinas , Will Deacon , Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, Mark Brown Subject: [PATCH v1 3/3] KVM: arm64: Use symbolic definition for ISR_EL1.A Date: Tue, 6 Dec 2022 13:11:44 +0000 Message-Id: <20221206131144.115774-4-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221206131144.115774-1-broonie@kernel.org> References: <20221206131144.115774-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=785; i=broonie@kernel.org; h=from:subject; bh=AVe3iiTcAbKWYIlJRS5PBz2jo1fL/vp6GINYGTQfy/0=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBjjz+PEDbA0FWCwhiG58UgillOZPpPuoxIY+XVoNlP Zkzt/hmJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCY48/jwAKCRAk1otyXVSH0J+LB/ 995JdhCfzbXIRne8vdTjY8reBTt6cnMe01V8k2YY3RYVnq3pAzL9X1kSGRujf5kvO7r1FabBUitZrT 04z8IsKj2dL1TkpPgycE15+qp2lRfHV6k6f9cMQgsBqJeA1FFaNCUIJXyH7erhvItDrc8TbIZUDkaI Ju5W71KUJiZ+8ipTvnBEvJVYWJZb8pF4JUSY+GQXr3QlaBPKWN6M3njAt7Kl5SOpqG49nusHv5bxX+ YtNO+wj59crPS2V8Dphgx5DWnzGj3vm70lu/bDQPQTwZxH502Y5lv2U9ZLcgziYM2PSO6zA7NFDMUm 1v1eWxApmk+ISBiftXyb2s4MWYHMQN 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-20221206_051226_841016_538F2D21 X-CRM114-Status: GOOD ( 12.26 ) 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 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