From patchwork Tue Feb 11 17:37:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183295 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp5583675ile; Tue, 11 Feb 2020 09:43:45 -0800 (PST) X-Google-Smtp-Source: APXvYqwqSr6UJPLKfv1qYeOZdPVO0C361jIJjNX/g17JeQLef+baQttzTiF00R8haodwW0OCXsB0 X-Received: by 2002:ac8:674c:: with SMTP id n12mr8560489qtp.174.1581443025236; Tue, 11 Feb 2020 09:43:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581443025; cv=none; d=google.com; s=arc-20160816; b=Ia8Z6XYS/3uI2vLMF0yJ+MHBpU2xm2YPedXtIOw2iwXLXr5xwhjVhdPx+Cp3b96brd fB2mzGJGyybXXiPKhGE9NZM3D/HJ0xWcsRG0/ff8O/5iXTfReI6MqRhE1UJ3xbNOVCDM onxMvxyEWcLXzOSnoWoBqVoAu/LHjONmXqccNsXiXLFUkmjzkl0bDBmBoT7sFHLp4Kp0 589USRb+ti11PdRnR72B+HXOmeCuLqGVspy/u4iUdk+ocskm67ab0mVIp/eHme33N/m+ kSxMpldPZKcTLo7Rn1iEW74fGk/hX2rp4Kx0YhdhDVwgtoaMT8N/Ai54ilfFVpnX1TiG 6Nfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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=io9bXmaa0QYPJVSqKww1B9uAPmBiSE1Ya1UcsX2Idyc=; b=WL1D9SfYuDAfy2c0jujNU0r6lzWI8Em1KTjz67CNhDeP6hJdzqgoUE+BdLoMqmXwVY qqF3w/Gitd5vkKZfAkkdr/vo+fAbwaXRaj1r/GBWXfyKnRcB+T0KaQbgzXdARneUH+fR znhEW1SvV0yPNXxKt+F0K6MEnLGd5HSDU/bBVPkXq4bMbKjwxwYJWsWgl9jXVTA4Wjr9 U8Oxe4LUHBLRv7z5yKPViWsiNnK4RtUSRNS5q+IkNlQv/h7ccXDPR8O/l72vXqLhWSgL leDgnqc7pzeLjGk0nyNbPxyZZWhvpWLUuc8dVeI8No0QBBroDDLjK2zMmGZv0yXDZyvK 5qlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="KF4l/ywO"; 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=fail (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 z14si2059741qto.312.2020.02.11.09.43.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Feb 2020 09:43:45 -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=fail header.i=@linaro.org header.s=google header.b="KF4l/ywO"; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1ZZY-0006rO-ER for patch@linaro.org; Tue, 11 Feb 2020 12:43:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49190) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1ZTv-00069G-08 for qemu-devel@nongnu.org; Tue, 11 Feb 2020 12:37:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1ZTu-0004Zy-30 for qemu-devel@nongnu.org; Tue, 11 Feb 2020 12:37:54 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37983) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j1ZTt-0004CX-Td for qemu-devel@nongnu.org; Tue, 11 Feb 2020 12:37:54 -0500 Received: by mail-wr1-x444.google.com with SMTP id y17so13475074wrh.5 for ; Tue, 11 Feb 2020 09:37:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=io9bXmaa0QYPJVSqKww1B9uAPmBiSE1Ya1UcsX2Idyc=; b=KF4l/ywOty3YpZ9QhWVHm4Sgoe8AApE7/HUdf8rwM94OMyAIsDmZPQCljsjMX1RGJB q7M4nl/eyUh6A7za0tysFLuGiY5ukdRJ4UT88c/o53DSU2Nzv3T1Bn3EanNQiAoTME0x wumgYLi0fe5anD5kCHKZDX1lC8kXS/QHrs9dM6idCrqO2RO2cOvNaeYXNkF8hnEWdS3q K9n0GVu8QUEaEA8ulcfBI3iZEG8z1nYzG3VsWaow0cIT2f875WiaSF/oyBbUXy5eHxiL +jHr8jXqHF7EZsjO4CbElFuRzrhYnZ95aarphF0FElA6/YcIFbA6g02tKmVIocD02xIH PqGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=io9bXmaa0QYPJVSqKww1B9uAPmBiSE1Ya1UcsX2Idyc=; b=ZNSqKlFshq49vnvfWAvqHVGA3Iq3Ucr/lmVfibNYn5p+GPzPSojsD1ueVGS4df+Iom VjbCY42heu78jpumN+Ecl+00VO43OgxquI7/tuscSGsOV1ruAUhs5dNNjAkdDv7sygKv 6zdoyATwXHIpuzU9McBvOMyI0h/Cl2nhP/Rm+n3J5HnIkV01Poz3UlaadIM/wp811G9C MmQTY1UuL6l4oyLrzVoF6WaAeTeSgujb01dKi4eI1PruxRiSH04hUbA1+SYpDCDrh0o1 IRzGnm1qFkDsya7Z5DyxO+pcTVYzX45n1S6y0ZRRhKzIRBvc2AgMna5RSOAsZUGQOBCP Griw== X-Gm-Message-State: APjAAAVBjD48+knVIYwmN0cG4z5uBMViCARU1X5f7muudsggW6cOdpNr Bs3B78GcfAWP1vkxyKkg0vNjJH2EMIo= X-Received: by 2002:a5d:42c6:: with SMTP id t6mr9548904wrr.151.1581442662986; Tue, 11 Feb 2020 09:37:42 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y1sm6109675wrq.16.2020.02.11.09.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 09:37:42 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 11/13] target/arm: Provide ARMv8.4-PMU in '-cpu max' Date: Tue, 11 Feb 2020 17:37:24 +0000 Message-Id: <20200211173726.22541-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211173726.22541-1-peter.maydell@linaro.org> References: <20200211173726.22541-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Auger , Aaron Lindsay , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Set the ID register bits to provide ARMv8.4-PMU (and implicitly also ARMv8.1-PMU) in the 'max' CPU. Signed-off-by: Peter Maydell --- target/arm/cpu64.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 4b4b134ef84..5b8b7a9d4b8 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -693,6 +693,14 @@ static void aarch64_max_initfn(Object *obj) u = FIELD_DP32(u, ID_ISAR6, SPECRES, 1); cpu->isar.id_isar6 = u; + u = cpu->isar.id_aa64dfr0; + u = FIELD_DP32(u, ID_AA64DFR0, PMUVER, 5); /* v8.4-PMU */ + cpu->isar.id_aa64dfr0 = u; + + u = cpu->isar.id_dfr0; + u = FIELD_DP32(u, ID_DFR0, PERFMON, 5); /* v8.4-PMU */ + cpu->isar.id_dfr0 = u; + /* * FIXME: We do not yet support ARMv8.2-fp16 for AArch32 yet, * so do not set MVFR1.FPHP. Strictly speaking this is not legal,