From patchwork Wed Jul 5 15:44:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Delaunay X-Patchwork-Id: 13302360 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 99256EB64DD for ; Wed, 5 Jul 2023 15:45:58 +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=LaGEpmUmHiDvSP3px8LL5yaq64nabsP5kIQzEsXid80=; b=t1cJQaQO2FGvCl trxsfikcFZvPK+jZZOA2UeoIXxTpjRopv0QTFRvn6rX9+hydJtsEN98ht4fZIC5VCQw8j7IUyx8kM VpgNuJuclT4OKoUzuBvNkbivYloMcZaxl2zXpqyNb8yjmG3rqU3KZt2P/d2PftyvE/CxDNaoRMZpH SREYsAhXpY63FqIKWbeoXneO2AzrzCRJmuyvQ/8Ci/nD2+frWscnxYTzpD5Emrm2Dz65anEm6yI7j sv8y3RNihvVYswmsG7tzm9oHyedox5lbLpNwgd+ijEG0YLEzDUeT8eA3be39ql7SHb7K3xVcQyKQv vNI4i6Weez64BhOBCl2w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qH4h7-00GNER-2o; Wed, 05 Jul 2023 15:45:29 +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-00GNC0-0o for linux-arm-kernel@lists.infradead.org; Wed, 05 Jul 2023 15:45:27 +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 365CFucx003266; Wed, 5 Jul 2023 17:45:08 +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=XyC5FyMVMPnTU1hmmczheNZBiuJQrxdm92Tn12ZD3T4=; b=fDWc4J/Azt50qwdGhGJdZg+PxoYFohoGvQWcCISV+JgQ5nCtXh7kFN+Udw0oyjnNDIP0 GeevSuOuD1YFjLMFZ3vecEdtvRAY22HXmnJfoSidXyqL4+ZeLOiMKRKpKLMLKgH28bpV CQF441ZjSZHfw9oXEatN62J3nMP0kBTrn0wjaM4RvUh8jW9W2ucHH3+C3WxDWSCo74YX 9fTzXOnX3TBfiUPR1wskqP+GjzA38e/HzDocYxC80VKO3aKq9D3Yj/ZhxVcrHzDs/FKe WKFsei+6w4uvD6sbbgx3FY5qS+7WCudFv4sU6BYLRCwMXQCDvSGeM+OAtgFucaIv4TN0 ZQ== 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 3rn8c9shar-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 797FB100057; Wed, 5 Jul 2023 17:45:07 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 713B3236948; Wed, 5 Jul 2023 17:45:07 +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:07 +0200 From: Patrick Delaunay To: Alexandre TORGUE , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Coquelin , Gabriel Fernandez CC: Christophe PRIOUZEAU , Etienne CARRIERE , Gatien CHEVALLIER , Patrick Delaunay , , , , Subject: [PATCH 2/2] ARM: dts: sm32mp: remove shmem for scmi-optee on stm32mp13 Date: Wed, 5 Jul 2023 17:44:59 +0200 Message-ID: <20230705174358.2.Icb84b08e0e668cd81dddb8d206e9bcd33af9aea8@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_796278_5263909C X-CRM114-Status: GOOD ( 15.36 ) 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 CFG_STM32MP1_SCMI_SHM_SYSRAM will be disabled by default for STM32MP13x SoCs in future OP-TEE version and the OP-TEE SMCI server uses only the OP-TEE native shared memory registered by clients. To be compatible by default with this configuration this patch removes the shared memory in the SCMI configuration and the associated reserved memory in SRAM. Fixes: 9005aeddd9fc ("ARM: dts: stm32: enable optee firmware and SCMI support on STM32MP13") Signed-off-by: Patrick Delaunay --- arch/arm/boot/dts/st/stm32mp131.dtsi | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/arm/boot/dts/st/stm32mp131.dtsi b/arch/arm/boot/dts/st/stm32mp131.dtsi index d163c267e34c..d23bbc3639df 100644 --- a/arch/arm/boot/dts/st/stm32mp131.dtsi +++ b/arch/arm/boot/dts/st/stm32mp131.dtsi @@ -40,7 +40,6 @@ scmi: scmi { #address-cells = <1>; #size-cells = <0>; linaro,optee-channel-id = <0>; - shmem = <&scmi_shm>; scmi_clk: protocol@14 { reg = <0x14>; @@ -106,19 +105,6 @@ soc { interrupt-parent = <&intc>; ranges; - 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>; - }; - }; - timers2: timer@40000000 { #address-cells = <1>; #size-cells = <0>;