Message ID | 20200504123309.3808-8-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 5a89dd2385a193aa954a7c9bf4e381f2ba6ae359 |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a92:8d81:0:0:0:0:0 with SMTP id w1csp79698ill; Mon, 4 May 2020 05:38:53 -0700 (PDT) X-Google-Smtp-Source: APiQypI4tY8dDa1Ku1BlNxQEoDmO/Sp/d63jzNIatc+VG07lR3AgozxMhIILr6VM6jLOSi5OeJUv X-Received: by 2002:ac8:66c6:: with SMTP id m6mr17208581qtp.25.1588595933124; Mon, 04 May 2020 05:38:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588595933; cv=none; d=google.com; s=arc-20160816; b=FRIJyBG6WsOAiipLm2p/jxayaBTPLicUwA7rgOEFxNLzNw/7WdSXqIxepvtCILSlUl zmJanlhe8T1VMDB483SMkvvHLgpW0KEVlNIHFWDrOiApwVA7jD/uKfNxlTRxFwmr7X6u 91Zt5e8yO7nK4kF79aJETLLwKSf663cGBDU4phbY8pEvf2+eqhr3EPjxva+qCUOkJ3Yj Nyn2pdGFLp8RFJJ/8w25R/5gNuVjNmyq1XH2q5ojNMfNJuaQpQhzRdv2KM7S1CSk70vD AqzHy60ogseQgwgafA+lkYkWfOn9AUxYi+1DfO+9VIkTld1tO+JRq5NXk7PoqVG88rn+ OuOg== 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=LQncQVuc9PNxrpkqh3ABgysYVzrhk3KqSd8QlCpLW+s=; b=CbcPLDXYxs+kvZKuPH5NKgu+F4eNDyEJna93mKLiCxTKavbpNxi+5BFbGLFxoteuLA dOUQ0WDOim1X3iILJtEg8H8H2pEPY1z6NMso91k5XqNyVPi2G3K2R/JUGGp27CYD8F7d 3KacdKjIErQT9UNELvmzCi2PC3q7Oth+M/Vu/Tdi+Rhtm3J28ezseQWQfUtD2hfgKaTk bT2Qpoyq3lBciM0o9/gj/E2Q4H/mv5cwd5tj8dsNQYC7gfHnL4XSN2XXojL22me9qpA8 FVBTAFmQwYDBs2/tz2JEA96E+Jn6Racc4Nxs23lzn6yYJioooYBB37XTlIDk6k3At7rT 6Xmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xry39U1U; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:470:142::17]) by mx.google.com with ESMTPS id w23si6222048qtn.98.2020.05.04.05.38.53 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 May 2020 05:38:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::17 as permitted sender) client-ip=2001:470:142::17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xry39U1U; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:470:142::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]:57360 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 1jVaN2-00024Y-J8 for patch@linaro.org; Mon, 04 May 2020 08:38:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1jVaHj-0008Kt-Ah for qemu-devel@nongnu.org; Mon, 04 May 2020 08:33:23 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:52223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <peter.maydell@linaro.org>) id 1jVaHh-0000o8-JZ for qemu-devel@nongnu.org; Mon, 04 May 2020 08:33:23 -0400 Received: by mail-wm1-x344.google.com with SMTP id x4so8236947wmj.1 for <qemu-devel@nongnu.org>; Mon, 04 May 2020 05:33:20 -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=LQncQVuc9PNxrpkqh3ABgysYVzrhk3KqSd8QlCpLW+s=; b=xry39U1UhQbES9/4j7X8IeN2FFv+CeANO85nnQGpgeYzIQ2TOoWnLQTLzhetXlsGdR qqQqDC/1XlDNJx7kCQRI0NuETIFh+einE4KccUN4o651KM3C7PWyYdbtCT7M9D+rFSR7 9e/80kcTMp8AQ5DjpwjN3lpHPFAbsVvYaiqdgbbFfLKOtu4ksXDhDfWYFn/jnY4MAmNx 8YkAt0kYv1krL9Ik24FwOql7XUFAB3OXiRaLr6JXKMrQl3DrC3LbtqpKCD9/oPqjbqNH gdg4mbvKbVAm8339KUYZUBYibUZx5rlGHE+8gL+u0g1WsseqUP9YtTh7bS32gE7hsQDQ +QQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LQncQVuc9PNxrpkqh3ABgysYVzrhk3KqSd8QlCpLW+s=; b=heBr76aFMFIj8xVvWj+4lexjD2d1DDZnGjpOcM4dPEp1Wbjk3KD9hN/M4OCt0pY2YC 4shoDhoxoYSwz7ctnR1r0iC2lzIpl0+y5INJ+NUc4c37SkGiMwAuCFGl2Tv2kelUyh4w 8Yn/YRpS6yOTz5nQg5ZlVjKtD6vZ6jORJozGLjJcpajlf7BgWvERUAuRQUm/K/tNuPP/ 0191xc8VzwNOrU1PRNCZzTX6F94K+eh6bLx34C+Idd7dF7dTpFKJM12ZWITtAbKLxmJF +mholR3SwmJSG9ys4q0mb1j7F3llijBbSStT3hD1UL/nnS1nk5ENEzIi2LAFxbDozFDy K+vw== X-Gm-Message-State: AGi0PuaADaEJN+OSNctL2qzAV4/YferxwMWdfj6SuHPuozw+3IGV01cR qiuUPnzkESV8CWD9cpI9vBKoBXVTbqzrpg== X-Received: by 2002:a1c:bc09:: with SMTP id m9mr13895725wmf.145.1588595599764; Mon, 04 May 2020 05:33:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id q4sm12253608wrx.9.2020.05.04.05.33.18 for <qemu-devel@nongnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 05:33:19 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Subject: [PULL 07/39] target/arm: Use correct variable for setting 'max' cpu's ID_AA64DFR0 Date: Mon, 4 May 2020 13:32:37 +0100 Message-Id: <20200504123309.3808-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200504123309.3808-1-peter.maydell@linaro.org> References: <20200504123309.3808-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index e232c0ea12c..9bdf75b1abb 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -710,9 +710,9 @@ static void aarch64_max_initfn(Object *obj) u = FIELD_DP32(u, ID_MMFR4, XNX, 1); /* TTS2UXN */ cpu->isar.id_mmfr4 = u; - u = cpu->isar.id_aa64dfr0; - u = FIELD_DP64(u, ID_AA64DFR0, PMUVER, 5); /* v8.4-PMU */ - cpu->isar.id_aa64dfr0 = u; + t = cpu->isar.id_aa64dfr0; + t = FIELD_DP64(t, ID_AA64DFR0, PMUVER, 5); /* v8.4-PMU */ + cpu->isar.id_aa64dfr0 = t; u = cpu->isar.id_dfr0; u = FIELD_DP32(u, ID_DFR0, PERFMON, 5); /* v8.4-PMU */