From patchwork Fri Oct 8 15:58:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12545675 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17C29C433F5 for ; Fri, 8 Oct 2021 16:04:22 +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 CFECB61027 for ; Fri, 8 Oct 2021 16:04:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CFECB61027 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=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=LOMV4GVVVsba5mZMc86aukXQCIw/7jvALZ1cS1+UjbQ=; b=MJRb9U/XE2wVLNaJN77M3wk4Mj wRoGjx/1hSOjRZaeFdNzGXFKN5gn5AhaEnloxZ36u2bA0TC5+ew8O6Fv72a4Te6/r2A49vk3jub0q 8jgEozN4JrMBjEakJtZz3IdOS4gfpKxzjlSQBLgK2gmzX6/YxosLem4bS+Br/uYAW/aB6Q2UWT0PD x9+RXnCHUR9f8EZahFF3CGqUawmo3obz9dvE1WzENHnLkyKv0WYb0E4AM8WLyH1lt48raGcQckdWL vuuiNz/UxeRtaSJ0Puk35uPDYuUgFM0yjONqkPpNV7ydhMeAUWGIwyE0ZmLMUxRu9wRFCwbuZ1tfO vKf2e3Mw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mYsKN-003O5d-0s; Fri, 08 Oct 2021 16:02:31 +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 1mYsGu-003MQQ-2z for linux-arm-kernel@lists.infradead.org; Fri, 08 Oct 2021 15:58:57 +0000 Received: by mail-wr1-x449.google.com with SMTP id 41-20020adf812c000000b00160dfbfe1a2so3995910wrm.3 for ; Fri, 08 Oct 2021 08:58:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=rwYC2sE6wVOnGoN5vSGqYSfz4869siK4qW09U7txiBc=; b=c8ru3Qe1oXnPhtzT72VnFYCpAjo0RvFHMHZ080BzM5rLRiOjwEsYh2ClAFhCjYGfvG nLpo2bQPu7D531jc1Ec6uAziZD6qP5LbF249RkQBq2dqljC1jz6/7QvddfoLeEMALa28 qZlD514iC2Z82FelXxaLD8MYSMyV0qB96wo+3ouHrFVENKxDnhnoaZPoq+lTw87I9uEQ ic0EQssLYoeM/ZVbSxuwdoKuWhAKrqgklMpbhcACsvMi4eQ6FWZ8xmUea4xv11y+zCU7 xMYZUh0FYX1ri/vpv7r54fD6UAGR6UVBz5KhhTs8tSTUYsiUD3qnE0uyiI3NdmgiLAsI kwzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=rwYC2sE6wVOnGoN5vSGqYSfz4869siK4qW09U7txiBc=; b=M1qvvrr/tgw3QKhtNXrE2NjU4KeG8VV9mCqyVV+zi30y8/m+c7TnoTK6lGYBgXzc3O OYBWc/Bezxx7xYvDF+J/8ET5H3qjuuTrq5qoLSz06FTeITB4RpyqC/gl7GI9yv3hWh/V c5rOQmU1gD+b8Rt42VJYs2paKXTk8J0MiJrVxqCD9j+wzIb4u9bPNIZksNNFWPhVoWPR wCtPkVG2yqh4RUQ8U+48RmYXj7B05s8JxRJzp+Pk6QZSgy5NozmFVIxhhWpwGopdpUcT 37PapTHVVO0Gq3e13uxkRTzUa1kzo8PaXtwGo7Vb9p1H2ly8UlL/3+/OkNUmweDgIBYD iHEw== X-Gm-Message-State: AOAM531DmQzHRN7bBuYlsIs2VwxqqyUGf70qbxWEaHt8ZMR+qdjHgi4n CJYTes7CDJAdO6tz/PxBKYYLPsIdmA== X-Google-Smtp-Source: ABdhPJx7pb/1hcdGzJbeBZmEf+wJ6+Z2ZGHYJY+BCNomT7RALtBu2vWEN8kxXGiXRydZws0FAlsJUZqHrw== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a05:600c:240a:: with SMTP id 10mr4334650wmp.170.1633708733981; Fri, 08 Oct 2021 08:58:53 -0700 (PDT) Date: Fri, 8 Oct 2021 16:58:30 +0100 In-Reply-To: <20211008155832.1415010-1-tabba@google.com> Message-Id: <20211008155832.1415010-10-tabba@google.com> Mime-Version: 1.0 References: <20211008155832.1415010-1-tabba@google.com> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH v7 09/11] 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, oupton@google.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-20211008_085856_173471_D11155B4 X-CRM114-Status: GOOD ( 12.01 ) 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 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. Acked-by: Will Deacon 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 2a07d63b8498..f6d96e60b323 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; - 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 c4ed32521b7c..f5354233d03e 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_aa64isar0_el1_sys_val; u64 id_aa64isar1_el1_sys_val; +u64 id_aa64mmfr0_el1_sys_val; +u64 id_aa64mmfr1_el1_sys_val; u64 id_aa64mmfr2_el1_sys_val; /*