From patchwork Wed Sep 14 11:52:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 605726 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp728230lth; Wed, 14 Sep 2022 06:09:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR4WkKnJU2xHPTd+rJKMoIs3N3cqzKbEdUSboctUpB67h7LLvUEj+z7andi7URrD+U1rIWtG X-Received: by 2002:a05:622a:58e:b0:35c:571b:5ce1 with SMTP id c14-20020a05622a058e00b0035c571b5ce1mr6116615qtb.492.1663160947417; Wed, 14 Sep 2022 06:09:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663160947; cv=none; d=google.com; s=arc-20160816; b=F+ju1Hl/Y2+o8isVYIR/qIWgXfQJF85XK3hDGcCNMPQqv04edwCSyvz2ZeRJQ6i6zf vblJk6/NrHgWhnaBqKxvgbjfTkhmKxTO5PJx9R75kyrc+QwplWzK8Y3XGZwM/oadlwNu kP6c8n2inXRPQqZRdjO1edgyZZ59EXBDdXqDwG38fYTxPgIJ6dCrWRCVATq04VQBDzdo ceWB3C20y7iDq67wElhdXBBAhqq7l78gY2UOmSvHU0RXA7nDiRqylvVR7USZXyj7QpJ7 e90xoop5nh4pPlkLx/GYfeMMD01MB0QuvFz42fcgsRe7fX4cjyWHWOeDfd9BxY8ZiDYI u4tQ== 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:cc:to :from:dkim-signature; bh=bjUDZtR1TEqJoK1ajVIqvV6K5hZ6P+TSty5uBuxcqTk=; b=EkskmuMY1612UqWa9ELW7lkp7rnxbtzddM1NNCCf+HV3Fpi3zkWi1fU0pqMYgyYqmP AUs+kW748G4KIXYQ4GPT/iRL47JNSDMwt55JbQaQhPkPLMqzjEZfx8/piJW8/RrCFfs9 /OCwgxs1tKDng/0j4BsbAC7h0gzHYlSoVyAvVCnO/gtZBEHSwafNDfYmPWUqys0N/lxv XnYWzkKbfNUVkS3b2JSwdHEggdSR0jqiySZCO7mqtEoN1/nYLG561h7LFoSSiElVrTUS kHiZcWnVy76juwvCds/5njX4ujipU+urnQzPXgPCRRkDMh1IrZRgIntxzXPwVkgS46lK I33Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U8dUPC2t; 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 bj28-20020a05620a191c00b006be9e231509si1463843qkb.6.2022.09.14.06.09.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 06:09:07 -0700 (PDT) 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=U8dUPC2t; 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]:40840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYS8Y-0002wl-Rf for patch@linaro.org; Wed, 14 Sep 2022 09:09:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYQwg-0000jo-Mp for qemu-devel@nongnu.org; Wed, 14 Sep 2022 07:52:46 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:44714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYQwX-00008N-UU for qemu-devel@nongnu.org; Wed, 14 Sep 2022 07:52:46 -0400 Received: by mail-wr1-x435.google.com with SMTP id c11so25277354wrp.11 for ; Wed, 14 Sep 2022 04:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=bjUDZtR1TEqJoK1ajVIqvV6K5hZ6P+TSty5uBuxcqTk=; b=U8dUPC2tbC6DSycDksnWUdvwscrMBO1nfqhj6F0PMpeJPyv4QtQBMBbqWiVM38GSEy uEzjpeZHMpZ9HHT5RLoil8y0ReJvpyHjiNyydSLK7jO3MndeL8WFKnJ/ob0dHGayo1YT snSysGA/wY99UE16zLNRURdXrC+LImIrd3dRM2ofFauXIgAAo8tTRHyqtaYEUziymqTw MA2UEgoVp4Np6v4km43VaMw31lG8LMB4doi8EXIg4F7DxbyR1LJRkPQ3pP2IxW8JBwKc 6QR5nZrgRZJCKaARDLDwgoHl8YRplt57nJPMAd1YUa+dSOwHwfPmG3bEoMsXyobGhoo4 TzLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=bjUDZtR1TEqJoK1ajVIqvV6K5hZ6P+TSty5uBuxcqTk=; b=tHUzom+DzLNfRoK0pLfeWQ89pe+84Ftku5HozISDP0h9K/mItWkPhtJvFdJmaEfqVv sHnDQjAP1pIfHZB+49IhWA02J1gmBHYLOGiyYbSE9bRzaPHYUTWBgbUuoQlvM6ziV8ZW j1kpHhLUKHi8fEVFsYNYj+494nbWErBYAaGt7wTUrKfGwwKTBp0uuUSdXWeEqQg+AvtK 2KKNb9vBMf7F0T41KyhqndI0b+7NkGDV0TF8fYUDPp19ZbTZkmrluZLS2mTLVx1BWoP4 JwLEOjQ/shvpqH7Ex0SVMryxp4v5CsfeXb9MSECcun4ZjWp8Ix6nmHfsOxDYQCt8vXRM SM3g== X-Gm-Message-State: ACgBeo1iceRtnUNajCz6m06tsU2mB1Qsf8CUqTkVuKycY8U9iOWo4W1K c04uAUFqRvkq2tKTSmcmwf54y1uM7Y7EedwJ X-Received: by 2002:a5d:5a9d:0:b0:225:2783:d6f1 with SMTP id bp29-20020a5d5a9d000000b002252783d6f1mr21874077wrb.385.1663156356355; Wed, 14 Sep 2022 04:52:36 -0700 (PDT) Received: from stoup.. ([89.101.193.70]) by smtp.gmail.com with ESMTPSA id t9-20020a5d6909000000b0022a3a887ceasm13712970wru.49.2022.09.14.04.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 04:52:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PULL 18/20] target/arm: Report FEAT_PMUv3p5 for TCG '-cpu max' Date: Wed, 14 Sep 2022 12:52:15 +0100 Message-Id: <20220914115217.117532-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914115217.117532-1-richard.henderson@linaro.org> References: <20220914115217.117532-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-x435.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=unavailable 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" From: Peter Maydell Update the ID registers for TCG's '-cpu max' to report a FEAT_PMUv3p5 compliant PMU. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20220822132358.3524971-11-peter.maydell@linaro.org> Signed-off-by: Richard Henderson --- docs/system/arm/emulation.rst | 1 + target/arm/cpu64.c | 2 +- target/arm/cpu_tcg.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index 811358fd0a..be7bbffe59 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -53,6 +53,7 @@ the following architecture extensions: - FEAT_PMULL (PMULL, PMULL2 instructions) - FEAT_PMUv3p1 (PMU Extensions v3.1) - FEAT_PMUv3p4 (PMU Extensions v3.4) +- FEAT_PMUv3p5 (PMU Extensions v3.5) - FEAT_RAS (Reliability, availability, and serviceability) - FEAT_RASv1p1 (RAS Extension v1.1) - FEAT_RDM (Advanced SIMD rounding double multiply accumulate instructions) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 3ac5e197a7..e6314e86d2 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -1152,7 +1152,7 @@ static void aarch64_max_initfn(Object *obj) t = cpu->isar.id_aa64dfr0; t = FIELD_DP64(t, ID_AA64DFR0, DEBUGVER, 9); /* FEAT_Debugv8p4 */ - t = FIELD_DP64(t, ID_AA64DFR0, PMUVER, 5); /* FEAT_PMUv3p4 */ + t = FIELD_DP64(t, ID_AA64DFR0, PMUVER, 6); /* FEAT_PMUv3p5 */ cpu->isar.id_aa64dfr0 = t; t = cpu->isar.id_aa64smfr0; diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index b714c61d94..98b5ba2160 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -85,7 +85,7 @@ void aa32_max_features(ARMCPU *cpu) t = cpu->isar.id_dfr0; t = FIELD_DP32(t, ID_DFR0, COPDBG, 9); /* FEAT_Debugv8p4 */ t = FIELD_DP32(t, ID_DFR0, COPSDBG, 9); /* FEAT_Debugv8p4 */ - t = FIELD_DP32(t, ID_DFR0, PERFMON, 5); /* FEAT_PMUv3p4 */ + t = FIELD_DP32(t, ID_DFR0, PERFMON, 6); /* FEAT_PMUv3p5 */ cpu->isar.id_dfr0 = t; }