From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 20 Aug 2018 11:27:47 +0200 (CEST) Received: from h1.mediaprovider.org ([IPv6:2a03:4000:6:1021::4]:53095 "EHLO h1.direct-netware.de" rhost-flags-OK-OK-OK-FAIL) by eddie.linux-mips.org with ESMTP id S23993941AbeHTJ1pD2yvt (ORCPT ); Mon, 20 Aug 2018 11:27:45 +0200 Received: from odin.localnet (p54B04450.dip0.t-ipconnect.de [84.176.68.80]) by h1.direct-netware.de (Postfix) with ESMTPA id 1F49B101557 for ; Mon, 20 Aug 2018 11:27:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=vplace.de; s=mail; t=1534757263; bh=P3j2VXopv21vVoRo/3C3S/ms3sDdY6P2EGP5Y4bScYA=; h=From:To:Subject:Date:From; b=PGx33dmglsXFFHAjpaoyfQXLn/aEJeiqgMHPv3DDB5LK6CdAZRoskiddMmJYJskVD A0SY3X+7FVRERTgGIYf5xMayHCChIcTqPvlxBYZlfMReh61AZz+4k1OS26qnq7cCos 2mDxQ+JWnFwu33oC4aKe8wnSvqFj0Jip0eWckBMw= Received: from loki.localnet (unknown [172.16.255.10]) by odin.localnet (Postfix) with ESMTP id B5107D7F571 for ; Mon, 20 Aug 2018 11:27:41 +0200 (CEST) From: Tobias Wolf To: linux-mips@linux-mips.org Subject: [PATCH] MIPS: Fix memory reservation in bootmem_init for certain non-usermem setups Date: Mon, 20 Aug 2018 11:27:39 +0200 Message-ID: <1983860.23LM468bU3@loki> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 65656 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: dev-NTEO@vplace.de Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Commit 67a3ba25aa95 ("MIPS: Fix incorrect mem=X@Y handling") introduced a new issue for rt288x where "PHYS_OFFSET" is 0x0 but the calculated "ramstart" is not. As the prerequisite of custom memory map has been removed, this results in the full memory range of 0x0 - 0x8000000 to be marked as reserved for this platform. This patch adds the originally intended prerequisite again. Signed-off-by: Tobias Wolf --- arch/mips/kernel/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 563188ac6fa2..c3ca55128926 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -371,6 +371,8 @@ static unsigned long __init bootmap_bytes(unsigned long pages) return ALIGN(bytes, sizeof(long)); } +static int usermem __initdata; + static void __init bootmem_init(void) { unsigned long reserved_end; @@ -444,7 +446,7 @@ static void __init bootmem_init(void) /* * Reserve any memory between the start of RAM and PHYS_OFFSET */ - if (ramstart > PHYS_OFFSET) + if (usermem == 0 && ramstart > PHYS_OFFSET) add_memory_region(PHYS_OFFSET, ramstart - PHYS_OFFSET, BOOT_MEM_RESERVED); @@ -654,8 +656,6 @@ static void __init bootmem_init(void) * initialization hook for anything else was introduced. */ -static int usermem __initdata; - static int __init early_parse_mem(char *p) { phys_addr_t start, size; -- 2.18.0