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: 116233 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1962469vqx; Wed, 5 Jul 2023 08:53:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5WF6OepLHwlrp5RPpXA5PrZTBLBT6szYtsbBnwzF4yzj1qL7I6ax47hFRzY+4mes1Ym/M5 X-Received: by 2002:a05:6830:20d1:b0:6b7:4f35:c68e with SMTP id z17-20020a05683020d100b006b74f35c68emr16646106otq.34.1688572409502; Wed, 05 Jul 2023 08:53:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688572409; cv=none; d=google.com; s=arc-20160816; b=Gplrqink/K8/R+DQO/xH4FW5bb7hU/1Q1PY9HbMAAsPScBxlUqTiYQCJ7dOJAFRkCC m7TmQxUUGK2Hzydq9AOWPfhLzt1eB5XWl8AMXF4aukRaBl5wGIN/Hq2I6jnEB6XUfdwl mqSRgzSKX4QvdyqrtaI/sSBM9fx79lzE92KlVgx6MOcNeVp59oTKVnb5n5IWwJ4sHzbv j1rMmzPDnqG6UwiyYjQhPdgpi2vT0V56T+qOcubPGA+ISsGuTUbpyRtViORr5v/NcSrr qugI4vuzAukujT1/h/J1aUiyHkJtgLzwOJw/hWQ1mCMJzZMOOP/je7AbCh5W0dQ9/Y/j azSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tZcwoxurNeGdbCsmVtPFibHtTPWLiT7gddY+k8WdseA=; fh=mEzZyzPVqMH5uU+nFtjlgUcD8+JQL9HRQUQCRAqzvIo=; b=PZGVkhJFV6hqq8a15pTuzenJVwWMtmK+f4k5vomBXjqdh6Ko2pMDTCbb3fBOtrj5z8 Vd3K4gsT8z3CiYNgsDlle1T7ZsiMiBWvHGnvC4tAJjLmETGXmhhaehHhW01EPOoJSNjB t84SoNeYZowZ4MAnyrh/q49d/h89xxFWbiAvbc0kCMYRn1QMpAEOas8dG/p/7UD57scT /oIxh/MHletJEKqepxB8n2qNWLQGmJoEof0OdELGPkpTRFzCjieYyhXNTse7SoZC/4Ik FK0yWWAtC0vgo0tQEA+XJHUwqjYErWgJoasX8FGadirhCgrQDgd1ADGuVOvY72LQjL6D 96hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=1f0xjDwG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 83-20020a630156000000b0054f71faf5aasi10671376pgb.581.2023.07.05.08.53.16; Wed, 05 Jul 2023 08:53:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=1f0xjDwG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=foss.st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232486AbjGEPpb (ORCPT + 99 others); Wed, 5 Jul 2023 11:45:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229793AbjGEPp3 (ORCPT ); Wed, 5 Jul 2023 11:45:29 -0400 Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4802B1722; Wed, 5 Jul 2023 08:45:27 -0700 (PDT) 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-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770596502771025426?= X-GMAIL-MSGID: =?utf-8?q?1770596502771025426?= 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 {