From patchwork Wed Mar 14 07:13:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 131555 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp511832ljb; Wed, 14 Mar 2018 00:13:30 -0700 (PDT) X-Google-Smtp-Source: AG47ELuZdbn9IfDiTopvYn/IldmhNKxEcByz53ckr3OOH8knxlzSbVqNIZcAoAQM3yHvPy58c7zA X-Received: by 10.98.254.6 with SMTP id z6mr3272695pfh.155.1521011610571; Wed, 14 Mar 2018 00:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521011610; cv=none; d=google.com; s=arc-20160816; b=zJBQN3oIlFS8Hkr6z9nZyQrtEBUU/+2T3omD0oxyq2vvdJ6dMcnel8ZQo96qv4lP2f LOlfcqHituTAh+2Znfz28lg74ugBmB9njPaB7VWqJOFUFzYA1FwNjvYLT/XV1gbabrbx 07Db/S3wUq243nt7h/ZAEDsdAwXzoKh8mfZSKElHrTX0se5MJNh4OOcskjvR1V6T3tjF 8RUhCwtC47ncZMClgwwk5GmiqxZRh7wTDDnPOMDVvZ61/a3jqOs0ttNEYZn2lTQFnn0i BBJ+OZ2uDp7qd5SYxS86p5UjAiwTa/yJoO0u7lJZQFArGK9u/pcoZpbgkgB1B3Its4Gv zMEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=GFXm3xzOq4xiDGhxuyTb+5z0CI5YGgFIAdGaY2LcH6M=; b=BAAa4D75V8ez+L6dLHuIZiU6KndU187ijov7iAQRJDRlbFSrt/jW0+fkY5nRlUgXX3 Uy7QtmAenByotzvsYCK2MDG9WBL5KegpVWHjoe9zEH4JmmZRHyMkF0vg5ukI28Os81qD grKPCwpRzNvS6NWJ0VU1pXK3mMZYjzRJ94vb5Gxbapcs6CyutCbGOw+RUtE/2p7Yh/AF FXpfJ5BhH64fJPncSeGetPL6y2f8AcvVrIaBydknu6lh4Wbol6LExCxI6tv/qbaYJMcg 1i8X3KVguCcxPEvLDr8ayA3NXIxB6HqD5JNLA94TCrDRwBkJmQ3WTdm2ek6i9/c7A/Of Il1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=P6AVzKH/; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u19si1415292pgv.184.2018.03.14.00.13.29; Wed, 14 Mar 2018 00:13:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=P6AVzKH/; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753280AbeCNHN3 (ORCPT + 10 others); Wed, 14 Mar 2018 03:13:29 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:46398 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753272AbeCNHN2 (ORCPT ); Wed, 14 Mar 2018 03:13:28 -0400 Received: by mail-pg0-f67.google.com with SMTP id r26so995218pgv.13 for ; Wed, 14 Mar 2018 00:13:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=GFXm3xzOq4xiDGhxuyTb+5z0CI5YGgFIAdGaY2LcH6M=; b=P6AVzKH/t9etLtF7IZKYnF4i7MLwInjN/2IhszqpYlhsbD6Yrwi2oMfVm06i6XKVBC nYfMtKP03NtI75CznKIxMqKnVag3DyOe2Zz5bNwx7paGD23cUJ/0bX0grDMcR4B58plr Jk42T8AAyLNj74tuPaOrJmxE8YCguBN+6t3NLDjcuHrjyO2bFFkQKO/Z7tAVrkdPEKNl uqmR/wmOlutMJajUXCHaeX57CdvHuCBH0IZoix5MGIhSLmErLhSilssW8V0JvQMKVLPF m2d3a8NIN7UHcHysO7c5/2Yiv0c2eRUc6TbisqVoGsyvn0egi8sOcLzKFHk0A6QI54hC ut0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=GFXm3xzOq4xiDGhxuyTb+5z0CI5YGgFIAdGaY2LcH6M=; b=BJeTNgQxNGa3x2fqiRHpKW6V/ZhuLJIHZ1NTlpk5O7VGnxCHhidXjdhyByW2o4F4T5 tKypYBPZEEGo67f+2oj4DV4uEx+UP+pByPDOOXnEib8Quy50D/0A16s6MkxSwb+BalOt jrfenQCDb/hU0kRZeE9rwdDVd2kHLRLRljDyxBQXw1SWCt0Q+QPjLAEOnSWBMrclIBFk nCZA3k+O9scEImOvUjxlZYLXHBySITUYIz96Bz4FAf8FoN4mY5dxOhxhGECN7vd75Hhn gQe1H/ujZ02VQ/ABDAGRlnhPYsMCdhXboQ0iZOulJmV91wCguNoHLpj3v1oHaKdGmfKe Ox+g== X-Gm-Message-State: AElRT7GnWBtatm9zvMKhsbOVbG7FH7Gv89RB7UPmFZpIyElYOZtA19hb 7WYdCZ1d6s0cK+0FYRCNM7SbJatA8qU= X-Received: by 10.98.15.72 with SMTP id x69mr3288111pfi.16.1521011608079; Wed, 14 Mar 2018 00:13:28 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id 5sm3963615pfh.133.2018.03.14.00.13.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Mar 2018 00:13:27 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Wed, 14 Mar 2018 17:43:20 +1030 From: Joel Stanley To: Arnd Bergmann , Benjamin Herrenschmidt Cc: linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, Andrew Jeffery , stable@vger.kernel.org Subject: [PATCH] ARM: dts: aspeed: Add default memory node Date: Wed, 14 Mar 2018 17:43:12 +1030 Message-Id: <20180314071312.17492-1-joel@jms.id.au> X-Mailer: git-send-email 2.15.1 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org When we removed the inclusion of skeleton.dtsi from the device trees, we broke booting for systems with bootloaders that aren't device tre aware. This can be seen, for example, when appending the device tree blob to the kernel image. The reason booting broke was that the kernel lacked the device_type label in the memory node. Add in a default memory node wth the device_type. It can contain the memory address as the location is fixed for each SoC generation, but the size needs to be added by the bootloader or the board specific dts. Fixes: 73102d6fdc32 ("ARM: dts: aspeed: Remove skeleton.dtsi") Cc: Reported-by: Benjamin Herrenschmidt Signed-off-by: Joel Stanley --- Arnd, can you please merge this as a fix for 4.16? arch/arm/boot/dts/aspeed-g4.dtsi | 5 +++++ arch/arm/boot/dts/aspeed-g5.dtsi | 5 +++++ 2 files changed, 10 insertions(+) -- 2.15.1 diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 36ae23aa3b48..518d2bc7c7fc 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -42,6 +42,11 @@ }; }; + memory@40000000 { + device_type = "memory"; + reg = <0x40000000 0>; + }; + ahb { compatible = "simple-bus"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 17ee0fa33a14..f9917717dd08 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi @@ -42,6 +42,11 @@ }; }; + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0>; + }; + ahb { compatible = "simple-bus"; #address-cells = <1>;