From patchwork Tue Dec 19 19:12:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 755959 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp1601866wra; Tue, 19 Dec 2023 11:17:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IE+EmZzOBxN4mejsWfvR/XcUdC4wWykWEfmBdoS5F47Cby5JDwFgWJmPlk4Q+JepOo/xASU X-Received: by 2002:ae9:f510:0:b0:77f:37e2:1726 with SMTP id o16-20020ae9f510000000b0077f37e21726mr2194263qkg.71.1703013457384; Tue, 19 Dec 2023 11:17:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703013457; cv=none; d=google.com; s=arc-20160816; b=nwowK1tEIruCCFk/NoFcbVIp2gnoRn4KpDJgN1ClmdeBdzu3R+XNaDaSva9rQlkgUU YLxJKqdCEE4wFyW8aVQQ3+i81VxaP14wLF7X3burFWmN1s4vENTUWASzCz6DKHfLVW8h tZcHQBtyhmz4G/Ewls7k69mXJQyc/WNmfPHUtTuxRF3woPYetQzGVf75lhoi3xG/KrSi BTqgwKhig/Mt2LZlUYwY8oJzfvkVHSYwgDGAoJ21n7J/1EBaUwfaX1/yAzxwqRhlC4Vt jwcHdLbotVXZW8HwpD5BpLW0g/XNY9MCa7b9I1olQojYD8u7OK5o4fAKM/AqAumsJmOI Tatw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=h3V71XAx3UDA0zBtoUkIA2yNtSzC2BWFrBTkEOk1jT4=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=FUbdNHn/qJkxd5JAqypNpsG3q3FRuTQW/6z3QQKFjM6kxpj5mTHeFzsDDkiqUFvXxh FPsjUh6zL+/EamtaG5CW9i6NplDM63TF2UZpsb3MGh5HhHIeIBLwJL8WAnop8/m7nzs6 tgkFcoXJkBXcIlOLzj5LyyLKMfZaR+Nc/npYO8HaJ4cojyImxJJt60WeiFrD9S5Rc0yM FamWkvT+6DOqsmHd9ZDBN2PI9pM5OJ3f8OYF+EwGB8sXi/LAPsnNKO9fuM11myH9hmef LoCT4ty1P9PlVyjLBcbsDKgFa0YK/1fcYfu2xyxPkI4OdbvDaeKsj90fbVfpu+6gFN+S FUiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rHYclgNF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f2-20020a05620a408200b0077dbdbcb1d7si26271833qko.161.2023.12.19.11.17.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Dec 2023 11:17:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rHYclgNF; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFfX8-00022y-O4; Tue, 19 Dec 2023 14:13:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFfWv-0001vf-Jc for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:25 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFfWs-0001qh-UG for qemu-devel@nongnu.org; Tue, 19 Dec 2023 14:13:25 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-33668163949so2809088f8f.2 for ; Tue, 19 Dec 2023 11:13:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703013201; x=1703618001; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=h3V71XAx3UDA0zBtoUkIA2yNtSzC2BWFrBTkEOk1jT4=; b=rHYclgNF2FmdSJqPqjaIx07zD4O4ZilkQt7JXensIj6uWK65XUsWO0Uks8F1QS8+tM qHZpxqRtM9Asp2OfrtTJEAAXPeBwD2cT5tD0ip0eOkwKW0IZAOi61yoT0Xg7oxx46qZJ dLPdwfYgiJeUNbZ/gAbD6I7YBbIF2VJXE65zDU5a9zEobnVLlu6RjFTdYZfT00ZHphvr /97PEVaLD49/aKP+NMxVEdkihUwEYU2bWxMxBFmhqtGqDKd3N0tgAhub9JL6twMgwtyh Uxik1paI07dTGkbnAVrrnfi3krgSZ3mvGmIbr1+7Iv7LksIyTaNyHkJ/tuSFxbRd/zTD UYdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703013201; x=1703618001; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h3V71XAx3UDA0zBtoUkIA2yNtSzC2BWFrBTkEOk1jT4=; b=oZM2JABsmT4JDxlfST8S7jFD64qPR3Y3ymhNQsC0zloetkmq7XNrutg3Q8+ebupxic SKBng26yK6ilwgEZIF0WwlDEOxucvsQv+tXdImEuCF86lun1CB3HujiovwBWBPDBeC1R AWbr7ec1LVDtzKb81tf+XznPCTPKFJwaaOS5Jy9jDt6Iq1dUZn3w9K9yvXGzw4LXLyM+ qyoWfyddcO1117UwMKoxlsnPARaZm/UJcMgGMlF996fyhsdsAQamBhHdZJKD9RwZNQZW u8qQ6pGX4XVtJM/6SfEEIZFqLkbbZt5b6nH41pop1S8n2OexP1+p70JXaJdFQFLCP59c bvmg== X-Gm-Message-State: AOJu0YzKuXiBjARyX54bH9wQFte06wLusmr9RT+yIUWbgYeWm4XNTZCE +vEud7iqEzN/TXFOojF7oxzOvXxI6Heb7ttzIhQ= X-Received: by 2002:a05:6000:1f0f:b0:336:6dad:2698 with SMTP id bv15-20020a0560001f0f00b003366dad2698mr1003805wrb.82.1703013201313; Tue, 19 Dec 2023 11:13:21 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id f5-20020a5d5685000000b0033657376b62sm12007754wrv.105.2023.12.19.11.13.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 11:13:21 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/43] target/arm/kvm: Have kvm_arm_sve_get_vls take a ARMCPU argument Date: Tue, 19 Dec 2023 19:12:50 +0000 Message-Id: <20231219191307.2895919-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231219191307.2895919-1-peter.maydell@linaro.org> References: <20231219191307.2895919-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Unify the "kvm_arm.h" API: All functions related to ARM vCPUs take a ARMCPU* argument. Use the CPU() QOM cast macro When calling the generic vCPU API from "sysemu/kvm.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Gavin Shan Message-id: 20231123183518.64569-6-philmd@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 6 +++--- target/arm/cpu64.c | 2 +- target/arm/kvm.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 3abbef02601..d6d999b1ff8 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -129,13 +129,13 @@ void kvm_arm_destroy_scratch_host_vcpu(int *fdarray); /** * kvm_arm_sve_get_vls: - * @cs: CPUState + * @cpu: ARMCPU * * Get all the SVE vector lengths supported by the KVM host, setting * the bits corresponding to their length in quadwords minus one * (vq - 1) up to ARM_MAX_VQ. Return the resulting map. */ -uint32_t kvm_arm_sve_get_vls(CPUState *cs); +uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu); /** * kvm_arm_set_cpu_features_from_host: @@ -278,7 +278,7 @@ static inline void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp) g_assert_not_reached(); } -static inline uint32_t kvm_arm_sve_get_vls(CPUState *cs) +static inline uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu) { g_assert_not_reached(); } diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 1e9c6c85aec..8e30a7993ea 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -66,7 +66,7 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) */ if (kvm_enabled()) { if (kvm_arm_sve_supported()) { - cpu->sve_vq.supported = kvm_arm_sve_get_vls(CPU(cpu)); + cpu->sve_vq.supported = kvm_arm_sve_get_vls(cpu); vq_supported = cpu->sve_vq.supported; } else { assert(!cpu_isar_feature(aa64_sve, cpu)); diff --git a/target/arm/kvm.c b/target/arm/kvm.c index e9c6e2e17c1..132a1b47d04 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1801,7 +1801,7 @@ bool kvm_arm_sve_supported(void) QEMU_BUILD_BUG_ON(KVM_ARM64_SVE_VQ_MIN != 1); -uint32_t kvm_arm_sve_get_vls(CPUState *cs) +uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu) { /* Only call this function if kvm_arm_sve_supported() returns true. */ static uint64_t vls[KVM_ARM64_SVE_VLS_WORDS];