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=-13.8 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 autolearn=unavailable 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 A105AC433DB for ; Thu, 4 Mar 2021 00:51:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7280E64F1D for ; Thu, 4 Mar 2021 00:51:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240052AbhCDAuv convert rfc822-to-8bit (ORCPT ); Wed, 3 Mar 2021 19:50:51 -0500 Received: from aposti.net ([89.234.176.197]:46706 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245604AbhCCVAz (ORCPT ); Wed, 3 Mar 2021 16:00:55 -0500 Date: Wed, 03 Mar 2021 20:57:56 +0000 From: Paul Cercueil Subject: Re: [PATCH] MIPS: boot/compressed: Copy DTB to aligned address To: Rob Herring Cc: Thomas Bogendoerfer , od@zcrc.me, MIPS , linux-kernel@vger.kernel.org Message-Id: In-Reply-To: References: <20210303193305.924384-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org Hi Rob, Le mer. 3 mars 2021 à 14:37, Rob Herring a écrit : > On Wed, Mar 3, 2021 at 1:33 PM Paul Cercueil > wrote: >> >> Since 5.12-rc1, the Device Tree blob must now be properly aligned. > > I had checked the other built-in cases as microblaze broke too, but > missed some of the many ways MIPS can have a dtb. Appended and > built-in DTBs were supposed to be temporary. :( Actually I'm glad these options are here, they make debugging much easier, when working on new SoCs. -Paul >> Therefore, the decompress routine must be careful to copy the blob >> at >> the next aligned address after the kernel image. >> >> This commit fixes the kernel sometimes not booting with a Device >> Tree >> blob appended to it. >> >> Fixes: c4d5e638d6e9 ("scripts/dtc: Update to upstream version >> v1.6.0-51-g183df9e9c2b9") >> Signed-off-by: Paul Cercueil >> --- >> arch/mips/boot/compressed/decompress.c | 8 ++++++++ >> arch/mips/kernel/vmlinux.lds.S | 2 ++ >> 2 files changed, 10 insertions(+) > > Acked-by: Rob Herring