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: 10281549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 39252602BD for ; Wed, 14 Mar 2018 07:13:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 252F628722 for ; Wed, 14 Mar 2018 07:13:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 190F42872F; Wed, 14 Mar 2018 07:13:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C52028722 for ; Wed, 14 Mar 2018 07:13:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=06N1sAX4j4iuRSBXbbArHxiEuAuh3QM3bv0OMuwsInU=; b=VsZ Sc/sK0Tpgtmkd+a5cfU70MRMhRVIFnQ3C2iXgVnpGAdvBDsWioWq8nFiPmX0+WNskDeircEdAU7Vn d5oKw41K1cfl3XydFrao3IXm1o0naXiDS8l7MQTxhB11C5KPdF3xoWjrxKbyYRAeOzy51KB/WmMWy KlOuTYRdoF792Im9zvkYDdJ0ffQMWHJWkw3PjrYnQBKgGuj3PVPKcCSWL+XRE7aQ3qaKh0BygA0ng xlf2wKZK2irE7YrHu/RYpRAo7YHMq9V4zzpBV2wAWqB2D3Lt0NIErsi+tENotWfZcjKFRYde5tMMe oOwmG4Xe/FNq9fQX6MjByppGNSAph4Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew0bX-0000aJ-52; Wed, 14 Mar 2018 07:13:43 +0000 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew0bT-0000YD-Bx for linux-arm-kernel@lists.infradead.org; Wed, 14 Mar 2018 07:13:41 +0000 Received: by mail-pg0-x244.google.com with SMTP id d1so1014337pgv.2 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=CSN5bLAIJEikWfy2FeE5f+9JgG2yL2b0Gpdp4BuN0iU9gntAXoqRhu7ipBI9qalC/x nR7fYrfqw1fT55xZDBQEd7q+pLQHwyUhwm9nrnka04KPvgyYQF6+Nk6U29QwmpALhd3X 5qGtSnMlXKzzk7dIDeZSVQTDqHe9ATN9aiIY+vWIKcE2WaJQVXckltx4XhTNG6cxE4Lx TJEQdoyjBh4lwtWGJ7+hA+tQXSjYNEtANwD1frqYVm5ElXYDvCEOjZOZhmaXWTvD8ZYy umqOtqaLnP1EnFtm1zc8wQ70RpuUA57Vrqv+SofASvnAaQmB86sAH166stmNCKmev+oN 0BJQ== X-Gm-Message-State: AElRT7H3dos4rBXWeipqki5Pi92rOcn4sW1B2X0umOBa8BPOr2tkrw3h 6qmyNLUmxQcwNVhJpM+5SRs= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180314_001339_514921_DBEAF472 X-CRM114-Status: GOOD ( 14.81 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , stable@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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>;