From patchwork Tue Aug 8 11:46:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13345984 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 9C51EC001B0 for ; Tue, 8 Aug 2023 11:48:44 +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=/4Xfouhsv5mojcEBoKEWcRt7QwRFuM1AQKOJ9fmTOMI=; b=rQgxMEk4e6zMZ6 SAAoJ/9zcyNgg9fvj9/qDQSc17iR7NJhYIRFL5c+duTB6BZ0FVyH6MqJHoQdhJQhzcvioXZ01rp4j 2qRJCVXCBsHniOAXFqbfSzU25p4iqtDFujG+KzW0rteEZLog/9igBxAKunZlI0Vtb28dqy1IW4T0C pgvh9TgLVr85ublDXYIw4KYtanLNindpHTbTz6+evORNTWH0F/QKlKhcZcTnI5Hmn9rCK+WaqTBFH IxGY9/kWnAGC4pxOcCQV+KuDEk9Rg+oF3nekjp1YTPHTCiOWjIFIT++7sasSEE7+ENIjqK2NxTV0Q 0epwGM180TVhsaSslZzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qTLCB-002Uym-2K; Tue, 08 Aug 2023 11:48:15 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qTLC2-002UrV-2F for linux-arm-kernel@lists.infradead.org; Tue, 08 Aug 2023 11:48:08 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1962D624F8; Tue, 8 Aug 2023 11:48:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A476C433C7; Tue, 8 Aug 2023 11:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1691495285; bh=wPhod5Peg0BcU9eGJCAQdNgMOfMqpCFVOnHFnmu3guw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qt/4tmIzBPy0tPh29h8gQ6/umtxHfxo1i99WPzQJrl1oAeCALla7dj51jvm9L12A9 xowndrPa1lQyux+zJhKN9FAnM+aLWqWRQVPWYej4MMPxSGy1mtoQQfnAbljwT105d9 hm2zx9YcEvhSunzkH48RcmjCEbRJARHgjW89IImeDH9ZLFb9nRh//l3/M5Ikiu61Z2 6ALgIChbSEDflQVm01SZcP0aP8eM4ExrnXm/KUkGWDDoxTf+2t7wmrE7eCQW0C1OzX mSvUuBxjACr3kb6uMmeZff6CWY64A7YuEEYJWEDisEGGLKDic2UbOxfJ7S83edbS9f +aTyDz850LQng== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qTLBG-0037Ph-Aw; Tue, 08 Aug 2023 12:47:18 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Catalin Marinas , Eric Auger , Mark Brown , Mark Rutland , Will Deacon , Alexandru Elisei , Andre Przywara , Chase Conklin , Ganapatrao Kulkarni , Darren Hart , Miguel Luis , James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu Subject: [PATCH v3 11/27] KVM: arm64: Add missing HCR_EL2 trap bits Date: Tue, 8 Aug 2023 12:46:55 +0100 Message-Id: <20230808114711.2013842-12-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230808114711.2013842-1-maz@kernel.org> References: <20230808114711.2013842-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com, eric.auger@redhat.com, broonie@kernel.org, mark.rutland@arm.com, will@kernel.org, alexandru.elisei@arm.com, andre.przywara@arm.com, chase.conklin@arm.com, gankulkarni@os.amperecomputing.com, darren@os.amperecomputing.com, miguel.luis@oracle.com, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230808_044806_883708_2D169A45 X-CRM114-Status: GOOD ( 10.99 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We're still missing a handfull of HCR_EL2 trap bits. Add them. Reviewed-by: Eric Auger Signed-off-by: Marc Zyngier Reviewed-by: Miguel Luis Reviewed-by: Jing Zhang --- arch/arm64/include/asm/kvm_arm.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 58e5eb27da68..028049b147df 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -18,10 +18,19 @@ #define HCR_DCT (UL(1) << 57) #define HCR_ATA_SHIFT 56 #define HCR_ATA (UL(1) << HCR_ATA_SHIFT) +#define HCR_TTLBOS (UL(1) << 55) +#define HCR_TTLBIS (UL(1) << 54) +#define HCR_ENSCXT (UL(1) << 53) +#define HCR_TOCU (UL(1) << 52) #define HCR_AMVOFFEN (UL(1) << 51) +#define HCR_TICAB (UL(1) << 50) #define HCR_TID4 (UL(1) << 49) #define HCR_FIEN (UL(1) << 47) #define HCR_FWB (UL(1) << 46) +#define HCR_NV2 (UL(1) << 45) +#define HCR_AT (UL(1) << 44) +#define HCR_NV1 (UL(1) << 43) +#define HCR_NV (UL(1) << 42) #define HCR_API (UL(1) << 41) #define HCR_APK (UL(1) << 40) #define HCR_TEA (UL(1) << 37)