From patchwork Sat Mar 15 06:17:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873833 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1062016wrq; Fri, 14 Mar 2025 23:25:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgYgOECXuGyWM/UefWZsTOzN+WVjGqSojNQYH+IS9zDTq854uZVNx6mIcJ8qHD1sSbUqA0Og==@linaro.org X-Google-Smtp-Source: AGHT+IEMOhGrMgSC67zYoxv1H6rJhLl/oGbdShUq+mtNc0r+o0lGE1fOl7FQO/ZYdGVYE4ckgMZe X-Received: by 2002:a05:620a:179e:b0:7c5:6140:734f with SMTP id af79cd13be357-7c57c7d2912mr665432085a.18.1742019914066; Fri, 14 Mar 2025 23:25:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742019914; cv=none; d=google.com; s=arc-20240605; b=NFNvw8srQuKrJl2r9FXBc0pWb0g3qmG3CBkNVudes/359qLeQX90ryyxaijfbyt7nB Xh7eXuE6V/nDCGkFxQ8N7bu0W1xd4WWJvG0DauNfAK9UeOML0ihfaYkIYvIouSc7cOOH JOGi7fX+qnzDr5sBs4MfbORis6VXVc8d2p+mWVKmHmBrk5CmjPta9GaRlDPeBLJHaUYQ CHLnKQcBfQNGRSIvBuf5k4DDnCX+RuToxo8TyOjypgKNh1dEcFgvlKzfRIARZmxyLvt/ Al2s+nH5ehcENuvLGJ5L0h8eq4jpprUZlDjKrmpILwQjR55OhUq2xL0tpygdyd15amxT QyaA== 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; bh=rEu137HdRPgUqRFQt4nW9mXkLUjqiOW5Fp1pDPyIHI8=; fh=NGVuZBn7g66YiPxb27StIj6QsnNGDLJIVpwneOIze74=; b=c5r6Ci9ogCrSGDGSKOZikHXAEIcDkV2GO2RJiv6Wa+M5o85HaIqi1FtBJraCKwHWA3 tWsE010qQ0X2RQMX/rOAA9GTRlvrkyKBx4nSpVTydJBXr3j1dFX9lLo4A7I24pGho4t8 312QvZV0JTp1LekCMa3L90F9E7kYg2Mjfgm8Ncv+cNg02mj5Hlih8kuknaFxvy3CkMUj Tlff42cmjvTM1P8G/m36GDQdjvPgk3k8RZJfVv+2cMPvIv9pksRwNw/g4pFFSyIaSvL4 uYIojUaKJ36v2j/zx4iPjWmHBSYnGr+cUQs5Bx458A8kdmKCRzO7u0+bPcjWQFELtycX jAbg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c573d1abeasi520797685a.587.2025.03.14.23.25.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 23:25:14 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttKv4-00038i-PT; Sat, 15 Mar 2025 02:22:51 -0400 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 ) id 1ttKty-0000Qk-Cl; Sat, 15 Mar 2025 02:21:43 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ttKtw-0003kx-GM; Sat, 15 Mar 2025 02:21:42 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 036F9FF9F1; Sat, 15 Mar 2025 09:17:08 +0300 (MSK) Received: from gandalf.tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with ESMTP id CF11C1CAC5A; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 83F3E558F9; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell , Michael Tokarev Subject: [Stable-9.2.3 37/51] hw/arm: enable secure EL2 timers for virt machine Date: Sat, 15 Mar 2025 09:17:43 +0300 Message-Id: <20250315061801.622606-37-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée Signed-off-by: Alex Bennée Signed-off-by: Peter Maydell Reviewed-by: Peter Maydell Message-id: 20250204125009.2281315-9-peter.maydell@linaro.org Cc: qemu-stable@nongnu.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell (cherry picked from commit 5dcaea8bcd82972add29eef350547f922fb4caa2) Signed-off-by: Michael Tokarev diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1a381e9a2b..5fa045cc21 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -873,6 +873,8 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) [GTIMER_HYP] = ARCH_TIMER_NS_EL2_IRQ, [GTIMER_SEC] = ARCH_TIMER_S_EL1_IRQ, [GTIMER_HYPVIRT] = ARCH_TIMER_NS_EL2_VIRT_IRQ, + [GTIMER_S_EL2_PHYS] = ARCH_TIMER_S_EL2_IRQ, + [GTIMER_S_EL2_VIRT] = ARCH_TIMER_S_EL2_VIRT_IRQ, }; for (unsigned irq = 0; irq < ARRAY_SIZE(timer_irq); irq++) {