Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1160299pxb; Thu, 4 Mar 2021 05:04:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhSIlWpaaqyDCBU2tf9TSsZAB/1JK8jyxHxKkMJFZ6mr2HbpGlkLYMykL40INCL+JNh6lC X-Received: by 2002:a17:906:3881:: with SMTP id q1mr4139268ejd.490.1614863068522; Thu, 04 Mar 2021 05:04:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614863068; cv=none; d=google.com; s=arc-20160816; b=PLxoNH/168CLqYJqm2luGSc9p+USMrGmygin1fGNzio/VNqPvfLRC6zy95OOkYnCoW ldxMUMkt9B6tHZfRJyLkZkYxVrwR0h0lqN7/uPlugiuFNu/tep5JRgXgdDMPoxLbfPEV rrqW312h694k+65/TGoH7Ur2CpBPAiMi4yIDtt4KwG36riicpHoILSpeWEz9dv/pki8Z MqWoY2Cd1hXRozkSw/XJvKMYCR+62tsIlxrMiBU+rOnoMDz3r+8I3pHfuJUhzWiWkN7V b0XM/g9CKHZXMDLJj98mY/jj1FAKvrTygZvozi3G9nXwMUZdDjSuyMyW7zKRT1LMwR6N nMUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:cc:to:subject:from:date; bh=Ws5c72G+UH+Fr70T1YeGsCYn5RPm+t4rLAvHn1PY20w=; b=nnO8f5PhSGMTWvMQ+jxA25+278Yn2LNDOF4LrMixSpcbrOKYdNoRV3wB+29t/L+Gh3 4qo5oPH/0ecd4C/Oy71T/isXjDdgJmzuhWXbdiJHI/wgzaQLY1w66cA8DiRyMXXke/zp 3PyEN+2GLyfAhWrArQ9UrBwuCLajGVWdBOD+I4/57L4HEs8pv7qzsJn4RWY0fodJaX5T +oUs1hO9FyYi3HeR8LljIyeiTy13DdRr0c3Jt82luDpQyHWqjCkaYVl6vnygIzZE6iUk TbYISUjkdh9h/AhOIDiBiBz+A9P0fHE6qLqK95hEEQcHC8TQLzteMRm00Qa3WYZKUF41 kKCQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y23si17983202eds.278.2021.03.04.05.04.03; Thu, 04 Mar 2021 05:04:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354099AbhCDAGi convert rfc822-to-8bit (ORCPT + 99 others); Wed, 3 Mar 2021 19:06:38 -0500 Received: from aposti.net ([89.234.176.197]:48160 "EHLO aposti.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1581166AbhCCVNz (ORCPT ); Wed, 3 Mar 2021 16:13: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-kernel@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