From patchwork Mon May 9 11:58:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 570975 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp3935239mal; Mon, 9 May 2022 05:14:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy13lpVP1sv8kGdRi0gVa7RSIKkIN0lt0Kp+MDomp57lrgvgGkYKsjQ5pUz/KjbcpSC+6WU X-Received: by 2002:ac8:7dc1:0:b0:2f3:c70a:df9e with SMTP id c1-20020ac87dc1000000b002f3c70adf9emr13805113qte.307.1652098448551; Mon, 09 May 2022 05:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652098448; cv=none; d=google.com; s=arc-20160816; b=PP3nDsznlSu0K0ti1d/IBouwtHLBXQWYukTDYb3ZnL4mL9DETGSChTfEJ11NUz4lxE dN2+wyQqRlVTRz+9VyITzqOZK+2CvSDI4ZPyIZyy9JY/2DT3HXQGFwWsejqk1xghFgsM wJ5yyEiJbM6tTt8d6EdDsXQ7/eqZ0Zfz66zxK99cYE+y+dCmy+o1I9lBWnGC20+5M+aU ZsVfxq+sVmMRNT14cm5jyoIMfd7VIJCa3gZLMY7K5JAIxq8gPY0MAaP158TCog53TQpG y5UPvoQ5M6wSmHbqmXV4aOv37/ebNq3R8/pfsfd2/0+qp2fwz0frmTSRLTMa861lnYg4 i35w== 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=Xq4iM0BZvoq8/HgoELbIYA7Nz6YX3WBJKHh4C9qCekk=; b=ixO2WOfkh83CpJ+IXosu7Gd0Efw3oYs/YHl54t6YvnE+Esy+JMUWl6KHfgQHESfkDT S1bglMghRlL79s4OaiIntxS4WkeMPNHfuIu+J0KxPc8Sm4YX/j2zkKAQEIfWjhjB4DTa KXy14hSQ9E2G2UdA0cENv1AZuCo+VavvplY109b+XlhAQ9z9qUBCYmP05krdTk6RM7m7 p8/JbXdb2R8ICnoTgDqKrle1Yv9T7u92yOx/nOfVpPk5DqG6x4KngAYo+BMaOwiFheL5 2cOglyg87+1PlEb1UEWZvtE6S5FyQZ0LHD/YHkJuUVbVT829MqLMcDT4c8jK3biidmY3 vz0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YnZ+dLdF; 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 p3-20020a05622a00c300b002f3ae700255si7999263qtw.64.2022.05.09.05.14.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 May 2022 05:14:08 -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=YnZ+dLdF; 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]:43678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1no2HA-0007vr-49 for patch@linaro.org; Mon, 09 May 2022 08:14:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1no22Z-0007Kw-QC for qemu-devel@nongnu.org; Mon, 09 May 2022 07:59:03 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1no22Y-0001Iy-4l for qemu-devel@nongnu.org; Mon, 09 May 2022 07:59:03 -0400 Received: by mail-wr1-x435.google.com with SMTP id k2so19091116wrd.5 for ; Mon, 09 May 2022 04:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Xq4iM0BZvoq8/HgoELbIYA7Nz6YX3WBJKHh4C9qCekk=; b=YnZ+dLdFO1w6+l3YjhRNd5NQJqdvO2432QMMUh1CDRc9RTx56xWW+6RtxvaAJAP5OY tbze/z+u2CM5ZvwkFGSvbMx6WTyfGIISc7+xF7kEUr82fEs1b72JUj9XwBad1YhH/66b shmgD73107weCRObpB0sowHZ0eALafMRDwXelIQJX8OO12jN83bdG1LyZtQU3CnKnmGD OlASbUmg5YP2ng3pyVwqKJ78XhZ446fQszYhBYEwLX/YnempiknJNEuZdGNlGmXVYTqZ eBBrqWPlgp547ZGwwyIOJolb/nhwu6xIXJifxwQF8eHcruC8fDdeIEl2Zyr6vKXrr45t AG/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xq4iM0BZvoq8/HgoELbIYA7Nz6YX3WBJKHh4C9qCekk=; b=ZJ9Gz4dtoOxhpvIAPMVm87kXN/Z3zMrQ98OhCzdbnTsUOlm4Bsr2k4EYTy7VyTwwGi uEDgHIG7kI3bGjA5+R/C2MXWtIX0cEArmjtVBvLexh7ZRF9Or8gPW7YKKkCc8wN9xKsu 0M4jE4XMl4FcDBy4VRGrLFvznd/VgW85Alc8Leeg3eZj91s5fKfZud2nVXzPFavksz2j emxDrEUnbFC8QQbITaRT3O25l6pymHFWc/d12AAbQ9QaADXhl0A9+mEuYlEE/cVcTmrS L5PCkryTNgwkglhDfGkfZ/KfAIJ9Gd412D+6+5tj9F5dv5G/SC8PmEaS75f4QA+glj+w LRCQ== X-Gm-Message-State: AOAM530q511aYPHaAHuj4tiZnRxvPN2iUwLpSrSU4uog6xndtioLVRNx zlPs+syDAN+WUMy0NdjE6OwB+rSmalCijw== X-Received: by 2002:a5d:5085:0:b0:20a:e090:85ad with SMTP id a5-20020a5d5085000000b0020ae09085admr13388304wrt.235.1652097540757; Mon, 09 May 2022 04:59:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id bs6-20020a056000070600b0020c5253d8bdsm12199928wrb.9.2022.05.09.04.59.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 04:59:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/32] target/arm: Enable FEAT_Debugv8p4 for -cpu max Date: Mon, 9 May 2022 12:58:29 +0100 Message-Id: <20220509115848.3521805-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220509115848.3521805-1-peter.maydell@linaro.org> References: <20220509115848.3521805-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@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=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" From: Richard Henderson This extension concerns changes to the External Debug interface, with Secure and Non-secure access to the debug registers, and all of it is outside the scope of QEMU. Indicating support for this is mandatory with FEAT_SEL2, which we do implement. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220506180242.216785-13-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- docs/system/arm/emulation.rst | 1 + target/arm/cpu64.c | 2 +- target/arm/cpu_tcg.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index 965f35d8c9a..0acac6347c5 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -15,6 +15,7 @@ the following architecture extensions: - FEAT_DIT (Data Independent Timing instructions) - FEAT_DPB (DC CVAP instruction) - FEAT_Debugv8p2 (Debug changes for v8.2) +- FEAT_Debugv8p4 (Debug changes for v8.4) - FEAT_DotProd (Advanced SIMD dot product instructions) - FEAT_FCMA (Floating-point complex number instructions) - FEAT_FHM (Floating-point half-precision multiplication instructions) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 202fd5c46e4..88d3cef93e8 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -799,7 +799,7 @@ static void aarch64_max_initfn(Object *obj) cpu->isar.id_aa64zfr0 = t; t = cpu->isar.id_aa64dfr0; - t = FIELD_DP64(t, ID_AA64DFR0, DEBUGVER, 8); /* FEAT_Debugv8p2 */ + t = FIELD_DP64(t, ID_AA64DFR0, DEBUGVER, 9); /* FEAT_Debugv8p4 */ t = FIELD_DP64(t, ID_AA64DFR0, PMUVER, 5); /* FEAT_PMUv3p4 */ cpu->isar.id_aa64dfr0 = t; diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index b6fc3752f2c..337598e9490 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -76,8 +76,8 @@ void aa32_max_features(ARMCPU *cpu) cpu->isar.id_pfr2 = t; t = cpu->isar.id_dfr0; - t = FIELD_DP32(t, ID_DFR0, COPDBG, 8); /* FEAT_Debugv8p2 */ - t = FIELD_DP32(t, ID_DFR0, COPSDBG, 8); /* FEAT_Debugv8p2 */ + 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 */ cpu->isar.id_dfr0 = t; }