Message ID | 20250204125009.2281315-3-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a05:6000:11cb:b0:385:e875:8a9e with SMTP id i11csp279038wrx; Tue, 4 Feb 2025 04:53:15 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX9o+gQYSTBpc2cr+SXuQ+1zDQs5Ryntba6qnme8ITahSYMalxP50lCcO3RK7PlCwPyPK1Haw==@linaro.org X-Google-Smtp-Source: AGHT+IET/o3aFPl+Q8WJMX6F1MVxdM7+UYx7fmzUDnYblSKHkodG7LuoY3O+tW2CAnJVVwEnJI2n X-Received: by 2002:a05:620a:2614:b0:7b6:dd22:31f0 with SMTP id af79cd13be357-7c02eb72e3dmr532624785a.0.1738673595624; Tue, 04 Feb 2025 04:53:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738673595; cv=none; d=google.com; s=arc-20240605; b=hrGzbR7bvGUhXGuQNkqGk3WHO+ubHDoMg+0dk2zFXHyWTOd/EPv5G+deFjdnD96E5d Zm8SAzoRb9Ba4A/CFWmqkDdVKSiqjTXXXq15qeEmJgcj7HcOjdc/jMw8TagM6YuVt6Xv 3jIMtgaS42L/3bpnDfIpn4ZHIudWrrOihmgwSLyFq/cHtq3DMOHLV0BJd+V/oeiWc4gZ NWdPV5u5ak9HkhZEs24EGlxULbLX2AaGEJagnioBUBsiL/aFLagREAOFYJ+bS4CQ+Kiq smTlX8m8ub9by/EMPVb12QyIEPWLe1ICHCMum/STHc8dd6wKTo6dkiY67ymSaj8VVj0t Gvsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=TG5YvjSZwhc9TBWdlzGFshXDfcxcwdL+WhbKE+SqJUk=; fh=HSGw3L+oXHihI5d0QJdomkN3Fwd3LvBCepcKVMCqJ/0=; b=cTNBsSnexASgx6YGz2mxloIKyKp8VBT+Hurzb1oyplwgy1L7JfQ58OxWh7mHBRmEYj uTNx42vhnDvzT2a/dNuV+n+EI0mZaWTGF4Chs44AmaueszyDpAJ/HlxRDy7cOtSjtG7o SyswkOCVRR9F9OV/KYPqzJahEGyTPBSSVfi/K9yxatwC8bBMm+xcTsnO95biWptUcSIh aD7DRFn9MbsG+B5imgjtKGLact1jhRsEUVfmH4utOrrQMuoKWIOQ9vuMBdtC8CdmB3EL ZOec2CPnjD6t6emW90UQvcxXsPvaAEuDBwf9zSo49uylHJxaoGgWf9TOAXyswFD38cVv imng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=giGXHBhz; 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; dara=neutral header.i=@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 af79cd13be357-7c02db62b20si307942685a.173.2025.02.04.04.53.15 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Feb 2025 04:53:15 -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=pass header.i=@linaro.org header.s=google header.b=giGXHBhz; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces@nongnu.org>) id 1tfIO3-00007x-8V; Tue, 04 Feb 2025 07:50:43 -0500 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 <peter.maydell@linaro.org>) id 1tfINe-0008JT-S7 for qemu-devel@nongnu.org; Tue, 04 Feb 2025 07:50:19 -0500 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 <peter.maydell@linaro.org>) id 1tfINc-00029P-7C for qemu-devel@nongnu.org; Tue, 04 Feb 2025 07:50:18 -0500 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-38daf09d37fso267193f8f.1 for <qemu-devel@nongnu.org>; Tue, 04 Feb 2025 04:50:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738673414; x=1739278214; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TG5YvjSZwhc9TBWdlzGFshXDfcxcwdL+WhbKE+SqJUk=; b=giGXHBhze8BKLoUpD1/nzJaRUPOJRKkjNwAv1KQf/M+UJ0F1XuL6AoZNfQpR9iXTva pGd80DyzQBXgDf3LMvkhr0+NsThqb4uoqcYhpmD37ImyGScTgks5ugdrtYz1Bj5yoKoA Z9cyHeV3Cm0sgSNpATFycj082JN5rJe9U+grZ59pJZgltta8I7ebAkZ4belYEKiPcVSR YQNVDDXCBR8VKcqEUoBukJauFxelCARJVD5a+JSOLhM4oWjJOLbKtyzpdfrxWu7Lh7rt oyTOyHNRB12ZstwoSKTYJpLZNQMPEts08m9ryWfyvJh3Xh/ONCogGK2IkWJFhDw5x+3w 9sGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738673414; x=1739278214; 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:message-id:reply-to; bh=TG5YvjSZwhc9TBWdlzGFshXDfcxcwdL+WhbKE+SqJUk=; b=TCapBxynE3zIfs21bpyFvhtn/fG8213esJLwwAcbWZOZjkOcPWKPxm4MqKDZ6Zga1P ncv4RT2I0bhjqKwO6/RF4L7I/f8hogmzyNyuyNuhZSIYVmCsQYrhqjb/No5pQ9T3alfz tfxGjojNFGKqI81a7O14Fd7VaA83C0Ae8lgavwo13CBRRSPU03AiCiU81WICSJpWyt5k k5ZqNDopjMPw+XVI0w7z8wlRW/tIx5Bh+AYf9E/xQ1vdSJCS4gSIaUXoiBQjpPpBzINU 5HcZFP1VFvQOkE07Cb39pgj6+z53/gh4aC4wdBfJjZvrx8nGso9h50G8QwfXk99Z1oiJ EvUg== X-Forwarded-Encrypted: i=1; AJvYcCVMkg/ArxUDeLibCflSc0GffmEnE73x43RNm1iWEmq5xuHQBAjxzKKSAkl0Nb/U40t4hKMGrViYhKz8@nongnu.org X-Gm-Message-State: AOJu0YzY1goIP2dwbL4iLC5Hh3/+5iZpPusaN8qk9kl6KO65pMQPnKOt cw7AAIrboRdg2hfSGmC4N5c5DEEbosD0XL23hmMNVjobhnZdbna+jNfVl3LIeG4= X-Gm-Gg: ASbGncv93SvSyljzGD4n2MZnQYt2486BYFDTC4Ey7OxnivNJp78Qmg2CP3Nt899m+Gi NWl3+Fs6/c1yTO4KuZvXdmm575/e2TDizcJzSfmOmqU5MOvCktlGKCCRjIiR5/DqU0//a2f9GFZ fJwZzQuNwLt4OQSBPGazqYycOgazLjJwxCothZlKYYkmuse26oHkoLnJ72CyKdAEJXvKrbTDzLy +YHHXUVZ2Wlqh/zn17IBkfA0SnOZ2Otu6jxOw9lcZyLbzpnhiseMwBuCuOj0gQgG0xrZbshD3LZ Ul743UwvXSFj2YsIbsEp0g== X-Received: by 2002:a05:6000:1884:b0:388:e377:8a1b with SMTP id ffacd0b85a97d-38c51b60c11mr20563034f8f.28.1738673414159; Tue, 04 Feb 2025 04:50:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c5c122465sm15757919f8f.47.2025.02.04.04.50.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Feb 2025 04:50:13 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> Subject: [PATCH v3 2/9] target/arm: Don't apply CNTVOFF_EL2 for EL2_VIRT timer Date: Tue, 4 Feb 2025 12:50:02 +0000 Message-Id: <20250204125009.2281315-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250204125009.2281315-1-peter.maydell@linaro.org> References: <20250204125009.2281315-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <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-bounces+patch=linaro.org@nongnu.org |
Series |
target/arm: Implement SEL2 physical and virtual timers
|
expand
|
diff --git a/target/arm/helper.c b/target/arm/helper.c index 049362a5500..ac8cb428925 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2604,7 +2604,6 @@ static uint64_t gt_tval_read(CPUARMState *env, const ARMCPRegInfo *ri, switch (timeridx) { case GTIMER_VIRT: - case GTIMER_HYPVIRT: offset = gt_virt_cnt_offset(env); break; case GTIMER_PHYS: @@ -2624,7 +2623,6 @@ static void gt_tval_write(CPUARMState *env, const ARMCPRegInfo *ri, switch (timeridx) { case GTIMER_VIRT: - case GTIMER_HYPVIRT: offset = gt_virt_cnt_offset(env); break; case GTIMER_PHYS:
The CNTVOFF_EL2 offset register should only be applied for accessses to CNTVCT_EL0 and for the EL1 virtual timer (CNTV_*). We were incorrectly applying it for the EL2 virtual timer (CNTHV_*). Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target/arm/helper.c | 2 -- 1 file changed, 2 deletions(-)