From nobody Wed Dec 17 15:59:45 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D57632FD7D5; Tue, 30 Sep 2025 10:32:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759228334; cv=none; b=Deka8zqH0mSsAaOi4fz0HgYrNnFbfOLmmehfE3g7zARjeqDli6LTfUxMiCYjmmPGtBy4sK+BUDyTCadfLsykS6xde/TDjAi6M+xoYHKLmXzAEpspDHkMS9WT+cH3k3tKAeAhlxsAqSJ7H7JqQrKkgIuSf0kMthXmw6IWlyNefZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759228334; c=relaxed/simple; bh=LymncfSA2wqDatx+hg4EJp5rCAjsNxkPAVPRuGIOGZs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FZh7qr3ZoTh3RyoAG3RIVRAu3XBiHkg2vbvvjS9XeELYufOh81vY+K2/xJ7nu9OYg1dhoOxbWo6baP5Rj8sFH8OrGuRRloJq1D0KRSpt/W/K/AINJcmMKXz8Eri0JfCQXQHtZ+D9+FvPpf73n0BZS3h0Ccye6jz41MzLAk+tL64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2DA822682; Tue, 30 Sep 2025 03:32:04 -0700 (PDT) Received: from ewhatever.cambridge.arm.com (ewhatever.cambridge.arm.com [10.1.197.1]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D46703F66E; Tue, 30 Sep 2025 03:32:10 -0700 (PDT) From: Suzuki K Poulose To: kvmarm@lists.linux.dev Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, will@kernel.org, oliver.upton@linux.dev, maz@kernel.org, alexandru.elisei@arm.com, aneesh.kumar@kernel.org, steven.price@arm.com, tabba@google.com, Suzuki K Poulose Subject: [PATCH kvmtool v4 07/15] arm64: Expose ARM64_CORE_REG() for general use Date: Tue, 30 Sep 2025 11:31:22 +0100 Message-ID: <20250930103130.197534-9-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250930103130.197534-1-suzuki.poulose@arm.com> References: <20250930103130.197534-1-suzuki.poulose@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Oliver Upton Expose the macro such that it may be used to get SMCCC arguments in a future change. Signed-off-by: Oliver Upton Signed-off-by: Suzuki K Poulose --- arm64/include/kvm/kvm-cpu-arch.h | 16 ++++++++++++++++ arm64/kvm-cpu.c | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/arm64/include/kvm/kvm-cpu-arch.h b/arm64/include/kvm/kvm-cpu-a= rch.h index 2f189abc..dbd90647 100644 --- a/arm64/include/kvm/kvm-cpu-arch.h +++ b/arm64/include/kvm/kvm-cpu-arch.h @@ -67,4 +67,20 @@ unsigned long kvm_cpu__get_vcpu_mpidr(struct kvm_cpu *vc= pu); int kvm_cpu__setup_pvtime(struct kvm_cpu *vcpu); int kvm_cpu__teardown_pvtime(struct kvm *kvm); =20 +static inline __u64 __core_reg_id(__u64 offset) +{ + __u64 id =3D KVM_REG_ARM64 | KVM_REG_ARM_CORE | offset; + + if (offset < KVM_REG_ARM_CORE_REG(fp_regs)) + id |=3D KVM_REG_SIZE_U64; + else if (offset < KVM_REG_ARM_CORE_REG(fp_regs.fpsr)) + id |=3D KVM_REG_SIZE_U128; + else + id |=3D KVM_REG_SIZE_U32; + + return id; +} + +#define ARM64_CORE_REG(x) __core_reg_id(KVM_REG_ARM_CORE_REG(x)) + #endif /* ARM_COMMON__KVM_CPU_ARCH_H */ diff --git a/arm64/kvm-cpu.c b/arm64/kvm-cpu.c index c7286484..f8e08b5d 100644 --- a/arm64/kvm-cpu.c +++ b/arm64/kvm-cpu.c @@ -238,22 +238,6 @@ void kvm_cpu__show_page_tables(struct kvm_cpu *vcpu) { } =20 -static __u64 __core_reg_id(__u64 offset) -{ - __u64 id =3D KVM_REG_ARM64 | KVM_REG_ARM_CORE | offset; - - if (offset < KVM_REG_ARM_CORE_REG(fp_regs)) - id |=3D KVM_REG_SIZE_U64; - else if (offset < KVM_REG_ARM_CORE_REG(fp_regs.fpsr)) - id |=3D KVM_REG_SIZE_U128; - else - id |=3D KVM_REG_SIZE_U32; - - return id; -} - -#define ARM64_CORE_REG(x) __core_reg_id(KVM_REG_ARM_CORE_REG(x)) - unsigned long kvm_cpu__get_vcpu_mpidr(struct kvm_cpu *vcpu) { struct kvm_one_reg reg; --=20 2.43.0