From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51B41C433E9 for ; Mon, 8 Mar 2021 10:56:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0838E64E64 for ; Mon, 8 Mar 2021 10:56:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231139AbhCHK4W (ORCPT ); Mon, 8 Mar 2021 05:56:22 -0500 Received: from elvis.franken.de ([193.175.24.41]:57497 "EHLO elvis.franken.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230519AbhCHK4E (ORCPT ); Mon, 8 Mar 2021 05:56:04 -0500 Received: from uucp (helo=alpha) by elvis.franken.de with local-bsmtp (Exim 3.36 #1) id 1lJDYR-0003M5-02; Mon, 08 Mar 2021 11:56:03 +0100 Received: by alpha.franken.de (Postfix, from userid 1000) id 99DEFC12B6; Mon, 8 Mar 2021 11:55:50 +0100 (CET) Date: Mon, 8 Mar 2021 11:55:50 +0100 From: Thomas Bogendoerfer To: =?iso-8859-1?Q?Bj=F8rn?= Mork Cc: linux-mips@vger.kernel.org, Rob Herring , Frank Rowand Subject: Re: [PATCH] MIPS: vmlinux.lds.S: align raw appended dtb to 8 bytes Message-ID: <20210308105550.GC6622@alpha.franken.de> References: <20210307182301.20710-1-bjorn@mork.no> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210307182301.20710-1-bjorn@mork.no> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org On Sun, Mar 07, 2021 at 07:23:01PM +0100, Bjørn Mork wrote: > The devicetree specification requires 8-byte alignment in > memory. This is now enforced by libfdt since commit 79edff12060f > ("scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9") > which included the upstream commit 5e735860c478 ("libfdt: Check for > 8-byte address alignment in fdt_ro_probe_()"). > > This broke the MIPS raw appended DTBs which would be appended to > the image immediately following the initramfs section. This ends > with a 32bit size, resulting in a 4-byte alignment of the DTB. > > Fix by padding with zeroes to 8-bytes when MIPS_RAW_APPENDED_DTB > is defined. > > Cc: Rob Herring > Cc: Frank Rowand > Signed-off-by: Bjørn Mork > --- > arch/mips/kernel/vmlinux.lds.S | 5 +++++ > 1 file changed, 5 insertions(+) thank you for your patch, but there already was a fix for the problem pending from Paul, which I've applied to mips-fixes a few minutes ago. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]