From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3839977-1516715906-2-6678594273386400856 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='UNK' X-Spam-charsets: plain='utf-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516715905; b=EKP8uwwIVa5PejoE5fGtv/V12JjlNkjimOowEwnUF6+HfQe 3QrC2YbzU5H+eKT1IexY7rBvhJ55yEsHxAFvEyAYPNviR7tBr1CPf7T6tZFJFSTX EBndeD+d/2IPL1jJTvPSHupTPGGAxaL+tQa6xyuTnoTHRrjM17qKqyYodFGZz0Bu UTUdV0NuM+/UYlcH8d5riPun7g/wz+BIBx+5koI/rg20o9jpsYjcTzAZvh9NYsh+ yXVFlz/mt9NUQQze5gjPFa9Kh9Iv5X7Hd0gaQG1eMcZNaClcOcwty8tcx+z6658N 977yuqUwqCnOl+c2YoQUEl/CLeYXpNJ+DxaSQww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=subject:to:cc:references:from:message-id :date:mime-version:in-reply-to:content-type :content-transfer-encoding:sender:list-id; s=arctest; t= 1516715905; bh=uriyBFVH+0hCEJS7Hk9oRaMharEuga3AJp083i4IQYk=; b=p k4qaIJkzjLUTfPdrD7OObfZIkrfsybn4NLRyWK/oeOfhYABAcrwxIVJSOByG04w1 H1caFQZQoPb2a/C0DVqLHoCNE3hEaJmb8Qvo3VJFNQb06dcX5WBv8KkUCtxWD0C3 uaUeoL8WFqvqs6u69kMXK+D7I86qXe+btFlodnSI9DnXeUB2pdqLTpdmb10U0ev6 OZyyaTvWyVC2DotjoWuw1f+r0EOUJCL/Z0kxW+7SG5EMarcxgfXw4NhreE46sTcb UxzlHfsPb1RqICKIMAcN4clDqyT0zEyJhQemsg6uUbbxI9dRPVfVi1vi4ZR1d6w6 +YWteXJ192DEl1dj3myjQ== ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=mips.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=mips.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=mips.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=mips.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751785AbeAWN6X (ORCPT ); Tue, 23 Jan 2018 08:58:23 -0500 Received: from 9pmail.ess.barracuda.com ([64.235.154.210]:44769 "EHLO 9pmail.ess.barracuda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668AbeAWN6W (ORCPT ); Tue, 23 Jan 2018 08:58:22 -0500 Subject: Re: [PATCH v2] MIPS: fix incorrect mem=X@Y handling To: Mathieu Malaterre , James Hogan CC: Marcin Nowakowski , "# v4 . 11" , Ralf Baechle , , References: <1504609608-7694-1-git-send-email-marcin.nowakowski@imgtec.com> <20171221210100.12002-1-malat@debian.org> From: Matt Redfearn Message-ID: <9e00cd68-ff9a-37e1-3e38-f0e58ae4a400@mips.com> Date: Tue, 23 Jan 2018 13:58:06 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171221210100.12002-1-malat@debian.org> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.150.130.83] X-BESS-ID: 1516715889-321458-4594-39390-1 X-BESS-VER: 2017.17-r1801171719 X-BESS-Apparent-Source-IP: 12.201.5.28 X-BESS-Outbound-Spam-Score: 0.20 X-BESS-Outbound-Spam-Report: Code version 3.2, rules version 3.2.2.189273 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------- 0.00 BSF_BESS_OUTBOUND META: BESS Outbound 0.20 PR0N_SUBJECT META: Subject has letters around special characters (pr0n) X-BESS-Outbound-Spam-Status: SCORE=0.20 using account:ESS59374 scores of KILL_LEVEL=7.0 tests=BSF_BESS_OUTBOUND, PR0N_SUBJECT X-BESS-BRTS-Status: 1 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Hi On 21/12/17 21:00, Mathieu Malaterre wrote: > From: Marcin Nowakowski > > Change 73fbc1eba7ff added a fix to ensure that the memory range between > PHYS_OFFSET and low memory address specified by mem= cmdline argument is > not later processed by free_all_bootmem. > This change was incorrect for systems where the commandline specifies > more than 1 mem argument, as it will cause all memory between > PHYS_OFFSET and each of the memory offsets to be marked as reserved, > which results in parts of the RAM marked as reserved (Creator CI20's > u-boot has a default commandline argument 'mem=256M@0x0 > mem=768M@0x30000000'). > > Change the behaviour to ensure that only the range between PHYS_OFFSET > and the lowest start address of the memories is marked as protected. > > This change also ensures that the range is marked protected even if it's > only defined through the devicetree and not only via commandline > arguments. > > Reported-by: Mathieu Malaterre > Signed-off-by: Marcin Nowakowski > Fixes: 73fbc1eba7ff ("MIPS: fix mem=X@Y commandline processing") > Cc: # v4.11 Tested on: Creator Ci20 Creator Ci40 MIPS Boston UTM8 (Cavium Octeon III) It certainly fixes the ci20 when it's factory default command line args of "mem=256M@0x0 mem=768M@0x30000000" are passed. Though those arguments appear redundant since without them both memory regions are detected through device tree instead, and there is no problem. Tested-by: Matt Redfearn > --- > v2: Use updated email adress, add tag for stable. > arch/mips/kernel/setup.c | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c > index 702c678de116..f19d61224c71 100644 > --- a/arch/mips/kernel/setup.c > +++ b/arch/mips/kernel/setup.c > @@ -375,6 +375,7 @@ static void __init bootmem_init(void) > unsigned long reserved_end; > unsigned long mapstart = ~0UL; > unsigned long bootmap_size; > + phys_addr_t ramstart = ~0UL; > bool bootmap_valid = false; > int i; > > @@ -395,6 +396,21 @@ static void __init bootmem_init(void) > max_low_pfn = 0; > > /* > + * Reserve any memory between the start of RAM and PHYS_OFFSET > + */ > + for (i = 0; i < boot_mem_map.nr_map; i++) { > + if (boot_mem_map.map[i].type != BOOT_MEM_RAM) > + continue; > + > + ramstart = min(ramstart, boot_mem_map.map[i].addr); > + } > + > + if (ramstart > PHYS_OFFSET) > + add_memory_region(PHYS_OFFSET, ramstart - PHYS_OFFSET, > + BOOT_MEM_RESERVED); > + > + > + /* > * Find the highest page frame number we have available. > */ > for (i = 0; i < boot_mem_map.nr_map; i++) { > @@ -664,9 +680,6 @@ static int __init early_parse_mem(char *p) > > add_memory_region(start, size, BOOT_MEM_RAM); > > - if (start && start > PHYS_OFFSET) > - add_memory_region(PHYS_OFFSET, start - PHYS_OFFSET, > - BOOT_MEM_RESERVED); > return 0; > } > early_param("mem", early_parse_mem); >