From patchwork Wed Sep 14 11:52:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 605722 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp717487lth; Wed, 14 Sep 2022 05:55:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR5DIgitSqWwPjIxGx0MJ+9flkOdjncbYdwU0m4jDuZ2a+8q2jGk5VoAkayHqDXMtm/LD0zQ X-Received: by 2002:a05:6214:da7:b0:4aa:a2ea:2483 with SMTP id h7-20020a0562140da700b004aaa2ea2483mr30808645qvh.8.1663160109940; Wed, 14 Sep 2022 05:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663160109; cv=none; d=google.com; s=arc-20160816; b=BL8hM+sf45M5vaooSXoMsTNhA6z7WQCanF53WLre/M+SxnoNP8I7QVFCCagRe/7Jqc XRy0sUEgZr2TazdprzWp/ThKfA+3W28CMNPARIX5MtnyWn0ltOoiaGfvOe/Xq8oH25lN 3jHWNBjaflJ3zLNBWOOdZ7T1llJIcC7M7SwPu6SkTguCugL15CC2CoG3jDnm4AHlZuTP YJyvNBnmVBTXChSn74lOaFtJjVTz5WWsfrNM3AeEt3ZyvH0GwxI/GOWw/st9aUpQn+Dm UOVXXsabac6R3ou/1UON6yaP24GnFyOrwCPo33xMBkZTFiBCYez2Qw7PFIoChiKpCIY2 SLIg== 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=dQ81od6doz03swvkUZvq7V0SI8zn3X9BL8rb2WfrUR0=; b=S+9O3cE1JryOTFjOYHvweQOmt23dQWVmcAL9Cr4ELepyGTKSBjfY3pMYoMaD4PgPMd tSem12fHLBljutKvq7kSH4BT7g8z7CG25Z/P5wE/qJZYGVTataq9na9Cybq4TYdPwRjY l6kU7HnEwBLJ8ZIRREqETWn3a+O2KqvBmIbME7JdGHPr1AXJs7H69ieZROY4bdjTgata ojSPWOEonsIJJ+yXSwRJd7AwC+ZFIRo6LuclReMHpLKsC4xxfBvdqEic/qKcylGS84Mf n/t9Q5xc+Pkn3XHtrX2vJnwYoqwFKMVK7VhZTKfeQFCm/C4dPSKDkrvOVHIPqrW33rmY +05Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bGOheQeq; 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 k14-20020a05620a414e00b006ca332ca9basi1370937qko.760.2022.09.14.05.55.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 05:55:09 -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=bGOheQeq; 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]:43994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYRv3-0003If-FH for patch@linaro.org; Wed, 14 Sep 2022 08:55:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYQwY-0000Q6-Ny for qemu-devel@nongnu.org; Wed, 14 Sep 2022 07:52:38 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:40846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYQwO-0008WI-RJ for qemu-devel@nongnu.org; Wed, 14 Sep 2022 07:52:38 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e16so25307416wrx.7 for ; Wed, 14 Sep 2022 04:52:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=dQ81od6doz03swvkUZvq7V0SI8zn3X9BL8rb2WfrUR0=; b=bGOheQeqcEuC0Ho8pO9e75ZjFaKUUUwmmviuoxlcDMTI8WRkmGpVKlbMPUfXdLo+Qi O5Jowt88Gvpg42qM9eEQ7rePMXKDUs0q6gHpGuLuQdH+KV8jnJ2MQdjrsL2PiNXGZaeM cjXdiObBEEf0y5xpZxf767XSWXhVhHHpa6yoIT9nspUds7UE1Dx5e4+XccFhTRKaoKjz 3ZOU/P0xpH5fZxWYh+pq6+rb4VmbYa0ZIvl/hS5TJayZpukoWXHRB0dcDECG4qS/TYJu nA8u7NPezIi7qZ2HDOKncQTmpip81mg6tx2tPBVFO+Y9SLSgrPgL2Jx+WWTFRLXjmOqc OOYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=dQ81od6doz03swvkUZvq7V0SI8zn3X9BL8rb2WfrUR0=; b=PgNLUWvCp3139Iarp/1XYQZtmU5KVWrJx2ww/sjXqY/7WBg14xTgsrDqU/fXRNwLzG QY2cmFNyRlPLLqXxU3yDiWtYv5UTeTLTyCraVgFYGeBzFLK4RSLGnxpiF8h6oZZy6iSR lGpqxM/k1X8l1vR+ut49+2iVw5KnxPtotuQMe6geEBuIBll2S/CW7nxiRlnylFmaNvw8 XgKtnUs2cKmfhGyXxGEedVW9dPhbd0xrg5uItaShCoVm9iLNAk8sKl9camJjFK7wuC28 BdPtea+0TjEr8dMeCuiCWOtz9Z8FcsmzpYjEHwd/SmNsmVIlHEpdrPDTr/1G37k0FvWw BuvA== X-Gm-Message-State: ACgBeo2oAVhOUZOuBPBP4mp3pjcWBLyIFZC/ynf3elDJvjxyXXZuPFCK UJMMHHRsg942W6E2oH2TuqHyfcN4GnH1af9P X-Received: by 2002:a5d:424a:0:b0:228:811f:c1a2 with SMTP id s10-20020a5d424a000000b00228811fc1a2mr20436348wrr.262.1663156347534; Wed, 14 Sep 2022 04:52:27 -0700 (PDT) Received: from stoup.. ([89.101.193.70]) by smtp.gmail.com with ESMTPSA id t9-20020a5d6909000000b0022a3a887ceasm13712970wru.49.2022.09.14.04.52.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 04:52:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell Subject: [PULL 09/20] target/arm: Don't corrupt high half of PMOVSR when cycle counter overflows Date: Wed, 14 Sep 2022 12:52:06 +0100 Message-Id: <20220914115217.117532-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914115217.117532-1-richard.henderson@linaro.org> References: <20220914115217.117532-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-wr1-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, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Peter Maydell When the cycle counter overflows, we are intended to set bit 31 in PMOVSR to indicate this. However a missing ULL suffix means that we end up setting all of bits 63-31. Fix the bug. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-Id: <20220822132358.3524971-2-peter.maydell@linaro.org> Signed-off-by: Richard Henderson --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 7ff03f1a4b..e4824e01b8 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -1186,7 +1186,7 @@ static void pmccntr_op_start(CPUARMState *env) uint64_t overflow_mask = env->cp15.c9_pmcr & PMCRLC ? \ 1ull << 63 : 1ull << 31; if (env->cp15.c15_ccnt & ~new_pmccntr & overflow_mask) { - env->cp15.c9_pmovsr |= (1 << 31); + env->cp15.c9_pmovsr |= (1ULL << 31); pmu_update_irq(env); }