Message ID | 20200214175116.9164-8-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2102186ile; Fri, 14 Feb 2020 09:56:10 -0800 (PST) X-Google-Smtp-Source: APXvYqxqa9C+V6Lr843nHvs7RDunMmHnzg+iYtvKbHmBuCqOZ2ltOvb8BQRfYvMWC/S+bkuHLiCn X-Received: by 2002:a05:620a:10b3:: with SMTP id h19mr3778880qkk.149.1581702970198; Fri, 14 Feb 2020 09:56:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581702970; cv=none; d=google.com; s=arc-20160816; b=pMCI3jyoPsd1r999NXrS8SrHLWKUTYptA0HP4kuqD4cFnf1cIHYGAV5xZtoEPbyWJ5 aULt/5QsYmUdLOLOaSwt+ziMneV32HzLFLVy2UOafm07MMneDxdoR9uAGGfrFujug2rN t01hrBFk8TUuOWQEGqPZXME+VvvR8MlCVNyYtUVDnx8pJQTzmzIWJ683PXa24VOtRdUW VdM1GY416qaNcx/dvY6USyMQ3QQbfDdOUmLg4yfTYBEE+ajwkwAG19t0qjMNe4n3z5m9 TE7ECqGqXTmo5MWzGSfdpS9Vam/1LGrF1tBF2636d9TkOTDM8l6SjApB8hnu/1VmvhUJ Bvig== 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=CamjQrx2ACX1pcdy+Ha3T8xE7Ntp0ezj0SgMxc8gmcs=; b=Em4cBWwq4Amtzy9480AgY5T/c+Z+8jA315IQZ8GOUmOjo2G4wzumZhWn0KZV0W25iT zPpHYIodsex2qQCwKTMEz1tcXO5REMrIDZJKaJtvxGxkhq3Etq3Tv5CmpL3F5QBL7p/D hiLcXk5XUzQwX14AeExBFFO/+ApN5uJU6QHOAnc9pVh3PBjeQ+eRkMRP7xHALE8h6bp5 X/Kp8wik8/dNNrICrnNBX2Bc61Jaeh22vC9aw8xKt/NBDoXf1nRhdVLuVfwIlcpjCxGl RrBeGZeawzR93pRMfYo5zTiCSi3qlLtl57xFKdfytk8wnzl47CQMK62PCQu5TFcu+OOV DA5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="c4/UMPy4"; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ci20si2721594qvb.27.2020.02.14.09.56.10 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Feb 2020 09:56:10 -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="c4/UMPy4"; 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]:42942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1j2fCD-0007zL-Mu for patch@linaro.org; Fri, 14 Feb 2020 12:56:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55968) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1j2f7k-0005tJ-Dj for qemu-devel@nongnu.org; Fri, 14 Feb 2020 12:51:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1j2f7j-0000lQ-Do for qemu-devel@nongnu.org; Fri, 14 Feb 2020 12:51:32 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:40896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1j2f7j-0000k3-6v for qemu-devel@nongnu.org; Fri, 14 Feb 2020 12:51:31 -0500 Received: by mail-wm1-x343.google.com with SMTP id t14so11550723wmi.5 for <qemu-devel@nongnu.org>; Fri, 14 Feb 2020 09:51:30 -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=CamjQrx2ACX1pcdy+Ha3T8xE7Ntp0ezj0SgMxc8gmcs=; b=c4/UMPy4cEWJPOu19sIDnKbKBQHCK1UaTu2xAKNM7G9dpBGC0BpTwrms73Tw7DHAOp W/EwyK0Y6/aVJnVYm7U3+YbYtoFFHTNPjpRo559U8tBzqELS0evaNTQZOfvKso/CawwS u4lLC9WmW4YDEZG4acOP6YVl17f10YjGj0tKVknruBhTk+PFS0r6/Jc8/mr8B3rB+fhE dhcRFK3jj1mFvxOQvLk0427NibQLjYKnwVx8AUQipFcJIw/MLIUpPCy/zBoH1G7p0Kh9 1O/Tg1YAMytA0UgR2oCfd3On9i9FwSIkzr1IvPaNHucldAkewUdK29EicVxuMOPipeD8 2vpg== 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=CamjQrx2ACX1pcdy+Ha3T8xE7Ntp0ezj0SgMxc8gmcs=; b=bZvvuWebjSJ3x+1/VDWnk6Ff0cdagw6xN1TzARG3vkwa5t85Hnj2V5h7tIkYaTYJF7 q9toa6jymezqx/z4T9HToXnuu2/d2569uPsCQ6CXPs+3Xke+nc5J8bryrFeN8t1F3NqM wLMJCFzUFd7BSfAIbuo5dvfBygorVHDBh6/oJWb7xqnvsnWcfZ5JcseLYNe8DlOsKJV7 DBxou/Q+DvOcv1pSUmnTiWgKFaE7vP5dPaNxvQRqUPIU5uqDtyGecg6UxBqYNvKwUKYQ 5GQzgBtp3Lr99By/X1c9HPNp4idnsIUEB4Go3l2Fko4wdQAhypQj+Y9oHdnuYDOvPJ8Y 34Dw== X-Gm-Message-State: APjAAAVnu2C3aOhE5yazO0r4Blm3eR54ED1TuyF8B7Y26S5d/duqnhXF kedZi0j/eN/uIWGY+wFLs/p2vA== X-Received: by 2002:a7b:cbd6:: with SMTP id n22mr6083108wmi.118.1581702689959; Fri, 14 Feb 2020 09:51:29 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id v8sm8001857wrw.2.2020.02.14.09.51.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2020 09:51:29 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 07/21] target/arm: Use FIELD macros for clearing ID_DFR0 PERFMON field Date: Fri, 14 Feb 2020 17:51:02 +0000 Message-Id: <20200214175116.9164-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214175116.9164-1-peter.maydell@linaro.org> References: <20200214175116.9164-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Eric Auger <eric.auger@redhat.com>, Aaron Lindsay <aaron@os.amperecomputing.com>, Richard Henderson <richard.henderson@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
arm: ARMv8.1- and v8.4-PMU, ID reg cleanup, [H]ACTLR2
|
expand
|
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 12bf9688007..1024f506c51 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1719,7 +1719,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) #endif } else { cpu->id_aa64dfr0 = FIELD_DP64(cpu->id_aa64dfr0, ID_AA64DFR0, PMUVER, 0); - cpu->id_dfr0 &= ~(0xf << 24); + cpu->id_dfr0 = FIELD_DP32(cpu->id_dfr0, ID_DFR0, PERFMON, 0); cpu->pmceid0 = 0; cpu->pmceid1 = 0; }