From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 11 Oct 2022 12:35:29 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oiCbh-004S1d-Rj for lore@lore.pengutronix.de; Tue, 11 Oct 2022 12:35:29 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oiCbf-00050T-Mf for lore@pengutronix.de; Tue, 11 Oct 2022 12:35:28 +0200 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: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=4F2mmJRkU9jZig6qQ1AwZ/VWAgjg8x51LPB/FabGCt0=; b=0XHf4IqaetwhltNv4xmQbDSTGp 6ykJZPJMIoOJSn8bL7N8ib8H09EuKCr40lVorxCjnfZPki/Arv0SHFuywb5bs2cHTZwF6f6673qK6 qcwilG67pboJJIIcirFl9rsUWrWyVaTm0dX3q/laFEm4tJz/NvwlKgaUioUDuPMQX7jAqXcEwr9+n 2xIt0MniGz7nSihCffNHvIi5I8/FR1rfXG1OLPBpussN51PhB1qk4wsmJd8TCqWLP6fakHeBZf8n/ HWazCy8d1D9DwzadITRNtAoSxZeUNNeSzqx1fentb5AHc6WrBxaAXH7MbHyHUUeR+W5SsodWlRqsz pMwlOMhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oiCZr-0040nt-3f; Tue, 11 Oct 2022 10:33:35 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oiCZl-0040m5-4B for barebox@lists.infradead.org; Tue, 11 Oct 2022 10:33:30 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oiCZg-0004pR-5v; Tue, 11 Oct 2022 12:33:24 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oiCZf-000s7o-G2; Tue, 11 Oct 2022 12:33:23 +0200 Received: from afa by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oiCZe-001RF3-OH; Tue, 11 Oct 2022 12:33:22 +0200 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: bst@pengutronix.de, Ahmad Fatoum Date: Tue, 11 Oct 2022 12:33:17 +0200 Message-Id: <20221011103318.299209-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221011_033329_188346_5E791D01 X-CRM114-Status: GOOD ( 14.21 ) 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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.5 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, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master v2 1/2] ARM: MXS: fix breakage for non-DT boards X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) boarddata, the third argument passed from barebox PBL to barebox proper, is usually either a pointer to an optionally compressed flattened device tree or a machien type integer casted to a pointer. In order to support device trees located in the first 8192 bytes of address space, barebox has been trying to dereference boarddata, before falling back to treating it as integer. This resulted in breakage as boarddata may be an integer not divisible by 4 and thus an unaligned exception would occur. The already existing barebox_arm_boarddata mechanism sidesteps this issue: With it, the machine type integer is not passed as is, but the address of a suitably aligned structure that contains it is passed instead. Searching for MACH_TYPE in arch/arm/boards shows 5 boards to be affected in-tree, which are all fixed with this commit. Fixes: 390bc7834ffc ("ARM: start: check for machine type last") Signed-off-by: Ahmad Fatoum --- v1 -> v2: - Do full relocation instead of get_runtime_offset(). This is required, because GCC[1] generated a pc-relative reference to boarddata as it's in the same translation unit and as such get_runtime_offset() being added was wrong. Instead of relying on compiler whims, we instead set up a full C environment and play it safe. - s/MACHINE_TYPE/MACH_TYPE/ (Bastian) [1]: OSELAS.Toolchain-2021.07.0/arm-v7a-linux-gnueabihf/gcc-11.1.1 --- arch/arm/boards/chumby_falconwing/lowlevel.c | 11 ++++++++++- arch/arm/boards/crystalfontz-cfa10036/lowlevel.c | 11 ++++++++++- arch/arm/boards/freescale-mx23-evk/lowlevel.c | 11 ++++++++++- arch/arm/boards/imx233-olinuxino/lowlevel.c | 10 +++++++++- arch/arm/boards/karo-tx28/lowlevel.c | 10 +++++++++- 5 files changed, 48 insertions(+), 5 deletions(-) diff --git a/arch/arm/boards/chumby_falconwing/lowlevel.c b/arch/arm/boards/chumby_falconwing/lowlevel.c index 091dd1955260..d2059c8f7808 100644 --- a/arch/arm/boards/chumby_falconwing/lowlevel.c +++ b/arch/arm/boards/chumby_falconwing/lowlevel.c @@ -7,8 +7,17 @@ #include #include +static struct barebox_arm_boarddata boarddata = { + .magic = BAREBOX_ARM_BOARDDATA_MAGIC, + .machine = MACH_TYPE_CHUMBY, +}; + ENTRY_FUNCTION(start_chumby_falconwing, r0, r1, r2) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, (void *)MACH_TYPE_CHUMBY); + + relocate_to_current_adr(); + setup_c(); + + barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, &boarddata); } diff --git a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c index 92b42aa89350..e3b452839c08 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c +++ b/arch/arm/boards/crystalfontz-cfa10036/lowlevel.c @@ -7,8 +7,17 @@ #include #include +static struct barebox_arm_boarddata boarddata = { + .magic = BAREBOX_ARM_BOARDDATA_MAGIC, + .machine = MACH_TYPE_CFA10036, +}; + ENTRY_FUNCTION(start_cfa10036, r0, r1, r2) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, (void *)MACH_TYPE_CFA10036); + + relocate_to_current_adr(); + setup_c(); + + barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, &boarddata); } diff --git a/arch/arm/boards/freescale-mx23-evk/lowlevel.c b/arch/arm/boards/freescale-mx23-evk/lowlevel.c index 62560bbff733..2b5a53222299 100644 --- a/arch/arm/boards/freescale-mx23-evk/lowlevel.c +++ b/arch/arm/boards/freescale-mx23-evk/lowlevel.c @@ -7,8 +7,17 @@ #include #include +static struct barebox_arm_boarddata boarddata = { + .magic = BAREBOX_ARM_BOARDDATA_MAGIC, + .machine = MACH_TYPE_MX23EVK, +}; + ENTRY_FUNCTION(start_imx23_evk, r0, r1, r2) { arm_cpu_lowlevel_init(); - barebox_arm_entry(IMX_MEMORY_BASE, SZ_32M, (void *)MACH_TYPE_MX23EVK); + + relocate_to_current_adr(); + setup_c(); + + barebox_arm_entry(IMX_MEMORY_BASE, SZ_32M, &boarddata); } diff --git a/arch/arm/boards/imx233-olinuxino/lowlevel.c b/arch/arm/boards/imx233-olinuxino/lowlevel.c index 71fc379f0487..c8c36a947e41 100644 --- a/arch/arm/boards/imx233-olinuxino/lowlevel.c +++ b/arch/arm/boards/imx233-olinuxino/lowlevel.c @@ -11,9 +11,17 @@ #include #include +static struct barebox_arm_boarddata boarddata = { + .magic = BAREBOX_ARM_BOARDDATA_MAGIC, + .machine = MACH_TYPE_IMX233_OLINUXINO, +}; + ENTRY_FUNCTION(start_barebox_olinuxino_imx23, r0, r1, r2) { - barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, (void *)MACH_TYPE_IMX233_OLINUXINO); + relocate_to_current_adr(); + setup_c(); + + barebox_arm_entry(IMX_MEMORY_BASE, SZ_64M, &boarddata); } static const uint32_t pad_setup[] = { diff --git a/arch/arm/boards/karo-tx28/lowlevel.c b/arch/arm/boards/karo-tx28/lowlevel.c index 28d96f3e1a5f..912043d73d1d 100644 --- a/arch/arm/boards/karo-tx28/lowlevel.c +++ b/arch/arm/boards/karo-tx28/lowlevel.c @@ -15,9 +15,17 @@ #include #include +static struct barebox_arm_boarddata boarddata = { + .magic = BAREBOX_ARM_BOARDDATA_MAGIC, + .machine = MACH_TYPE_TX28, +}; + ENTRY_FUNCTION(start_barebox_karo_tx28, r0, r1, r2) { - barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, (void *)MACH_TYPE_TX28); + relocate_to_current_adr(); + setup_c(); + + barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, &boarddata); } static const uint32_t iomux_pads[] = { -- 2.30.2