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 X-Spam-Level: X-Spam-Status: No, score=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CD4AC48BDF for ; Tue, 15 Jun 2021 14:21:12 +0000 (UTC) Received: from bombadil.infradead.org (unknown [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF72F61483 for ; Tue, 15 Jun 2021 14:21:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF72F61483 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=hE8rRoAG6hvtx3rWwLzmbD3gp9fVTWTIc+sO/2FuF18=; b=1ZxoKASr4Ujj5OTFVrVksczKi5 DJE6l9ZiZaxX6ByfTC0xu8bDegT914018ZfhbK5P6BeKKdOy++Zykz6ennbRF0HkWQEKgCO+41WcX vt7TrG2YqHZxbqNkdywPkt/3dl8sbPf+G9M1wuT4NnMCPpNk+mN9m1VhhRsXatmEKkIG42oGzcszt 9of/qaKr75n/yHDr04hZQ2qaeil/RsPzYHkwf+QXpD/OEiOfyx41afHr2Yr/Id/oQK4Seh0gWCexD 8Xy6Vy446YmWJsXP3fFyWUY20AH2v5HRXhPXawbedwmtqU+h9g28JekTDFpo963IkU9kvGaFWSDQv HCIiFfdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt9oM-000Uay-Nm; Tue, 15 Jun 2021 14:13:03 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt9IR-000EzK-Se for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 13:40:05 +0000 Received: by mail-yb1-xb49.google.com with SMTP id g9-20020a25ae490000b029052f9e5b7d3fso19778552ybe.4 for ; Tue, 15 Jun 2021 06:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=29BZ8y2wSdq8zl7iml6Bt00bIzQdXVAxUwLgng+5GpY=; b=mbhqUAYoLWki9ZQC/43jymFoWJjm7rNBAqWPNEdO+rubaFQpVPtB+CSPxuFRA7oUWd 65odqls7yHsM2e3bt+lZE3gzA/fZz5rl5z2U4B196nGEcZ8LrEGw5GfJ/UrX3lSz9Nsm TsW0qKYlLkzVp3rVRHt5QFVwtHnbOygRjTQAjxieK1Jo5YdtoQ5dCaS0KCAbK/tcQM4g BwMO35UW38lyuAype8tfgSb7jUTEm20Pa2d3U9Qja/YhafAsS4YViH6SAfXH+CyjNn7x stl0fOclU4ioqm48YDsYXSifaSpYoFVEKtX3Fn+NN/T0PYF4w+R9Xbjbt2UHzjTLb6Ur GlSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=29BZ8y2wSdq8zl7iml6Bt00bIzQdXVAxUwLgng+5GpY=; b=e6oSSLLZ/T3gGDkFu/kqjqaKp6jH6kVrhT+s/SrxKiC40j4pBYA3eB8SVxZ/aEBhqH EGaAcIo6fg89pAHooi03E2plk+mGKvTshY9PhQYKl8hJF5Eo+qErWatzxgRXYjw/OYn7 LkdyYmpfUK8ziwyvP0HwG1WlEehmoiqoNQ28T++qGbj2BBFXISO3zRtEulReC7HeQpSE hMVHLBOnSfpsagkNvOSk3l5r5q8WDC8MniMmNyaaX1ygwuW6u3IfZhqBkvxzdvluVpwC YoxWduqy9sQsseuqbqgVcMBta7SFcLbDxcct0CtJ841bMiqb8DkESl7L7vfSHB1KVCjA vVMw== X-Gm-Message-State: AOAM531p0IzxGwmtTRBnsPgHfduXFv8aJqDUULEhgzhr4rFEXbF9Md1p OYJ8isUjOyJLR+jUMVB6OuHH57PuMw== X-Google-Smtp-Source: ABdhPJyqfduLDddGb1lOk/v5X9rCS+Pp0WuT0RKnWKDhyYRJKRIbrBPP1usWU75SZZd85GaYbhcHDfsJRA== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a25:4641:: with SMTP id t62mr34041829yba.253.1623764399546; Tue, 15 Jun 2021 06:39:59 -0700 (PDT) Date: Tue, 15 Jun 2021 14:39:40 +0100 In-Reply-To: <20210615133950.693489-1-tabba@google.com> Message-Id: <20210615133950.693489-4-tabba@google.com> Mime-Version: 1.0 References: <20210615133950.693489-1-tabba@google.com> X-Mailer: git-send-email 2.32.0.272.g935e593368-goog Subject: [PATCH v2 03/13] KVM: arm64: Fix names of config register fields From: Fuad Tabba To: kvmarm@lists.cs.columbia.edu Cc: maz@kernel.org, will@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, pbonzini@redhat.com, drjones@redhat.com, qperret@google.com, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, tabba@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210615_064003_972487_8FD85B7B X-CRM114-Status: GOOD ( 12.95 ) 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 Change the names of hcr_el2 register fields to match the Arm Architecture Reference Manual. Easier for cross-referencing and for grepping. Also, change the name of CPTR_EL2_RES1 to CPTR_NVHE_EL2_RES1, because res1 bits are different for VHE. No functional change intended. Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/kvm_arm.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 25d8a61888e4..bee1ba6773fb 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -31,9 +31,9 @@ #define HCR_TVM (UL(1) << 26) #define HCR_TTLB (UL(1) << 25) #define HCR_TPU (UL(1) << 24) -#define HCR_TPC (UL(1) << 23) +#define HCR_TPCP (UL(1) << 23) #define HCR_TSW (UL(1) << 22) -#define HCR_TAC (UL(1) << 21) +#define HCR_TACR (UL(1) << 21) #define HCR_TIDCP (UL(1) << 20) #define HCR_TSC (UL(1) << 19) #define HCR_TID3 (UL(1) << 18) @@ -60,7 +60,7 @@ * The bits we set in HCR: * TLOR: Trap LORegion register accesses * RW: 64bit by default, can be overridden for 32bit VMs - * TAC: Trap ACTLR + * TACR: Trap ACTLR * TSC: Trap SMC * TSW: Trap cache operations by set/way * TWE: Trap WFE @@ -75,7 +75,7 @@ * PTW: Take a stage2 fault if a stage1 walk steps in device memory */ #define HCR_GUEST_FLAGS (HCR_TSC | HCR_TSW | HCR_TWE | HCR_TWI | HCR_VM | \ - HCR_BSU_IS | HCR_FB | HCR_TAC | \ + HCR_BSU_IS | HCR_FB | HCR_TACR | \ HCR_AMO | HCR_SWIO | HCR_TIDCP | HCR_RW | HCR_TLOR | \ HCR_FMO | HCR_IMO | HCR_PTW ) #define HCR_VIRT_EXCP_MASK (HCR_VSE | HCR_VI | HCR_VF) @@ -274,8 +274,8 @@ #define CPTR_EL2_TTA (1 << 20) #define CPTR_EL2_TFP (1 << CPTR_EL2_TFP_SHIFT) #define CPTR_EL2_TZ (1 << 8) -#define CPTR_EL2_RES1 0x000032ff /* known RES1 bits in CPTR_EL2 */ -#define CPTR_EL2_DEFAULT CPTR_EL2_RES1 +#define CPTR_NVHE_EL2_RES1 0x000032ff /* known RES1 bits in CPTR_EL2 (nVHE) */ +#define CPTR_EL2_DEFAULT CPTR_NVHE_EL2_RES1 /* Hyp Debug Configuration Register bits */ #define MDCR_EL2_E2TB_MASK (UL(0x3)) -- 2.32.0.272.g935e593368-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel