From patchwork Wed Jan 26 04:49:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 537306 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D59F8C28CF5 for ; Wed, 26 Jan 2022 04:50:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234669AbiAZEuD (ORCPT ); Tue, 25 Jan 2022 23:50:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231167AbiAZEuC (ORCPT ); Tue, 25 Jan 2022 23:50:02 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A920C06161C; Tue, 25 Jan 2022 20:50:02 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id v13so23545187wrv.10; Tue, 25 Jan 2022 20:50:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=stznty7HVe/pzQfdeViHDJ1kDbJwUgBbrg0lxMVpxdA=; b=IqTBmOSMUo97L7KuoUK3kfpVMK590nOjpPaGAgSqlwz6OTDuXfxs7zW/VUdoQwsSE4 zJLDECQ6EDo3kw0kwJG0WxigKWFmbLkQKm8Bv5a1FMrHs7BmnB8bCUEFE3Nr/Qq1kddT QeCzqd4TNDQAYKY9AtFef4sLsPy06TuRNvLQduCRAJ83FBJ0w+TXbOtwtrtocpGE74PD 5NfHvS0sU9E3v/1cst44vthFPEHgXkaFWE+j/fuBzE9ndCw2F9xGmyv6rxWeQgJFy6lk 01ZbIHpQaZE+TAd0EnDw/ylZqrSaAWP0Vtab53HX6wYOE7l1hTCt/3V0tuE74EHkWKDX IyrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=stznty7HVe/pzQfdeViHDJ1kDbJwUgBbrg0lxMVpxdA=; b=uJS0Tj9lzuI0/PJLBf9PVWKxoZeI5tsvxrz/6hRUclwW9RG4z/O1mszN5S2N65duFy mFncauFvkgdog7Y8GxWO4nwKCQIhSPVoDlvqRx/JmY9nVpQuXmzSBldFZdN67xdkt/uO gRjEgfBWZWIDtfCmawFz7bgXuOGR6fYLBTprcyZHshIvyBweMHZbecJGsit685NPWU36 upN/jQtwokIAmW5bTzvBXvfQjp9XC01lyL3CMgI5lUvLenM4NbBOKZyoLduWxtxC+xLE 4/6ngc03Xtt/5K0P34yfSFS04Ly19s2pDoSPumUAsuTWjiuU8wrIdv2y3KsISjO6D2h4 xfHg== X-Gm-Message-State: AOAM533xz3P/Wb2tUWe3g3cDEr/9zLR4zKPWQhJCXCfFDBqeCJTBILgz 1ummQMm+BNMLDxl9yEa+S0Y= X-Google-Smtp-Source: ABdhPJw+jLzjJzxrxscAYl6UjeWlffrvBe2Z/FWjed0KLeKL1hSQVsDlv6N/49LYVPceKooJ7s5W5A== X-Received: by 2002:adf:cd8f:: with SMTP id q15mr21418931wrj.118.1643172600846; Tue, 25 Jan 2022 20:50:00 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id n15sm2171342wmr.26.2022.01.25.20.49.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jan 2022 20:50:00 -0800 (PST) From: Christian Hewitt To: Rob Herring , Mark Rutland , Kevin Hilman , Neil Armstrong , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Christian Hewitt Subject: [PATCH 1/3] arm64: dts: meson-gx: add ATF BL32 reserved-memory region Date: Wed, 26 Jan 2022 04:49:52 +0000 Message-Id: <20220126044954.19069-2-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220126044954.19069-1-christianshewitt@gmail.com> References: <20220126044954.19069-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add an additional reserved memory region for the BL32 trusted firmware present in many devices that boot from Amlogic vendor u-boot. Suggested-by: Mateusz Krzak Signed-off-by: Christian Hewitt --- arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index 6b457b2c30a4..aa14ea017a61 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -49,6 +49,12 @@ no-map; }; + /* 32 MiB reserved for ARM Trusted Firmware (BL32) */ + secmon_reserved_bl32: secmon@5300000 { + reg = <0x0 0x05300000 0x0 0x2000000>; + no-map; + }; + linux,cma { compatible = "shared-dma-pool"; reusable; From patchwork Wed Jan 26 04:49:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 537305 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7704AC28CF5 for ; Wed, 26 Jan 2022 04:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235306AbiAZEuH (ORCPT ); Tue, 25 Jan 2022 23:50:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234461AbiAZEuE (ORCPT ); Tue, 25 Jan 2022 23:50:04 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 544DDC061747; Tue, 25 Jan 2022 20:50:04 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id v123so26816557wme.2; Tue, 25 Jan 2022 20:50:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mqGfir27zJmToE36fS5ePo6W0AQ+1+pKPU+ftIb1KDQ=; b=H/u5aTGxe7bDkyVyj/WetTyDAkwOgDrbmlbTQSSNgeOl6fu43dLrxIejkDwHUUc38I NV1ic0G6uTxbIXSNr24DUy2lc0kMwnsA+obl/mpNa9owGGfCRGYH/7RTTG0xWJROd0/K S3e8yJbW1GWEpgW/4irF2AcrlXnmzRSj/Ij7PAefYPYZ7SJfOFhz7BPWILcCprgz94V3 WIJ5VW4Q+ambXWN68hI+LMGTpOtVwjz7LtBGelRccZoqr9K66L//pWwweyDKE5eB8MCt vae6RgKiYXenV7eWbEOXVrFxow6KOf+wzq27kHaLi5HiOfDsY7seh5iY+wmsoOzAF5ij TCBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mqGfir27zJmToE36fS5ePo6W0AQ+1+pKPU+ftIb1KDQ=; b=Tpp7tFxvTZnsHfa0QEP8n1miEpWwSiBWxXuD9lZpbvy8SMSx6qTsNxVzUlNjjaWBGH pgVOjxozbDQdTuV+4u0z+lb2ibX8hs0gBHfuOAGSqS2eKbcCdEvwClngfuFz3aS2NYiK dWoiV+LPEpHVEtNvChQYkdU+NCSpIdoRfof3RSHNLFOjNhIo/CKe4pqEyKAf3PmLQMOA 90j5EyPsiT/RS1Q2NdzaHiUa2ScosfD6mBK4MTOPtGiRFORNjdy0MM7tlDH+gctGNa5+ 4qYih5GJt/DDIQBjiDu/MmdMmG/wFaGThUXbtNKgdwUHcLDVsISuAyiQOf+WG2wTf31j YdPQ== X-Gm-Message-State: AOAM5329CDKevl0uzWCD0FYabFsl4idQoKnzEGXJIXjrZbAFqFuUlsJb dYq4/BFWc6zYADA0XxPhBEU= X-Google-Smtp-Source: ABdhPJx7OSVbyDVHUckRwup7sGaYF8zhkCb8BJsjlfWSgjXp0ZhBEmMgluIICeh6SPivrPEIAx/fGQ== X-Received: by 2002:a05:600c:19d1:: with SMTP id u17mr5668891wmq.24.1643172602946; Tue, 25 Jan 2022 20:50:02 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id n15sm2171342wmr.26.2022.01.25.20.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jan 2022 20:50:02 -0800 (PST) From: Christian Hewitt To: Rob Herring , Mark Rutland , Kevin Hilman , Neil Armstrong , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Christian Hewitt Subject: [PATCH 2/3] arm64: dts: meson-g12: add ATF BL32 reserved-memory region Date: Wed, 26 Jan 2022 04:49:53 +0000 Message-Id: <20220126044954.19069-3-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220126044954.19069-1-christianshewitt@gmail.com> References: <20220126044954.19069-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add an additional reserved memory region for the BL32 trusted firmware present in many devices that boot from Amlogic vendor u-boot. Signed-off-by: Christian Hewitt --- arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi index 6d99c23261fb..45947c1031c4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -107,6 +107,12 @@ no-map; }; + /* 32 MiB reserved for ARM Trusted Firmware (BL32) */ + secmon_reserved_bl32: secmon@5300000 { + reg = <0x0 0x05300000 0x0 0x2000000>; + no-map; + }; + linux,cma { compatible = "shared-dma-pool"; reusable; From patchwork Wed Jan 26 04:49:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hewitt X-Patchwork-Id: 536892 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 873B7C5DF62 for ; Wed, 26 Jan 2022 04:50:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235681AbiAZEuH (ORCPT ); Tue, 25 Jan 2022 23:50:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235605AbiAZEuG (ORCPT ); Tue, 25 Jan 2022 23:50:06 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F334C061748; Tue, 25 Jan 2022 20:50:06 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id r7so1722330wmq.5; Tue, 25 Jan 2022 20:50:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VcXMYRd9nvU6wwq0JZM21t9w6xo2utk/CM5bkqi1t0Q=; b=OORLWLxo5Qil2yoA01f7hsqlK7krLOGzUBUGb+SB6dzzWYrX0Yl8XzvlWYp3tvmpKR If1supF8lx5s65uDJYGNW7oPCSSMlWlVmm0lrv5dsKr2q3aSTG6K6Nje+2XhxeTOYCAw u+nNdYX6qhojp0CD1kQ0dMSrTbGpxyYtY3JGlzrY03vorRA32w5/10Itwfyq0GRNKG+E OEtYWASYvjA+W1GXCQv19HKxn6jG8HTpdtOzw419gt9mCkUVKBujLG247H+SNf1ShcHV IMZ7PgB8vYV3UB9K9rKNJTvy+ZDSJW/Z6IG9Sa+TsSF4unA1WpRWIRqCx6qzW6WNgzDV Kttg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VcXMYRd9nvU6wwq0JZM21t9w6xo2utk/CM5bkqi1t0Q=; b=N9K49zLmTPk7B4yGQgS9roPx8Jxpa5VEvFM+Y6wVJ6uBSP0PXciUy/KtT+jf5ctQjo IPdS5vAJUDEs+U1YwLMHjaWTQYi90D9unBGRpN9pbhUPSSm89IjJ0gtBjQErZwB4kQ2X PgmwPoHlsTpeXVA8DWsBvoQh/vWVyxRrIMGv4/3nCeRuDJr9hGccMwdvWm2MIU4nrwDU NaITbYSIZQuAT7E1KpMasQ28wtRv3OBSi9kdUAXHEG4Wg3DFTatzv3wQCAeA8mLt7zhd TzxjD+0LO4UvuaO53rx4W+9Bv2+omhBkyEnIfkIGyjCgqfyxMIcnz/+13vETwgNTYwYE X1HA== X-Gm-Message-State: AOAM5310IVE/JKQ3Eu8G/4c7uAO5l26zFE5BfNAAr2ZbDCO6jYDyoRAu 8V4cdxdFijYpm3SaHXjiHrE= X-Google-Smtp-Source: ABdhPJx5Lyiaze7X5x6rEgdEsNm08hTFIL56leW7p/EvLMH+WRTo9sI+PJMQJH60z/9Hbju/7W48Dg== X-Received: by 2002:a7b:cb8b:: with SMTP id m11mr5697035wmi.5.1643172605083; Tue, 25 Jan 2022 20:50:05 -0800 (PST) Received: from localhost.localdomain ([87.200.95.144]) by smtp.gmail.com with ESMTPSA id n15sm2171342wmr.26.2022.01.25.20.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jan 2022 20:50:04 -0800 (PST) From: Christian Hewitt To: Rob Herring , Mark Rutland , Kevin Hilman , Neil Armstrong , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Christian Hewitt Subject: [PATCH 3/3] arm64: dts: meson-g12: drop BL32 region from SEI510/SEI610 Date: Wed, 26 Jan 2022 04:49:54 +0000 Message-Id: <20220126044954.19069-4-christianshewitt@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220126044954.19069-1-christianshewitt@gmail.com> References: <20220126044954.19069-1-christianshewitt@gmail.com> Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The BL32/TEE reserved-memory region is now inherited from the common family dtsi (meson-g12-common) so we can drop it from board files. Signed-off-by: Christian Hewitt Reviewed-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 8 -------- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 8 -------- 2 files changed, 16 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts index d8838dde0f0f..4fb31c2ba31c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -157,14 +157,6 @@ regulator-always-on; }; - reserved-memory { - /* TEE Reserved Memory */ - bl32_reserved: bl32@5000000 { - reg = <0x0 0x05300000 0x0 0x2000000>; - no-map; - }; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts index 427475846fc7..a5d79f2f7c19 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts @@ -203,14 +203,6 @@ regulator-always-on; }; - reserved-memory { - /* TEE Reserved Memory */ - bl32_reserved: bl32@5000000 { - reg = <0x0 0x05300000 0x0 0x2000000>; - no-map; - }; - }; - sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>;