From patchwork Fri Oct 27 14:39:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 738681 Delivered-To: patch@linaro.org Received: by 2002:a5d:5101:0:b0:32d:baff:b0ca with SMTP id s1csp473103wrt; Fri, 27 Oct 2023 07:42:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHQc6sM+3G368K7QNxQ6KYzFzZ54TvNMszIkYwR6Q9bs2SZnG+qGHukLA7FC0SbOx8DYeKa X-Received: by 2002:a05:6214:e6e:b0:66f:b00b:9d51 with SMTP id jz14-20020a0562140e6e00b0066fb00b9d51mr3072460qvb.9.1698417774928; Fri, 27 Oct 2023 07:42:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698417774; cv=none; d=google.com; s=arc-20160816; b=A2TkEoVC8PZ329VP/l3o290uFI+kV8Oaatw/e5oeoqIAk91hBny+uHPl8e7eYaKTgs uZ1XZrCiBs+GwfAQlVHAOMKzZBT8+p8cOkSunv85S15ZyqWhl5Kq3zWRIWllVbGVNWFr pdPv8DLp60L61rjgnDrZ30IOAibwKgllB0Vb4RSYNW+1V6H5ysdu+yWMYH2zcDJArQWw UkDJfh05SqMicX+nY2F/Zy7+RDm6RZd/iT7UA+OmVVEPqJDyP4ol19NvRU2K9VAYfMpI fpCcw0ekIgMlGpJ4yzbJuJYrvSpB+lb70i7F+V+OpE5DVOaHkn29cchjE4ldKsGxR+4A dqDg== 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=3xRTp/BRadA7ZN58Un+Px0Mehec0HXObngq8aZKQDU8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=CeP95D30GAx7lF4LqTlirryKxagCFxQ2/85t/zlovL5q54RVXAI0WngK9ybmmrdiHJ r/nKkuRbTB0JUm8fNh4Q3Gg1MQd4aXRQ4Z+Dbd27DfLHzev8LfALhVkmB2c5O7JER28O PtCnbpJj2vSCQQKcJMTO7o1TnORPhGWGkHiG1km+6fquoBFZsjE6CTGURF7j5unUcCKr HegEUeXgQEbkiTZr7fu3QBBU2g+GvoxINwvMCZ8Cg+rh+kbTqR58BwXeROZ2fA+SYCDJ 6FkA9DBEmhBdgplJ1P7P2/vRyCMHvhvMLXh58e+aR9EdyDEXNpI8nFy764Sf6SwS8flm a+Tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PzJAnLdv; 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 q15-20020a05621419ef00b0066cf6a655e2si882665qvc.116.2023.10.27.07.42.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Oct 2023 07:42:54 -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=PzJAnLdv; 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 1qwO06-0007BL-7o; Fri, 27 Oct 2023 10:39:50 -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 1qwO03-0007B4-RU for qemu-devel@nongnu.org; Fri, 27 Oct 2023 10:39:47 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qwO02-00086T-05 for qemu-devel@nongnu.org; Fri, 27 Oct 2023 10:39:47 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-32d9d8284abso1389249f8f.3 for ; Fri, 27 Oct 2023 07:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698417584; x=1699022384; 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=3xRTp/BRadA7ZN58Un+Px0Mehec0HXObngq8aZKQDU8=; b=PzJAnLdvntFYHU6zE5HHnu12yQ5+52PKFrqYuWVC5/4xCKZ6L96BclGNk7XIajPc76 MXmSc8HkDktgMMzY/yXChEVbO1UHD5yi5lh9cb9A+Xlx3vUMIDTs6RapU7BUJLinFTRV nPs/Ov2zrI18V2oxY7Dp5YHr1jgMtnCTVl/hlhTSbGvsrrh2jX8H6HXVBetI0Ojo6Rbw MpV4Ph0dSrkbJDIVnsyUQJKNVFGGRPtW80lIR3SRmxH4R+HxMrfccXNtA+IKT1bOQx35 LNtbfE28rbxmXU4n5TBLRP+HsMXmxrMiAFurmIQQb70lb865rqtgcSUu4aAMjglI0lyh ET4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698417584; x=1699022384; 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=3xRTp/BRadA7ZN58Un+Px0Mehec0HXObngq8aZKQDU8=; b=bvzT9+sFDK9YccfdMQxfGEr/ywJjr4HzrMLFWwNv93cEarLUsw4YupTK04jCvuMFwb H6GFhyMmdaQrezMdycGLnSxG0vVV4Ra+TDfSy+xDlrkbICOKv31LIdqUhTi5XtiNiK/A 5IODmW7qw16TD4UrlXxLLE8PG0GIFuWVMGMrgbs8oA4e0wAbED1o1+nOKUmQ5X63a8+O XyoFvKGw0UzPlzfRoUu8HudJClWmyTcKmsr7UbMIfd+T0ToPxNeMJT7of8uNKYEZlCeK +ryl+qakAC2IUJV6DZXfbpCj9dzDfCIxnMJmM1IPA6Lo7iUjmdwmFZmPRnzogbKCGeow 7rag== X-Gm-Message-State: AOJu0Yxj14RWCC+uGjjSwbaMgwnnxJQlvVadQ3PWzFuvLR+IEzr+cxuf Y7323svlOUgi3FPTheRIhboItVBstEpTNZcLwbQ= X-Received: by 2002:a5d:5381:0:b0:32d:939d:c7cf with SMTP id d1-20020a5d5381000000b0032d939dc7cfmr1868786wrv.52.1698417584170; Fri, 27 Oct 2023 07:39:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e2-20020a5d5002000000b0031c6581d55esm1874123wrt.91.2023.10.27.07.39.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Oct 2023 07:39:43 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/41] target/arm: Correct minor errors in Cortex-A710 definition Date: Fri, 27 Oct 2023 15:39:02 +0100 Message-Id: <20231027143942.3413881-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231027143942.3413881-1-peter.maydell@linaro.org> References: <20231027143942.3413881-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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 Correct a couple of minor errors in the Cortex-A710 definition: * ID_AA64DFR0_EL1.DebugVer is 9 (indicating Armv8.4 debug architecture) * ID_AA64ISAR1_EL1.APA is 5 (indicating more PAuth support) * there is an IMPDEF CPUCFR_EL1, like that on the Neoverse-N1 Fixes: e3d45c0a89576 ("target/arm: Implement cortex-a710") Signed-off-by: Peter Maydell Tested-by: Marcin Juszkiewicz Reviewed-by: Alex Bennée Message-id: 20230915185453.1871167-2-peter.maydell@linaro.org --- target/arm/tcg/cpu64.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index d978aa5f7ad..e2bcac48549 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -840,6 +840,13 @@ static const ARMCPRegInfo cortex_a710_cp_reginfo[] = { { .name = "CPUPFR_EL3", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 6, .crn = 15, .crm = 8, .opc2 = 6, .access = PL3_RW, .type = ARM_CP_CONST, .resetvalue = 0 }, + /* + * Report CPUCFR_EL1.SCU as 1, as we do not implement the DSU + * (and in particular its system registers). + */ + { .name = "CPUCFR_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 15, .crm = 0, .opc2 = 0, + .access = PL1_R, .type = ARM_CP_CONST, .resetvalue = 4 }, /* * Stub RAMINDEX, as we don't actually implement caches, BTB, @@ -909,12 +916,12 @@ static void aarch64_a710_initfn(Object *obj) cpu->isar.id_aa64pfr0 = 0x1201111120111112ull; /* GIC filled in later */ cpu->isar.id_aa64pfr1 = 0x0000000000000221ull; cpu->isar.id_aa64zfr0 = 0x0000110100110021ull; /* with Crypto */ - cpu->isar.id_aa64dfr0 = 0x000011f010305611ull; + cpu->isar.id_aa64dfr0 = 0x000011f010305619ull; cpu->isar.id_aa64dfr1 = 0; cpu->id_aa64afr0 = 0; cpu->id_aa64afr1 = 0; cpu->isar.id_aa64isar0 = 0x0221111110212120ull; /* with Crypto */ - cpu->isar.id_aa64isar1 = 0x0010111101211032ull; + cpu->isar.id_aa64isar1 = 0x0010111101211052ull; cpu->isar.id_aa64mmfr0 = 0x0000022200101122ull; cpu->isar.id_aa64mmfr1 = 0x0000000010212122ull; cpu->isar.id_aa64mmfr2 = 0x1221011110101011ull;