From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 18 Jan 2024 16:31:44 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rQUMo-005YlN-2L for lore@lore.pengutronix.de; Thu, 18 Jan 2024 16:31:43 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rQUMp-0008G1-As for lore@pengutronix.de; Thu, 18 Jan 2024 16:31:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:From:In-Reply-To: Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rRKXDU8EJkLnu9x4xVohi2YI5tHPC36ZnDRg5nzPpbo=; b=K3diVfVLYadeAIeQYSYnIE2LqG zto5rjaVOTt3uAqUtpDvpiD/PZjp862vle699mzpMtlMwB84SvzF2+HOX0osrS/VB3+RqjUf+vyHl 769Ka5YBl/vDsu6A57zSG/f2iC++CahKyQj0XVGey6mAxFCL4rHvqAzyNkYbTCdsssMKuwEVXxYbP 1KX9iLlZ1By6L5a2X/bIAKLseKKw3FTIx25scdDhEUbMsLF/p0kw2PEgKwqU421kjF4eRetO0psia mF1XVSN4AMJKrMMb/giP6pGyTjDU0r+Kf1iORvrVUC1hUlLtppuYZr5EyL7hXnGUw4O4wccvHCYdn tG8d0r4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rQULT-0036uH-14; Thu, 18 Jan 2024 15:30:19 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rQULP-0036sw-2V for barebox@lists.infradead.org; Thu, 18 Jan 2024 15:30:18 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rQULK-00083J-6G; Thu, 18 Jan 2024 16:30:10 +0100 Received: from [2a0a:edc0:2:b01:1d::c0] (helo=ptx.whiteo.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rQULJ-000ipW-Pt; Thu, 18 Jan 2024 16:30:09 +0100 Received: from sha by ptx.whiteo.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1rQULJ-000aTO-NA; Thu, 18 Jan 2024 16:30:09 +0100 Date: Thu, 18 Jan 2024 16:30:09 +0100 To: Marco Felsch Cc: barebox@lists.infradead.org Message-ID: <20240118153009.GN4700@pengutronix.de> References: <20240116170738.209954-1-m.felsch@pengutronix.de> <20240116170738.209954-19-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240116170738.209954-19-m.felsch@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) From: Sascha Hauer X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240118_073015_813605_61A21A79 X-CRM114-Status: GOOD ( 26.71 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-6.1 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH v2 18/18] ARM: i.MX8M: fix optee of-fixup logic X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) On Tue, Jan 16, 2024 at 06:07:38PM +0100, Marco Felsch wrote: > The current code checks only if "/firmware/optee" exist on the builtin > dtb and applys the fixup if not found and if found nothing is done. If a > builtin dts contains the node but an external don't the fixup won't be > applied. Also if the external dts does have a node + the reserved memory > region nodes but the barebox builtin dts don't we do add additional > reserved memory nodes which may conflict due to different name scheme: > vs. @. > > Move the "/firmware/optee" check into the of_optee_fixup() so the check > is done on the correct dtb root nodes. > > Signed-off-by: Marco Felsch > --- > arch/arm/mach-imx/imx8m.c | 3 +-- > drivers/tee/optee/of_fixup.c | 6 +++++- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-imx/imx8m.c b/arch/arm/mach-imx/imx8m.c > index 6db16f024148..73b420b38697 100644 > --- a/arch/arm/mach-imx/imx8m.c > +++ b/arch/arm/mach-imx/imx8m.c > @@ -68,8 +68,7 @@ static int imx8m_init(const char *cputypestr) > imx_set_reset_reason(src + IMX7_SRC_SRSR, imx7_reset_reasons); > pr_info("%s unique ID: %llx\n", cputypestr, imx8m_uid()); > > - if (IS_ENABLED(CONFIG_PBL_OPTEE) && tzc380_is_enabled() && > - !of_find_node_by_path_from(NULL, "/firmware/optee")) { > + if (IS_ENABLED(CONFIG_PBL_OPTEE) && tzc380_is_enabled()) { > static struct of_optee_fixup_data optee_fixup_data = { > .shm_size = OPTEE_SHM_SIZE, > .method = "smc", > diff --git a/drivers/tee/optee/of_fixup.c b/drivers/tee/optee/of_fixup.c > index cdf650592e90..2ff1f01964c8 100644 > --- a/drivers/tee/optee/of_fixup.c > +++ b/drivers/tee/optee/of_fixup.c > @@ -9,12 +9,16 @@ > int of_optee_fixup(struct device_node *root, void *_data) > { > struct of_optee_fixup_data *fixup_data = _data; > + const char *optee_of_path = "/firmware/optee"; > struct resource res = {}; > struct device_node *node; > u64 optee_membase; > int ret; > > - node = of_create_node(root, "/firmware/optee"); > + if (of_find_node_by_path_from(NULL, optee_of_path)) > + return 0; This implements a "when the internal dts does have a OP-TEE node, then do not fixup the external dts". This is surely not what you meant. Should this be if (of_find_node_by_path_from(root, optee_of_path)) return 0; or something else? Sascha -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |