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: 885629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 401NHM6tYCz9sV3 for ; Wed, 14 Mar 2018 18:13:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P6AVzKH/"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 401NHM5CdXzF0xw for ; Wed, 14 Mar 2018 18:13:35 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P6AVzKH/"; dkim-atps=neutral X-Original-To: linux-aspeed@lists.ozlabs.org Delivered-To: linux-aspeed@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c05::241; helo=mail-pg0-x241.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P6AVzKH/"; dkim-atps=neutral Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 401NHH1g3rzF0vb for ; Wed, 14 Mar 2018 18:13:30 +1100 (AEDT) Received: by mail-pg0-x241.google.com with SMTP id m15so1014987pgc.1 for ; Wed, 14 Mar 2018 00:13:30 -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=rIvKH8WeWFG68ztV3jyIShK3CzL4rcRclqhvZ2KIZDrSoAhJjWY0PSdO1VcLCFruDU U4CGC0kXCDTtoc3oHbHB81wfsNF0d0F3wGVr/WmonEN5etJdm7QZs73tGKZNjAO1unux qf9zi506wGR6Iq97y27tCGL6kJRO4tX6CHLVnhQJhTxFUZ5NpC87BCfCvlsPxYq3gdVY Z/268e3HEklsEOgS4u349R4Shv8ZrQpCie3Bwrj8aZWn6lxPVAcbKRJIXcWMr1JxhD/Y 5/ByvvipqaOvd+/Zp+SipR1EVz4pQIxd1w7yIOiwVq9L4cFWTkRDsdDC3V7FmX0Yp/4C qA1g== X-Gm-Message-State: AElRT7HkajphgoEsm0pGkz+XSm/pthejhxjvfUVAEuvqI49hnq/zUY0E nCVmDXjAsE/2ggcsg29Ex/E= X-Google-Smtp-Source: AG47ELsNmZNFAzpIwv8juOVOOgEEemD2T5l1HP5NFrR4IcyqC/1FcuFp3XHv40nYgKJFnm6dtxsbfw== 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 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 X-BeenThere: linux-aspeed@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Linux ASPEED SoC development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Errors-To: linux-aspeed-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linux-aspeed" 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(+) 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>;