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=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 1DD4AC48BE5 for ; Tue, 15 Jun 2021 14:29:37 +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 DF4CC6109D for ; Tue, 15 Jun 2021 14:29:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF4CC6109D 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=LQx4NqnPSPvJ5XFCG9DG4OMjLtKiucEq3OJLIPoSwd8=; b=V/ymoyL9Z2wgngnKitwyP66e/U gle0AvW3LibhTFvSDAq01ixGN3ZZaL50NMWvSXLofRbNkPRaDrP8OZuysffERzhV9PmlwsIOGSyuN QJDAYpBplFNA5VU+hoVwriKZbI2Gfw6wssnIrTpU0wKchXSPt9PQxku8Jm5nmzGOQEwjqJDJvfIju HO4zDs4yDLzAIA/pnL6xCFHSNFLyPSWZIkeN+t0kJED9MCpchpOWv1zzQ8lK2j/HAynCzhqRoL4YS EHhOIg7MLDyc99dJg4/lk6ziyRZxuJ0ArnvrF3J7qe1Ol///CO/3rqrRQo+AG7B6rYmUcJAuJearS 0rFBsciQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt9wy-000YFo-Bl; Tue, 15 Jun 2021 14:21:56 +0000 Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lt9Ig-000F7m-Aj for linux-arm-kernel@lists.infradead.org; Tue, 15 Jun 2021 13:40:20 +0000 Received: by mail-wr1-x449.google.com with SMTP id d5-20020a0560001865b0290119bba6e1c7so8610423wri.20 for ; Tue, 15 Jun 2021 06:40:15 -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=fyVnhosKjO9mJxnhSqbPrj1l9sRivPJB1/WXZpuNCbg=; b=CsYREq5TCGC3GlLAFzzpvOuZn77mbxFuT1HeSaoBYGBPIUqCCXllBpCItlg2k4J9dr wSW4SwkdS5tGyldgGcoUy59zWlwHp5ZAH3ecc8LlNxDUSiB9YfVxKGW/sxxQL4FmD/b+ lKPpn/FO4Y8fhUufgBFz7+lNLUmV6L2V8rYBSuWAoF1UDcH5oKdF5OqRVwRBXg3N/1MZ ps27wzJM8b/nId19bb+KylGK8pGm8BGsaNY7gWq+3vNMhgVOP8xMrrcUwNzPNlBB+a+l +rYJ2mHuF+N2eSlDBlDFeTrII+2b/fjA+h4K7yJpfGmMjHrPMBcermkHOTaJZe94nhTY 0D3g== 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=fyVnhosKjO9mJxnhSqbPrj1l9sRivPJB1/WXZpuNCbg=; b=sezZJJgMxFXtpawoTB7ENbYNZnYs/qzY3lvC4p+NojhpfmKSLibFo6THKLskUi6VVo 2xrBwMzFU1EuLXfTNd7X2DYI4iZ6d3NMGD7wKm4yD+CXgP0nN6CnfUfW5OyiZ0iG4OD7 Qlgrh9MBc5EqquxjH9IA3Xzd2V0m20B1CWYZpca3LXzfc2swfZLZ3xtI5Q2mHdmhs8yK y3v403BSKKV6Fv7w6Jps5pqRHXeYkHku8SiuuFUV6LICmnm1VSQToVWuNOqQ46dkkNis wQPHvVUby9suVIYH2J5xN7usA4cPbEJoDhwC6tWh7tPmRzcn6V4vHU5B9AGJFzmV1X7G FXrQ== X-Gm-Message-State: AOAM530ZRCHYJJRW1f9d0TuSLclTi8JdTKQF0KJybddZ3ZDbEIUGW0oX epDQEX/mgxHwic1erEiSzMD5Xq3Vqg== X-Google-Smtp-Source: ABdhPJz7Ytktcyo9Dae8s0uQ8IHI2dhbPT3mA+LLAcl6XXLCYMUnLkF73AEFzonsZW/I662sARQOr6aDHg== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a7b:c304:: with SMTP id k4mr5384103wmj.68.1623764414046; Tue, 15 Jun 2021 06:40:14 -0700 (PDT) Date: Tue, 15 Jun 2021 14:39:47 +0100 In-Reply-To: <20210615133950.693489-1-tabba@google.com> Message-Id: <20210615133950.693489-11-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 10/13] KVM: arm64: Move sanitized copies of CPU features 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_064018_431014_E9900B08 X-CRM114-Status: GOOD ( 12.69 ) 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 Move the sanitized copies of the CPU feature registers to the recently created sys_regs.c. This consolidates all copies in a more relevant file. No functional change intended. Signed-off-by: Fuad Tabba --- arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 ------ arch/arm64/kvm/hyp/nvhe/sys_regs.c | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index d938ce95d3bd..925c7db7fa34 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -25,12 +25,6 @@ struct host_kvm host_kvm; static struct hyp_pool host_s2_pool; -/* - * Copies of the host's CPU features registers holding sanitized values. - */ -u64 id_aa64mmfr0_el1_sys_val; -u64 id_aa64mmfr1_el1_sys_val; - static const u8 pkvm_hyp_id = 1; static void *host_s2_zalloc_pages_exact(size_t size) diff --git a/arch/arm64/kvm/hyp/nvhe/sys_regs.c b/arch/arm64/kvm/hyp/nvhe/sys_regs.c index ab09ccc64fea..de995a8a5eb5 100644 --- a/arch/arm64/kvm/hyp/nvhe/sys_regs.c +++ b/arch/arm64/kvm/hyp/nvhe/sys_regs.c @@ -19,6 +19,8 @@ */ u64 id_aa64pfr0_el1_sys_val; u64 id_aa64pfr1_el1_sys_val; +u64 id_aa64mmfr0_el1_sys_val; +u64 id_aa64mmfr1_el1_sys_val; u64 id_aa64mmfr2_el1_sys_val; /* -- 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