From patchwork Tue Jun 3 17:58:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 4289691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8DE57BEEA7 for ; Tue, 3 Jun 2014 18:01:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B0A4C20173 for ; Tue, 3 Jun 2014 18:01:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A146120172 for ; Tue, 3 Jun 2014 18:01:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wrszt-0004xF-7L; Tue, 03 Jun 2014 17:59:41 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wrszp-0004q1-TN for linux-arm-kernel@lists.infradead.org; Tue, 03 Jun 2014 17:59:38 +0000 Received: from pool-96-249-243-124.nrflva.fios.verizon.net ([96.249.243.124] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1WrszL-0006Vo-LX; Tue, 03 Jun 2014 17:59:07 +0000 Received: from triton.localdomain (unknown [10.16.5.78]) by titan (Postfix) with ESMTP id D344F58655E; Tue, 3 Jun 2014 13:59:03 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 96.249.243.124 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1994RiEQDzO6kkWgj8a4PSUqRmpamH9KxA= X-DKIM: OpenDKIM Filter v2.0.1 titan D344F58655E From: Jason Cooper To: Kevin's boot bot , Thomas Petazzoni Subject: [PATCH] ARM: mvebu: DT: fix OpenBlocks AX3-4 RAM size Date: Tue, 3 Jun 2014 17:58:40 +0000 Message-Id: <1401818320-7202-1-git-send-email-jason@lakedaemon.net> X-Mailer: git-send-email 2.0.0 In-Reply-To: <5388ddb9.0458440a.2be7.323c@mx.google.com> References: <5388ddb9.0458440a.2be7.323c@mx.google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140603_105938_042401_14080E74 X-CRM114-Status: GOOD ( 12.26 ) X-Spam-Score: -0.0 (/) Cc: linaro-kernel@lists.linaro.org, Jason Cooper , linux-arm-kernel@lists.infradead.org, kernel-build-reports@lists.linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The OpenBlocks AX3-4 has a non-DT bootloader. It also comes with 1GB of soldered on RAM, and a DIMM slot for expansion. Unfortunately, atags_to_fdt() doesn't work in big-endian mode, so we see the following failure when attempting to boot a big-endian kernel: 686 slab pages 17 pages shared 0 pages swap cached [ pid ] uid tgid total_vm rss nr_ptes swapents oom_score_adj name Kernel panic - not syncing: Out of memory and no killable processes... CPU: 1 PID: 351 Comm: kworker/u4:0 Not tainted 3.15.0-rc8-next-20140603 #1 [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0x78/0x94) [] (dump_stack) from [] (panic+0x90/0x21c) [] (panic) from [] (out_of_memory+0x320/0x340) [] (out_of_memory) from [] (__alloc_pages_nodemask+0x874/0x930) [] (__alloc_pages_nodemask) from [] (handle_mm_fault+0x744/0x96c) [] (handle_mm_fault) from [] (__get_user_pages+0xd0/0x4c0) [] (__get_user_pages) from [] (get_arg_page+0x54/0xbc) [] (get_arg_page) from [] (copy_strings+0x278/0x29c) [] (copy_strings) from [] (copy_strings_kernel+0x20/0x28) [] (copy_strings_kernel) from [] (do_execve+0x3a8/0x4c8) [] (do_execve) from [] (____call_usermodehelper+0x15c/0x194) [] (____call_usermodehelper) from [] (ret_from_fork+0x14/0x3c) CPU0: stopping CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.15.0-rc8-next-20140603 #1 [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0x78/0x94) [] (dump_stack) from [] (handle_IPI+0x138/0x174) [] (handle_IPI) from [] (armada_370_xp_handle_irq+0xb0/0xcc) [] (armada_370_xp_handle_irq) from [] (__irq_svc+0x40/0x50) Exception stack(0xc0b6bf68 to 0xc0b6bfb0) bf60: e9fad598 00000000 00f509a3 00000000 c0b6a000 c0b724c4 bf80: c0b72458 c0b6a000 00000000 00000000 c0b66da0 c0b6a000 00000000 c0b6bfb0 bfa0: c027bb94 c027bb24 60000313 ffffffff [] (__irq_svc) from [] (cpu_startup_entry+0x54/0x214) [] (cpu_startup_entry) from [] (start_kernel+0x318/0x37c) [] (start_kernel) from [<00208078>] (0x208078) ---[ end Kernel panic - not syncing: Out of memory and no killable processes... Fix this by setting a sane default (1 GB) in the dts file. Signed-off-by: Jason Cooper Tested-by: Kevin Hilman --- Kevin, Please test when you have a moment. If it works for you, feel free to apply it directly wherever you feel it's appropriate. thx, Jason. arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 5d42feb31049..178382ca594f 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -25,7 +25,7 @@ memory { device_type = "memory"; - reg = <0 0x00000000 0 0xC0000000>; /* 3 GB */ + reg = <0 0x00000000 0 0x40000000>; /* 1 GB soldered on */ }; soc {