From patchwork Fri Jun 21 14:39:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Romero X-Patchwork-Id: 806346 Delivered-To: patch@linaro.org Received: by 2002:a5d:508d:0:b0:362:4979:7f74 with SMTP id a13csp801241wrt; Fri, 21 Jun 2024 07:40:35 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW4IKu6829I2ni8Kls1BRi6W2D/5yHT50g8yCvVAZUDm92Pia+FiJ5bAPKnOIzzZ8A8Hu9MEHiejDmAVIzdtT+b X-Google-Smtp-Source: AGHT+IEz7QTI+LNO59biWMJgccdow9x/+7Xod6sCPEJfpSUc68uEOtymbWvUJGENO1Ugp8AWSC4l X-Received: by 2002:a05:620a:440c:b0:79b:bcb0:37ec with SMTP id af79cd13be357-79bbcb05e76mr772653785a.48.1718980835092; Fri, 21 Jun 2024 07:40:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718980835; cv=none; d=google.com; s=arc-20160816; b=ynzSr1BLcZesPsYmJDpe2Tqe1iacHq9MpLOmbRhRu7cKVjQGYtL3cek4tBl9O4GqzX Darn+BZvKvhmSTZif+VpSjYhRcyakoPHJI40k6JeIx1Rwv3EeNFgj6Ul6x3qs7mR4jQ0 e+AlR535bDGRLpMgBpUDqLRJEzNJ62WsAZ4TwXoQyCm7leWlc84MoLHRIfCH9c6Y4lNA TFi1/EZBi6sX/XuOVXA9eKtjYyHP4CPtSEkn8uYMugfWvAYs24jTe8CDb1LGf/rlYHv9 ATmWwmArz7SJLbRRtkKVuq3Ps4OzQZGOg9tBSWvDAtLAhb3CVjxF6loOSLlfy0V9wVCx r/ZA== 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=pbW4VmHlRcXOaBBuGCKxn/sE/2fViPqLSFr+O68nhEo=; fh=b5q3cJgcc12gnKfUWQQbBLXKRqia4x4Q8oLG+cCF/wU=; b=Ana49jRG/EDrxOyUqNONMaTnPj/Acy4B8dfJl+RehWiH614VVUljeqK9CGzwYOljoe a6/tV5NWGmp4b3BNaGscfO6pQRKXcYNO+ieBr8eCukaJujMpSQRHYUq+PbaB6nQsw+OA cFOnX1cG4+BEg0c0kB1H262Obhr9B7xbLWSIROu4xrqXSlM8A7d20j6B5XB7l+2DNTwT tNRW03Zwe3I8///Ei8j/cDb0RGgbsdHeD9TlVdkgnzixt6pD7kNv0KPY1P00mkjc7Wbn 0De2z5LCRhjBPLT8lJPDoak0dPKqY+HhqCVHeZy6XFUuUJ//9zAQ4bahL40zQ9OMcN85 laNw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WxNOYfvv; 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 af79cd13be357-79bce942905si196243785a.632.2024.06.21.07.40.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Jun 2024 07:40:35 -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=WxNOYfvv; 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 1sKfQV-0006pm-Ht; Fri, 21 Jun 2024 10:39:43 -0400 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 1sKfQT-0006pD-8v for qemu-devel@nongnu.org; Fri, 21 Jun 2024 10:39:41 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sKfQR-0007xu-Eb for qemu-devel@nongnu.org; Fri, 21 Jun 2024 10:39:40 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-7041053c0fdso1510558b3a.3 for ; Fri, 21 Jun 2024 07:39:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718980778; x=1719585578; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pbW4VmHlRcXOaBBuGCKxn/sE/2fViPqLSFr+O68nhEo=; b=WxNOYfvvAXintAio7+uvQcUpcQQpzCP+z7OnQrjbpwohxsCZOlf2JE4yuD9g+PtXCV AyhqDB73M1bcOaAYbpjSbL8Ht9AhoCxZ3lbbxj66qFDyBQYj1jb4OOTr7Shhuy51JjqQ KL/pn4hvyGk4RYE/yKZmdADcp4rN2nervkBLmSs4A4CJObw+2N08lagBIil/TRmScJQs HZ9hc26E/CDZdf+cC4lILxVeTTYi3IyR7516hSB6FQME8EvmsSClHKYWpHigY09k6Axc H6kJkXyfl8f12xLUmvS7bhLjPeh1TIJ7ZJHBmdqVvo3O4Iclv5V1Ii7xoA6xW2KBBDh6 p+yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718980778; x=1719585578; 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:message-id:reply-to; bh=pbW4VmHlRcXOaBBuGCKxn/sE/2fViPqLSFr+O68nhEo=; b=OXwogNAXZinoTe1LzfqnuhBMFi2m143nI0QcHa6wpNa2rGflMt9oKGR0+cFWXaMAkw RJKQ2sPB/YyOUyyELZeHJrzPVgJrUzsKEIq8Bkm8tRTok+or2PvUs2k7c+GPDrLaaVKJ ad5/+9zkLEB7fjWvHXgr/FFkROL/JIUMOE0hh95QCYZRzbwljbsgJbLSxiERXDd19/Zk TvXyGXztxKuLql9cEhI7coAkRgtjsrnwAox1la/zRATyIsVPMhcst1Du5XqfLAYZZodd 4z5rZmzhc1C6iji7QmwdNUsj1QcypOPmdzy6hLY/282kb6hf8buvCNYRIdXDVCCc51uG KnZQ== X-Gm-Message-State: AOJu0YwbggK/AG1ldj965OglExGX8lmktYUJxoEPbIgirRbZOM/dUadD Y5mY4glxWKVA4Q7yn17nDLF2vI+V7PPHc5xAJ+GzIbG3I/R7XKxC/c7xWSMSs/Hw+JnF6ayyxlb pp/A= X-Received: by 2002:a05:6a20:891f:b0:1b4:1560:f80f with SMTP id adf61e73a8af0-1bcbb697107mr8106408637.56.1718980777558; Fri, 21 Jun 2024 07:39:37 -0700 (PDT) Received: from amd.. ([2804:7f0:b401:1654:3e7c:3fff:fe7a:e83b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7065130e8e2sm1466513b3a.215.2024.06.21.07.39.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jun 2024 07:39:37 -0700 (PDT) From: Gustavo Romero To: qemu-devel@nongnu.org, alex.bennee@linaro.org, richard.henderson@linaro.org Cc: philmd@linaro.org, peter.maydell@linaro.org, gustavo.romero@linaro.org Subject: [PATCH v2 1/2] target/arm: Move initialization of debug ID registers Date: Fri, 21 Jun 2024 14:39:02 +0000 Message-Id: <20240621143903.3598230-2-gustavo.romero@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240621143903.3598230-1-gustavo.romero@linaro.org> References: <20240621143903.3598230-1-gustavo.romero@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=gustavo.romero@linaro.org; helo=mail-pf1-x42d.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 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 Move the initialization of the debug ID registers to aa32_max_features, which is used to set the 32-bit ID registers. This ensures that the debug ID registers are consistently set for the max CPU in a single place. Signed-off-by: Gustavo Romero --- target/arm/cpu.h | 2 ++ target/arm/tcg/cpu32.c | 30 +++++++++++++++++++++++++++--- target/arm/tcg/cpu64.c | 2 +- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 3841359d0f..d8eb986a04 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2299,6 +2299,8 @@ FIELD(DBGDEVID, DOUBLELOCK, 20, 4) FIELD(DBGDEVID, AUXREGS, 24, 4) FIELD(DBGDEVID, CIDMASK, 28, 4) +FIELD(DBGDEVID1, PCSROFFSET, 0, 4) + FIELD(MVFR0, SIMDREG, 0, 4) FIELD(MVFR0, FPSP, 4, 4) FIELD(MVFR0, FPDP, 8, 4) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index bdd82d912a..b155a0136f 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -87,6 +87,33 @@ void aa32_max_features(ARMCPU *cpu) t = FIELD_DP32(t, ID_DFR0, PERFMON, 6); /* FEAT_PMUv3p5 */ cpu->isar.id_dfr0 = t; + /* Debug ID registers. */ + + /* Bit[15] is RES1, Bit[13] and Bits[11:0] are RES0. */ + t = 0x00008000; + t = FIELD_DP32(t, DBGDIDR, SE_IMP, 1); + t = FIELD_DP32(t, DBGDIDR, NSUHD_IMP, 1); + t = FIELD_DP32(t, DBGDIDR, VERSION, 6); /* Armv8 debug */ + t = FIELD_DP32(t, DBGDIDR, CTX_CMPS, 1); + t = FIELD_DP32(t, DBGDIDR, BRPS, 5); + t = FIELD_DP32(t, DBGDIDR, WRPS, 3); + cpu->isar.dbgdidr = t; + + t = FIELD_DP32(t, DBGDEVID, PCSAMPLE, 3); + t = FIELD_DP32(t, DBGDEVID, WPADDRMASK, 1); + t = FIELD_DP32(t, DBGDEVID, BPADDRMASK, 15); + t = FIELD_DP32(t, DBGDEVID, VECTORCATCH, 0); + t = FIELD_DP32(t, DBGDEVID, VIRTEXTNS, 1); + t = FIELD_DP32(t, DBGDEVID, DOUBLELOCK, 1); + t = FIELD_DP32(t, DBGDEVID, AUXREGS, 0); + t = FIELD_DP32(t, DBGDEVID, CIDMASK, 0); + cpu->isar.dbgdevid = t; + + /* Bits[31:4] are RES0. */ + t = 0; + t = FIELD_DP32(t, DBGDEVID1, PCSROFFSET, 2); + cpu->isar.dbgdevid1 = t; + t = cpu->isar.id_dfr1; t = FIELD_DP32(t, ID_DFR1, HPMN0, 1); /* FEAT_HPMN0 */ cpu->isar.id_dfr1 = t; @@ -955,9 +982,6 @@ static void arm_max_initfn(Object *obj) cpu->isar.id_isar4 = 0x00011142; cpu->isar.id_isar5 = 0x00011121; cpu->isar.id_isar6 = 0; - cpu->isar.dbgdidr = 0x3516d000; - cpu->isar.dbgdevid = 0x00110f13; - cpu->isar.dbgdevid1 = 0x2; cpu->isar.reset_pmcr_el0 = 0x41013000; cpu->clidr = 0x0a200023; cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */ diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 0899251eef..71e1bfcd4e 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -1167,7 +1167,7 @@ void aarch64_max_tcg_initfn(Object *obj) t = cpu->isar.id_aa64isar2; t = FIELD_DP64(t, ID_AA64ISAR2, MOPS, 1); /* FEAT_MOPS */ - t = FIELD_DP64(t, ID_AA64ISAR2, BC, 1); /* FEAT_HBC */ + t = FIELD_DP64(t, ID_AA64ISAR2, BC, 1); /* FEAT_HBC */ t = FIELD_DP64(t, ID_AA64ISAR2, WFXT, 2); /* FEAT_WFxT */ cpu->isar.id_aa64isar2 = t;