From patchwork Sat Mar 15 06:17:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873839 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1062488wrq; Fri, 14 Mar 2025 23:27:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUeF/klT3jnfO5ltciaFNxRgvAvzphKYhyfM6Dhf0o5c2KrbXabgg5yFA4btnH57CKmbwvFsg==@linaro.org X-Google-Smtp-Source: AGHT+IE77dtvKIH5LnijA+aqU4ZBF5y5Hdc2bhOU2sQR91tpgdnSXy7H6nMLIBnIFWpH0GDRVT0f X-Received: by 2002:a05:6214:d8d:b0:6e8:c713:321f with SMTP id 6a1803df08f44-6eaeaafe44dmr59502186d6.35.1742020053151; Fri, 14 Mar 2025 23:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742020053; cv=none; d=google.com; s=arc-20240605; b=ifyGdKPIx6zzIo0w+Mqe+TjHWux2OFvHxg7vjrQyWsMKfb48WkSRrEv8lHTA1stFTN wu12dmaIdbwejXtgsWCMNqJxPe1E4sjR0G67ChxRbLUOTJIBis1zxCvBEabyIdxD9F/P efELgXZrFv1nCy7QMcmO1GuM7mPZAnZ+5fKeDaJWEliuHi8iPNzpwrrxwZ70pVyr1K4i X9pGq8vVP5OjHVMPJsmnu9aeEA9ZrMPt820SQo47q8YgnEBP1Hbb2KLK6X3ji+vc3Rf2 zZyq2z43+2PCUMUoTszLsOWB1oo+iJ/576lkj+6bOOVpKGh9b/ApV9p2YAlm51IQGi2I 82Bw== 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=EdXOrOP3ipdRV5TnIiOV5EjkQQdmyB2QvsQ+2A0QZdQ=; fh=NGVuZBn7g66YiPxb27StIj6QsnNGDLJIVpwneOIze74=; b=OXwjZEcGhZrXY+0+xEBotPf+MMeUyb/gEi4kdJ7d7bfL6B40B+vSR7yhrVL3RWF/af mGxe9GrG1Gl1XQKcYg4OMUU9epz92KpkfbOJBjnM7w6BEMvjazMlWHVtiXxwKjjz6NuM ybll7IEbZsky8yrjB09Ee4J/vFRiq22rKhsC+/7Vw06drMz9pptzRZhL1KJSb9Iylyyf ikhi0kVd+oEVGlUlJ7rt1r0+wNIkOmO1NJo+qz+HOjt57NnupPiQFnyHoLl1ujK+jnVv IWMONvzbCBz5+H6xJ4YdacMHgYpwf7oW/wyh/TPh8YXyIylo4TDm7aWr3fEDowYKfzSZ tR6g==; 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 6a1803df08f44-6eaf4c5186dsi12880726d6.366.2025.03.14.23.27.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 23:27:33 -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 1ttKx0-0006qN-4H; Sat, 15 Mar 2025 02:24:50 -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 1ttKu2-0000gu-1l; Sat, 15 Mar 2025 02:21:46 -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 1ttKtz-0003lR-SR; Sat, 15 Mar 2025 02:21:45 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 07438FF9F2; 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 D2F281CAC5B; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 8658B558FB; 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 38/51] hw/arm: enable secure EL2 timers for sbsa machine Date: Sat, 15 Mar 2025 09:17:44 +0300 Message-Id: <20250315061801.622606-38-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 Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell Message-id: 20250204125009.2281315-10-peter.maydell@linaro.org Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell (cherry picked from commit 9a9d9e82093efa22e3e2bdaac0f24c823f8786f7) Signed-off-by: Michael Tokarev diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index e3195d5449..e9985a5e3b 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -484,6 +484,8 @@ static void create_gic(SBSAMachineState *sms, 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 (irq = 0; irq < ARRAY_SIZE(timer_irq); irq++) {