Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5999657ybc; Wed, 27 Nov 2019 13:10:07 -0800 (PST) X-Google-Smtp-Source: APXvYqyb6To4Yqtk2yLT4AZX43GWBU831bKsuNYrtEFrqmkAI4UhLR/MAijxLo4YjkxTUaW9e+Jx X-Received: by 2002:a17:906:5ac2:: with SMTP id x2mr8637694ejs.29.1574889007549; Wed, 27 Nov 2019 13:10:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574889007; cv=none; d=google.com; s=arc-20160816; b=u09x5ERcO7/6Qe6hhCgaEpmkcUPSTtxEOM+8LmQAGVDD3QWw4G8XSqenl7aiJ9/KVJ yr3v6XXJzZt1kFcX51R1ueOHqfrS2bZfkBLyW8RYyQiGwxxor/V9BrkF+Ky4pI0Pgwpx 0FbOAps4NAf1dMBp8li7ydh3ioNPqX49BQdxCwIg4+7MmNsPFI+D5JTj/PLguiL96xn6 2Pkk5wCpgDcUuUSm0tNAtt6l5g8fMD3zcxmMDLQ4MCKNhFLZtE0yKraJs3zkEq8bfQGo 5sTIVeFQZrUtImipwPAHD6DEXh1HP0S6ozcI7UPBIwIWt8tvIWe8ewAfRk7ahKURgOXj cBVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fqE6Ct1FW/tSVRQhBVI8xinlEr/6pBCCij++RTJssqg=; b=RqMH72skggSkRxMui2mw3rGAJL6Uq8CGxii1SmrqUE6BWJV1+rbDR35s8c6OzZ5ce6 HoCIpPPOEUEkiYAXHUqRVA7BJo3Yrck3Nhz5DTPuVHy2uDnDaxLr9m3GehDZOYL//MsR aNKS/CZ30YlG6mBp9w/Lw9OKKj8Cc7Z+GPjoofBcgHxfoGQ/M19tHaSOXmo938jVhidf WY7daznxVw8+YVBYEgzVQorb9ZzWHJk59uiAHLqF3yRhC60+bsElVcIiAcKZGad5YG4i omzDMJJGKsalxIkqDOgCUTjnChmLjxMSAFvMWoWq7GwTILeCAMlNeebKEPyW2qIsLyB5 5dFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w31VnYdW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a2si10627722ejb.257.2019.11.27.13.09.43; Wed, 27 Nov 2019 13:10:07 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=w31VnYdW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732417AbfK0VGY (ORCPT + 99 others); Wed, 27 Nov 2019 16:06:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:60372 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732402AbfK0VGU (ORCPT ); Wed, 27 Nov 2019 16:06:20 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8A8582178F; Wed, 27 Nov 2019 21:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574888780; bh=lRPt9jymUbXWKctZ9s1aVDzxhXEFT0cUHXoT8XZU/sU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=w31VnYdWFSURIMpc+qVGMqqJw4RK7dX1rHfH0g73ZxTnFtrpkyBsP2xUi6Sg11Sqy 5tQ5sDsNLaNA4PZs8cv8CdJ3il8YaLZdwq++bM79+P+spRQiVB9jNI+7Xcl5oGAnUT XOqicMsmZSbU7p/+crE/xd00nC/c9eAyKLetYEF4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chester Lin , Mike Rapoport , Russell King , Lee Jones Subject: [PATCH 4.19 265/306] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Date: Wed, 27 Nov 2019 21:31:55 +0100 Message-Id: <20191127203134.194537142@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203114.766709977@linuxfoundation.org> References: <20191127203114.766709977@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chester Lin commit 1d31999cf04c21709f72ceb17e65b54a401330da upstream. adjust_lowmem_bounds() checks every memblocks in order to find the boundary between lowmem and highmem. However some memblocks could be marked as NOMAP so they are not used by kernel, which should be skipped while calculating the boundary. Signed-off-by: Chester Lin Reviewed-by: Mike Rapoport Signed-off-by: Russell King Signed-off-by: Lee Jones Signed-off-by: Greg Kroah-Hartman --- arch/arm/mm/mmu.c | 3 +++ 1 file changed, 3 insertions(+) --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1195,6 +1195,9 @@ void __init adjust_lowmem_bounds(void) phys_addr_t block_start = reg->base; phys_addr_t block_end = reg->base + reg->size; + if (memblock_is_nomap(reg)) + continue; + if (reg->base < vmalloc_limit) { if (block_end > lowmem_limit) /*