From patchwork Wed Jul 5 15:44:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Delaunay X-Patchwork-Id: 13302359 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 40A48C001B0 for ; Wed, 5 Jul 2023 15:45:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4CtezTQSm8IOATwJxK05BNAUt2mofxPf+0hyP0QvRbo=; b=CahZA/4sBkUanv b2T/T5q+tCm2u8Ij21Br5Mvh1HflvqryuklIj3yZmYr/cGD+0TBcLvlBCZ8iuGsuC5XTFRDtHCqco L+htolGljPL7s29YI01HyP63sF/8DqtwLxkxd9Q+Frs4pNED7ZVsZdUuemPzoc2X6sr/ngqdXzBor dSgKO2kyn/jhchgaWlcCBoXgWaUR9JGQj9CUIiK6vFQl2tDwmG3gYzJl1383xwyNPCnyYz/ZnQyJk x61WqHQGallUOFDHiOTN9BPfPx1CbD4MZ2viSD8OcZYP8jlo/jId1B7kCGttNG2NANB1PyP2ws/L2 Y4LlB4+OlNpVuCbL7KOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qH4h4-00GNDh-32; Wed, 05 Jul 2023 15:45:26 +0000 Received: from mx08-00178001.pphosted.com ([91.207.212.93] helo=mx07-00178001.pphosted.com) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qH4h2-00GNBw-0w for linux-arm-kernel@lists.infradead.org; Wed, 05 Jul 2023 15:45:26 +0000 Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 365CFucw003266; Wed, 5 Jul 2023 17:45:07 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=selector1; bh=tZcwoxurNeGdbCsmVtPFibHtTPWLiT7gddY+k8WdseA=; b=1f0xjDwGKf4JadidiYzNetth/V7O22syv3HcP4WaI72uZrYc/7/+HuWMEez2UDzJDHok aOFvMgQP/0JfTC8v/S5H2EatGBL90MJNsiH38b2CUx0r5OoiKhXDooIcMwXk/3opzrQt UOTNscVJIxRpUz05Zg00PkWtnjN8KSyXjFmBaGfjMbPvGnDvhPbk70rcik/TdLf6An5N H6+/0PoYJq0s5lBX99m7t97EW48USnTW0ZDLBljOkJ33oZRj36NqFXzr/IGkKkNZVsTD k8CpMY3hazzSu6VM6mVu09HRrGE+vMjIsCVPv1FkGaBGdWeHP3pHMiIPJz8tGyT7hruC 1g== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3rn8c9shap-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Jul 2023 17:45:07 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 7E75A10005E; Wed, 5 Jul 2023 17:45:06 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 78FC7236948; Wed, 5 Jul 2023 17:45:06 +0200 (CEST) Received: from localhost (10.48.1.0) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 5 Jul 2023 17:45:06 +0200 From: Patrick Delaunay To: Alexandre TORGUE , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Coquelin CC: Christophe PRIOUZEAU , Etienne CARRIERE , Gatien CHEVALLIER , Patrick Delaunay , , , , Subject: [PATCH 1/2] ARM: dts: sm32mp: remove shmem for scmi-optee on stm32mp15 Date: Wed, 5 Jul 2023 17:44:58 +0200 Message-ID: <20230705174358.1.I5e925c747298ee283f55a520a1a2f50925a17d75@changeid> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230705154459.1194895-1-patrick.delaunay@foss.st.com> References: <20230705154459.1194895-1-patrick.delaunay@foss.st.com> MIME-Version: 1.0 X-Originating-IP: [10.48.1.0] X-ClientProxiedBy: SHFCAS1NODE1.st.com (10.75.129.72) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-05_07,2023-07-05_01,2023-05-22_02 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230705_084524_791809_74F76D75 X-CRM114-Status: GOOD ( 16.59 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Since the OP-TEE commit "plat-stm32mp1: scmi_server: default use OP-TEE shared memory", integrated in OP-TEE 3.22.0-rc1, the default configuration for STM32MP15x SoCs changes and CFG_STM32MP1_SCMI_SHM_SYSRAM is disabled by default and the OP-TEE SMCI server uses OP-TEE native shared memory registered by clients. To be compatible with this configuration and the next OP-TEE versions, this patch removes in the STM32MP15 SCMI device tree the SHMEM used by OP-TEE SCMI and the associated reserved memory in the last 4KByte page of SRAM. Fixes: ea3414e1249e ("ARM: dts: stm32: move SCMI related nodes in a dedicated file for stm32mp15") Signed-off-by: Patrick Delaunay --- arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi index 543f24c2f4f6..ad2584213d99 100644 --- a/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi +++ b/arch/arm/boot/dts/st/stm32mp15-scmi.dtsi @@ -16,7 +16,6 @@ scmi: scmi { #address-cells = <1>; #size-cells = <0>; linaro,optee-channel-id = <0>; - shmem = <&scmi_shm>; scmi_clk: protocol@14 { reg = <0x14>; @@ -60,21 +59,6 @@ scmi_usb33: usb33@2 { }; }; }; - - soc { - scmi_sram: sram@2ffff000 { - compatible = "mmio-sram"; - reg = <0x2ffff000 0x1000>; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x2ffff000 0x1000>; - - scmi_shm: scmi-sram@0 { - compatible = "arm,scmi-shmem"; - reg = <0 0x80>; - }; - }; - }; }; ®11 {