From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0DC97CD343F for ; Thu, 7 May 2026 15:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Reply-To:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: Content-Transfer-Encoding:Content-Type:In-Reply-To:References:Cc:To:Subject: From:MIME-Version:Date:Message-ID:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=MeEODZjRA4liT1mQOVL+XlN6FECQ6ttZUbZtASXBGIA=; b=v5Fob5glPwhXNjvlv2LwonCVdi N+UxnotztRXp61OWFEqnUxz5csYvlOOsOUXwWcxU9KXnAcvv8X2hO96eNZ1EjaXdD+rNyj3c9SEc+ /MMUo+k/cB0PfF1BzJgvW3/Sv1jnamVjcbugk+SxUYNEauW0lZi44EQc6DDGqVrJRmfiuhd/qWpMf GqG3RjBIHai0TKbhw/Nv4Ihxg7vGdEg0TyobsAAb+iY84/eCD7EAY5A8UxMOrlB6eLYZwy5PfqqGY G8FuD9XmXQfGWZHgLN3b/o80JR25FVXSea6CUGvllUX5Cw/idnICxLEqXsOlYi0sDCoCCmn2HImc1 LaYmzBPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL0te-00000004EhC-0hJV; Thu, 07 May 2026 15:44:18 +0000 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL0tb-00000004Efe-1oSy for linux-arm-kernel@lists.infradead.org; Thu, 07 May 2026 15:44:16 +0000 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-44509921fbcso564051f8f.3 for ; Thu, 07 May 2026 08:44:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778168653; x=1778773453; darn=lists.infradead.org; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=MeEODZjRA4liT1mQOVL+XlN6FECQ6ttZUbZtASXBGIA=; b=nqim2N5OMV+LCR/LXLxW08u+dopZxH1ZgFPx2epZVD855w4DqW6dVUER5Lc1VdYLW0 RMaYEshGw1oN4iuHJnEO0og0Ysw4QExe0fS0S4g3V4oD7jqxNUZAxnWyU+B4c9GspxO9 xDbCTTOB16btI7s3kxSWy//17Tfsw6rijAjdBbOJ9gf2X8YHcA8lTPx2kCUVWDYXrc+l p2ZnKCyG96uliIDm4+pBdCUnIa5qWJpBkMIY3bOhzNzX9eJyJLFclu0T8SRyEO8/NEAQ JwK/X5Njw+ua5M4y7EDSEePLgsIOlkVubMyF6ZGhsONIDHj9H5c0tNOnx2Iaeu+lB8oJ sBAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778168653; x=1778773453; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:references:cc:to:subject:reply-to:from:user-agent :mime-version:date:message-id:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MeEODZjRA4liT1mQOVL+XlN6FECQ6ttZUbZtASXBGIA=; b=OIIkXRhYse6PZ1OQfTMk+qd5aIoZ2P7RB7nJrPdO84XrVM/GTVtr/UH5/6JMPhMWal xYXrVjNbx5MP2ynR8XO1z5qN69nIahli/auCO4CJ32I1e+xpWNGxoXElIPpEqgIlnOfa NeWf4PN/pgagLz4CKN+lX+6WnR+lpO8bMMXyspNtKfROK3/viMebs3EF29DNQh2zIXL1 g/0/XSEgRP3WchKwRQrtq8xDa8LKo0yj6Y/tm78kK9STDvn4BBZ2Q9PoHhG1sR3dDVjv 2JlYOPMKwsKN7OoPrBA30Ny/o0Y4vkh8WpAofto4NvvMH0ugMy5MfTKFxcl7+s2bFp34 tpFQ== X-Forwarded-Encrypted: i=1; AFNElJ95N9H+NAwNxHvfz5k1Waai4tNhgOOUuqxdamoFk8dEil02N1Or28MftJp7MguIydfzwhdYWZDHhjWu7g6NoPsf@lists.infradead.org X-Gm-Message-State: AOJu0YxdN96D5TjLfjdAofouWQNA6KqgWnUeo68GMXGsJEGbVnyvHUkz 69GUhctzpECdI7zBMynwcZq4fzbp8PdNjBY4RqAe9A+N6UOVhMyvBW763oAUchVmDBE= X-Gm-Gg: AeBDieuqWsRzUu1nntwQjvqMA+2j0DMCvBZwPJRBH7xJMYXa1aoK+6lOzSpJOS+DBrr qaNRwLZvs4+9hrAFiiH7LMzggQcJ9N0ZV5comAYWMR0J7TS6O/iEsTDmLat6yzWG8yvzmBnHYKb MMqhNbAXc1SOYHG793IaPDJeCYrzt5z7I4GoGkZHVI9WN+2SN3p/yWSAy8SF5Pld1GGFyoafjqI EoA8ohnDTgV1hP9d5GdgHsdPqjSf0IgyxutpNqmXTzSrT4Yhl9FUDNH8UxxWyUwdwU19k3RVSDk RhAbXMS03OByIZklRnQGV7jVkAgfVsKFJ0FwzFE7sFkVd9TyIHFasaApNq36pz32MJ9UVWecBJ+ 0YFTyHE1NYT8v8JinhWSjHQi5C36uujX8u1qo6aMIcK5chg9Yowl8JsT5Fy6vRC309DmN3Ct6bp nAcVaXe3tzOLQThOGLNLB6FjtG6+T2+d9Pm+MZ3TQFj7C+7c/wndidPC6Ln5TLP7/Ds/CYD0r6v uvcPRcTcPnZfmKNN1JZBkSspdKB X-Received: by 2002:a05:600c:8485:b0:488:af7f:775f with SMTP id 5b1f17b1804b1-48e51f32a64mr146074295e9.18.1778168652626; Thu, 07 May 2026 08:44:12 -0700 (PDT) Received: from ?IPV6:2a01:e0a:106d:1080:6762:47bb:1e06:ff70? ([2a01:e0a:106d:1080:6762:47bb:1e06:ff70]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48e538aaa0fsm161995425e9.7.2026.05.07.08.44.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 May 2026 08:44:11 -0700 (PDT) Message-ID: Date: Thu, 7 May 2026 17:44:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Neil Armstrong Subject: Re: [PATCH 05/16] arm64: dts: amlogic: Add EL2 virtual timer interrupt To: Marc Zyngier , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Catalin Marinas , Will Deacon , "Rafael J. Wysocki" , Mark Rutland , Daniel Lezcano , Thomas Gleixner , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Ge Gordon , BST Linux Kernel Upstream Group , Jesper Nilsson , Lars Persson , Alim Akhtar , Ivaylo Ivanov , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Dinh Nguyen , Matthias Brugger , AngeloGioacchino Del Regno , Thierry Reding , Jonathan Hunter , Bjorn Andersson , Konrad Dybcio , =?UTF-8?Q?Andreas_F=C3=A4rber?= , Heiko Stuebner , Shawn Lin , Orson Zhai , Baolin Wang , Michal Simek References: <20260507125544.2903406-1-maz@kernel.org> <20260507125544.2903406-6-maz@kernel.org> Content-Language: en-US, fr Autocrypt: addr=neil.armstrong@linaro.org; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKk5laWwgQXJtc3Ryb25nIDxuZWlsLmFybXN0cm9uZ0BsaW5hcm8ub3JnPsLAkQQTAQoA OwIbIwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgBYhBInsPQWERiF0UPIoSBaat7Gkz/iuBQJk Q5wSAhkBAAoJEBaat7Gkz/iuyhMIANiD94qDtUTJRfEW6GwXmtKWwl/mvqQtaTtZID2dos04 YqBbshiJbejgVJjy+HODcNUIKBB3PSLaln4ltdsV73SBcwUNdzebfKspAQunCM22Mn6FBIxQ GizsMLcP/0FX4en9NaKGfK6ZdKK6kN1GR9YffMJd2P08EO8mHowmSRe/ExAODhAs9W7XXExw UNCY4pVJyRPpEhv373vvff60bHxc1k/FF9WaPscMt7hlkbFLUs85kHtQAmr8pV5Hy9ezsSRa GzJmiVclkPc2BY592IGBXRDQ38urXeM4nfhhvqA50b/nAEXc6FzqgXqDkEIwR66/Gbp0t3+r yQzpKRyQif3OwE0ETVkGzwEIALyKDN/OGURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYp QTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXMcoJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+ SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hiSvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY 4yG6xI99NIPEVE9lNBXBKIlewIyVlkOaYvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoM Mtsyw18YoX9BqMFInxqYQQ3j/HpVgTSvmo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUX oUk33HEAEQEAAcLAXwQYAQIACQUCTVkGzwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfn M7IbRuiSZS1unlySUVYu3SD6YBYnNi3G5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa3 3eDIHu/zr1HMKErm+2SD6PO9umRef8V82o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCS KmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy 4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJC3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTT QbM0WUIBIcGmq38+OgUsMYu4NzLu7uZFAcmp6h8g Organization: Linaro In-Reply-To: <20260507125544.2903406-6-maz@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260507_084415_535862_E83358E1 X-CRM114-Status: GOOD ( 20.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Neil Armstrong Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 5/7/26 14:55, Marc Zyngier wrote: > The ARMv8.2 based CPUs used in a number of Amlogic SoCs are missing > the EL2 virtual timer interrupt. Add it. > > This requires some surgery in the "common" files to move the timer > node to locations that makes it possible to add the interrupt only > where it is actually implemented. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi | 8 -------- > arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 8 ++++++++ > arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 9 +++++++++ > arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 3 ++- > arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 13 ------------- > arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 9 +++++++++ > arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 10 ++++++++++ > 9 files changed, 42 insertions(+), 24 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi > index 54d7a2d56ef64..6f559e4dd9ee9 100644 > --- a/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi > +++ b/arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi > @@ -7,14 +7,6 @@ > #include > #include > / { > - timer { > - compatible = "arm,armv8-timer"; > - interrupts = , > - , > - , > - ; > - }; > - > psci { > compatible = "arm,psci-1.0"; > method = "smc"; > diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi > index fce45933fa28b..c28fc7fcbae7f 100644 > --- a/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi > +++ b/arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi > @@ -86,6 +86,14 @@ pwrc: power-controller { > #power-domain-cells = <1>; > }; > }; > + > + timer { > + compatible = "arm,armv8-timer"; > + interrupts = , > + , > + , > + ; > + }; > }; > > &apb { > diff --git a/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi > index 2b12d8284594f..c22c0acb4807e 100644 > --- a/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi > +++ b/arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi > @@ -49,6 +49,15 @@ pwrc: power-controller { > #power-domain-cells = <1>; > }; > }; > + > + timer { > + compatible = "arm,armv8-timer"; > + interrupts = , > + , > + , > + , > + ; > + }; > }; > > &apb { > diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi > index ab3acef2b147e..853d32929ff46 100644 > --- a/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi > +++ b/arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi > @@ -56,7 +56,8 @@ timer { > interrupts = , > , > , > - ; > + , > + ; > }; > > psci { > diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi > index a3faf4d188e11..bfaac5f3e22da 100644 > --- a/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi > +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi > @@ -94,7 +94,8 @@ timer { > interrupts = , > , > , > - ; > + , > + ; > }; > > psci { > diff --git a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi > index 0c4417bcd6827..32d8683059964 100644 > --- a/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi > +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi > @@ -58,7 +58,8 @@ timer { > interrupts = , > , > , > - ; > + , > + ; > }; > > psci { > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > index 00609d2da6743..a911a5181a88d 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi > @@ -2579,19 +2579,6 @@ map { > }; > }; > > - timer { > - compatible = "arm,armv8-timer"; > - interrupts = - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>, > - - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>, > - - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>, > - - (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>; > - arm,no-tick-in-suspend; > - }; > - > xtal: xtal-clk { > compatible = "fixed-clock"; > clock-frequency = <24000000>; > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi > index 664912d1beaab..866fc07d1b0ae 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi > @@ -43,6 +43,15 @@ tdmif_c: audio-controller-2 { > clock-names = "sclk", "lrclk", "mclk"; > status = "disabled"; > }; > + > + timer { > + compatible = "arm,armv8-timer"; > + interrupts = , > + , > + , > + ; > + arm,no-tick-in-suspend; > + }; > }; > > &apb { > diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi > index 8f5b850b1774f..77c72936ffdd3 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi > @@ -128,6 +128,16 @@ l2: l2-cache0 { > }; > }; > > + timer { > + compatible = "arm,armv8-timer"; > + interrupts = , > + , > + , > + , > + ; > + arm,no-tick-in-suspend; > + }; > + > cpu_opp_table: opp-table { > compatible = "operating-points-v2"; > opp-shared; Reviewed-by: Neil Armstrong Thanks, Neil