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, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 50D4FC47082 for ; Tue, 8 Jun 2021 14:14:13 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2371161078 for ; Tue, 8 Jun 2021 14:14:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2371161078 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=iqUuWsNg2GCpO5z8SDO1tdj8fl91ojqqqkJi8FxVQOs=; b=gYUgabO2Lw7sJLuRr5sImCSwW+ wLvTfQx9IgZdPGt2pFVIjLpp8M+RaAb4XGSbOWPQDEEuoG2K/e6oGPB86kEVEJezF/Q08QvOc5NL+ G7RAlMtCHKzpaxID1hUvlSa4giiFeeVSq0cejdeVwflXxSci5LMFmOobKOB44a+mIVuHrPHURPKqm tnpIzh0X14GA8G53GpX8S/JY4yoo55qANt/KVr40G5bYLajRnpKe/HsB3D4OcKv+LsqUp/+IHJslp 8dm6lrDOUWkxjzBXHGSrVEHDOdXTb0wPsoBJc9zpkHpIi5bX6G/eskqKvhBDVApy/IegsFEt4gDZQ 8KHyBviA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqcSo-008ne6-07; Tue, 08 Jun 2021 14:12:18 +0000 Received: from mail-qt1-x84a.google.com ([2607:f8b0:4864:20::84a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqcSO-008n3J-Mx for linux-arm-kernel@lists.infradead.org; Tue, 08 Jun 2021 14:11:53 +0000 Received: by mail-qt1-x84a.google.com with SMTP id z9-20020a05622a0609b02901f30a4fcf9bso9470224qta.4 for ; Tue, 08 Jun 2021 07:11:50 -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=JXESWIRrg65Jst8XI7PkCsZKq0ZtOHhtcll5+7kJZvQ=; b=EZZZOs/wJaLpc4iV8fhIWCgKJcms1Zc85BNtnQggUPKXLstvhiF1Jeh4Z5mKQORV1x rFVJ1253JOz+Ny3hILPyxJN25otv0qA72R77AxNIg/sjMzYAn95LC9YrROnTMPnB9hJL 5w1ejcaPtilYK6h/+gIJNqCjIPpGrtK+wn1lEvXmeLuxuc0ZTXgQICCE9UdsRrPtEtap u0tTuPG5/p/s5OYny9dy7K5wOHk7JRHis7NI28wlQNOg37qO8VQhe8xTtU2PYPK0oQyF RRdHjhmCR1EpJ5PkNy57QB3dBgQVQzyUdGqtHQDFUy/huC8jMWOlrPjcuFbQBqn+PDIN FJHw== 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=JXESWIRrg65Jst8XI7PkCsZKq0ZtOHhtcll5+7kJZvQ=; b=iYki2FkH3UbNOHQs0k26zLC+S0Nh67VfmZM+g/4cp1s/4ZHCH6ULH4t1cXAdK4B8l1 26aUE6BePNh6dr0VLlMvbJnGlukb7Lc4cszAnm9LXBSmVSp33CmJbqwMJsEb9LDbkMIP j9xXdI/NIyMdt3eDIub2rZSgRoDl/bADv+DFOv8NNmN682TiITOufIinjeZ3urD3mPr7 xYrmPUYLd0FbukYBw/6gxmq8UfmoxUkpYD16Od+jynA2Zc0D+q/cTC5qcq6bjU2JOnBB Nuym6LWwbb8c+JIrH4gYPJGS9oqMguM/+WL66RC/J6CkFq50Mhs6mwcMMdXMnk+Jxogp 47Aw== X-Gm-Message-State: AOAM532sEAD7WGXv19zxNKnPLBkEYbeWZty8hZyzTFiJ53ovkjWppAAw TOaXLOloNYuGDaYu5jNRyG3DbUT0DA== X-Google-Smtp-Source: ABdhPJzFZhBxwNe7fGP0rKm32SNqUOu/zZzV1SJv34ne7YfRjjA0JDJ8WQ4OdDzl/uUfpzc+v515ENBpag== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a0c:f982:: with SMTP id t2mr327420qvn.28.1623161509479; Tue, 08 Jun 2021 07:11:49 -0700 (PDT) Date: Tue, 8 Jun 2021 15:11:31 +0100 In-Reply-To: <20210608141141.997398-1-tabba@google.com> Message-Id: <20210608141141.997398-4-tabba@google.com> Mime-Version: 1.0 References: <20210608141141.997398-1-tabba@google.com> X-Mailer: git-send-email 2.32.0.rc1.229.g3e70b5a671-goog Subject: [PATCH v1 03/13] KVM: arm64: Fix name of HCR_TACR to match the spec 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, 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-20210608_071152_774021_4E55FBB3 X-CRM114-Status: GOOD ( 11.90 ) 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 Makes it easier to grep and to cross-check with the Arm Architecture Reference Manual. No functional change intended. Signed-off-by: Fuad Tabba --- arch/arm64/include/asm/kvm_arm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 25d8a61888e4..d140e3c4c34f 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -33,7 +33,7 @@ #define HCR_TPU (UL(1) << 24) #define HCR_TPC (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) -- 2.32.0.rc1.229.g3e70b5a671-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel