From patchwork Tue Aug 13 10:05:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13761732 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 53720C52D7C for ; Tue, 13 Aug 2024 10:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XtL/NN58WkhD7cc72aH4AM+NsoWhv60ayWK4Ji3vBms=; b=u6fF18ouciai6yA3yu57crWJPw z8ZCPad5KUwpdFsfx3jI0qm2ouZymN/bHwZD8Jgl8IXnX1vDMZuME1QUozrLz32P6/QzLG3n127/p H0vEBOy42a9QMrvEwfzS5w4t3MqmhnQP+JEoUqPXsDxpV1kFq3Nv1KtfEnELoL7tHnFUILKDdI4uO K+aSFAIAcjYOQdazTuMgpnloJ/FxIXe6Yvo6o+EYpplnbPyyHv3echkz6hy5x4Qru8TnvRWgxw85o EFIHeWFIEEWVjAmu9ZHz8zXwZOfXboDSOSWkIiRX19W72yRD1JkFTxhj5xKwO8xWDP978sRNOiLys IXZkC8sA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdoaa-00000003J8N-1ayc; Tue, 13 Aug 2024 10:17:16 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sdoQ9-00000003GSs-1duT for linux-arm-kernel@lists.infradead.org; Tue, 13 Aug 2024 10:06:31 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 6A242CE1274; Tue, 13 Aug 2024 10:06:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99110C4AF09; Tue, 13 Aug 2024 10:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723543585; bh=E87ipciofJL2UyAF6VGkVfcmpMKDKZbHt0/aVGe54KU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZU+7P1CnIiVGXzGvSx28MtVxh6YOeXTgzYIRnbHefLN1JKk64AwY0JWltpHIykZz3 PL4EanCo/LVe8CoYUn1ZOM3n1rJZeJa3q67UPbYFeXvcx/04Gj/8KL6PxD3FQe4G+r Yk0Dl+PMH9Y9Sx71jHv3ElmpOcXvEzZdTgoXaJx4PS1p3KA4w6CL4hEIUyKpWkBsZY 1KS7uoqDyMV5tF3pwMY/aJr0DpSwMDSRvP2ji8Q2yDEavsddnYoMVuUb+A7t2XJ1aE UJVRqQqipBoFApDRur4aTceECExB0/tuW1GJFxi2OpPfVP64wdA54fQC//x3HdD7ry iQIKXz9Zfy4Jg== 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 1sdoQ3-003INM-Ke; Tue, 13 Aug 2024 11:06:23 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Joey Gouly , Alexandru Elisei , Anshuman Khandual , Przemyslaw Gaj Subject: [PATCH v3 13/18] KVM: arm64: nv: Make ps_to_output_size() generally available Date: Tue, 13 Aug 2024 11:05:35 +0100 Message-Id: <20240813100540.1955263-14-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240813100540.1955263-1-maz@kernel.org> References: <20240813100540.1955263-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, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, joey.gouly@arm.com, alexandru.elisei@arm.com, anshuman.khandual@arm.com, pgaj@cadence.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-20240813_030629_689159_E21BACAF X-CRM114-Status: GOOD ( 11.81 ) 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 Make this helper visible to at.c, we are going to need it. Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/kvm_nested.h | 14 ++++++++++++++ arch/arm64/kvm/nested.c | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/kvm_nested.h b/arch/arm64/include/asm/kvm_nested.h index 43e531c67311..e8bc6d67aba2 100644 --- a/arch/arm64/include/asm/kvm_nested.h +++ b/arch/arm64/include/asm/kvm_nested.h @@ -227,4 +227,18 @@ static inline u64 kvm_encode_nested_level(struct kvm_s2_trans *trans) shift; \ }) +static inline unsigned int ps_to_output_size(unsigned int ps) +{ + switch (ps) { + case 0: return 32; + case 1: return 36; + case 2: return 40; + case 3: return 42; + case 4: return 44; + case 5: + default: + return 48; + } +} + #endif /* __ARM64_KVM_NESTED_H */ diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 234d0f6006c6..9c8573493d80 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -103,20 +103,6 @@ struct s2_walk_info { bool be; }; -static unsigned int ps_to_output_size(unsigned int ps) -{ - switch (ps) { - case 0: return 32; - case 1: return 36; - case 2: return 40; - case 3: return 42; - case 4: return 44; - case 5: - default: - return 48; - } -} - static u32 compute_fsc(int level, u32 fsc) { return fsc | (level & 0x3);