From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66FD3C432C3 for ; Wed, 27 Nov 2019 21:19:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3A9AA2154A for ; Wed, 27 Nov 2019 21:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889540; bh=3DAjZdfgGJhDyTl/Lgq1TVe46KLbVY3g+DqvfFZjYK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1oel/8E8JZZD5fnt1XgqAO0EA0ToKNFMcespLZR3QhHCReCBaW9sj3ZY5GeQdq3G6 kxzUPHvSM3HxJ8ZscUjMH49LqRHWM5y4lVpVbCLM8m6wZwKChgACN+rgvOYsXu7PPG cs8S9OU1DD4lrsjw6SLhX4FeyWBEIqGKZ8Bsc1Ig= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732954AbfK0VS7 (ORCPT ); Wed, 27 Nov 2019 16:18:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:39420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733129AbfK0VLL (ORCPT ); Wed, 27 Nov 2019 16:11:11 -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 6328121789; Wed, 27 Nov 2019 21:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574889070; bh=3DAjZdfgGJhDyTl/Lgq1TVe46KLbVY3g+DqvfFZjYK0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vCa53/QBy4/B0FsbVONYfYUhQA4KzX2F8EtbEGwiTmhyzzuh4zu+znSPgXsejQUCx c3vOv/tHqrkXiwtjXOWNZPam5xn+WbYzywzpzlMdMaJxj+XE/yUOcL/MGzF8pmFGzz UkFFqLu4ROf/pIjso1nCeWgSWiV9jc33YP06eLvM= 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 5.3 45/95] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Date: Wed, 27 Nov 2019 21:32:02 +0100 Message-Id: <20191127202911.769097383@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127202845.651587549@linuxfoundation.org> References: <20191127202845.651587549@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -1197,6 +1197,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) /*