From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 20 Nov 2023 15:56:06 +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 1r55gz-001agz-2K for lore@lore.pengutronix.de; Mon, 20 Nov 2023 15:56:06 +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 1r55gz-0002jA-Mz for lore@pengutronix.de; Mon, 20 Nov 2023 15:56:06 +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:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UL4+nCQo7PSgDU7XO+kSWud4foNBC1PlsKstNqLZQcs=; b=hEx/9gK1TQzGMh+ZRJvn5PvOtR gbYq3lZV11HDYk2ScFW5Tj9quFtsyOGG9QmBxCWVFLwA1Zp6ATW0w3afi2JOdD6qq/64phRfJrU1F 6NtG6KJhbPRP62Sd5g5xeqHxleaOc1saehCe0vmbiu1wXNYFG/r98yBz+9H2kdEACqPzCt6OD3IOf C7yeBnIG+DXI9mtnaEOtlIiYuEQfNdWCyXr70ofjqcSP7KcNmpR29F9OHLDR63D8V7EBZaKdp0yiB 04FkKcg+vjyDt2zlryDthEo2lxTFE/js0GIMldouSMQvYLQnNLhmCWRficsG4lOsNegdYxaUHzoJY EUIFzOqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1r55fh-00CPyC-2p; Mon, 20 Nov 2023 14:54:45 +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 1r55fe-00CPwL-1E for barebox@lists.infradead.org; Mon, 20 Nov 2023 14:54:44 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1r55fc-0002QI-Vh; Mon, 20 Nov 2023 15:54:41 +0100 Message-ID: <0a4dea73-0306-1ea8-caf3-94b47e520f60@pengutronix.de> Date: Mon, 20 Nov 2023 15:54:40 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Content-Language: en-US To: Sascha Hauer , Barebox List References: <20231120144453.1075740-1-s.hauer@pengutronix.de> <20231120144453.1075740-2-s.hauer@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20231120144453.1075740-2-s.hauer@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231120_065442_454649_77AE786D X-CRM114-Status: GOOD ( 24.29 ) 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=-7.0 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,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 2/2] ARM: layerscape: ppa: Fix starting PPA 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) Hello Sascha, On 20.11.23 15:44, Sascha Hauer wrote: > With dba1c26f70 we replaced request_sdram_region() for the PPA with > reserve_sdram_region(). The effect is that the region is marked as > reserved and mapped non executable. While this is desired for EL2, it > also has the effect that we can't start the PPA anymore from EL3. > > Map the region cached/executable to start the PPA, then map it > uncached/non executable once we are in EL2. > > Fixes: dba1c26f70 ("arm: layerscape: ppa: reserve SDRAM region for PPA") > Signed-off-by: Sascha Hauer > --- > arch/arm/mach-layerscape/ppa.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/mach-layerscape/ppa.c b/arch/arm/mach-layerscape/ppa.c > index 521e6b89da..43145a7ece 100644 > --- a/arch/arm/mach-layerscape/ppa.c > +++ b/arch/arm/mach-layerscape/ppa.c > @@ -4,6 +4,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -54,17 +55,11 @@ static int ppa_init(void *ppa, size_t ppa_size, void *sec_firmware_addr) > int ret; > u32 *boot_loc_ptr_l, *boot_loc_ptr_h; > struct ccsr_scfg __iomem *scfg = (void *)(LSCH2_SCFG_ADDR); > - int el = current_el(); > struct fit_handle *fit; > void *conf; > const void *buf; > unsigned long firmware_size; > > - if (el < 3) { > - printf("EL%d, skip ppa init\n", el); > - return 0; > - } > - > boot_loc_ptr_l = &scfg->scratchrw[1]; > boot_loc_ptr_h = &scfg->scratchrw[0]; > > @@ -115,6 +110,7 @@ int ls1046a_ppa_init(resource_size_t ppa_start, resource_size_t ppa_size) > struct resource *res; > void *ppa_fw; > size_t ppa_fw_size; > + int el = current_el(); > int ret; > > res = reserve_sdram_region("ppa", ppa_start, ppa_size); > @@ -126,9 +122,13 @@ int ls1046a_ppa_init(resource_size_t ppa_start, resource_size_t ppa_size) > > get_builtin_firmware(ppa_ls1046a_bin, &ppa_fw, &ppa_fw_size); > > - ret = ppa_init(ppa_fw, ppa_fw_size, (void *)ppa_start); > - if (ret) > - return ret; > + if (el == 3) { > + remap_range((void *)ppa_start, ppa_size, MAP_CACHED); > + ret = ppa_init(ppa_fw, ppa_fw_size, (void *)ppa_start); > + remap_range((void *)ppa_start, ppa_size, MAP_UNCACHED); > + if (ret) > + return ret; Isn't this still racy? I think the EL2 mapping should already have the PPA area uncached _before_ jumping into PPA. Cheers, Ahmad > + } > > of_register_fixup(of_fixup_reserved_memory, res); > -- 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 |