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=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 3AB0AC43463 for ; Mon, 21 Sep 2020 08:12:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FBD520EDD for ; Mon, 21 Sep 2020 08:12:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726559AbgIUIMd (ORCPT ); Mon, 21 Sep 2020 04:12:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:57466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726334AbgIUIMc (ORCPT ); Mon, 21 Sep 2020 04:12:32 -0400 Received: from gaia (unknown [31.124.44.166]) (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 5BE232085B; Mon, 21 Sep 2020 08:12:31 +0000 (UTC) Date: Mon, 21 Sep 2020 09:12:28 +0100 From: Catalin Marinas To: Stephen Rothwell Cc: Andrew Morton , Will Deacon , Mike Rapoport , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the akpm-current tree with the arm64 tree Message-ID: <20200921081228.GA13882@gaia> References: <20200921180353.421484e8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200921180353.421484e8@canb.auug.org.au> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 21, 2020 at 06:03:53PM +1000, Stephen Rothwell wrote: > diff --cc arch/arm64/mm/mmu.c > index 087a844b4d26,64211436629d..000000000000 > --- a/arch/arm64/mm/mmu.c > +++ b/arch/arm64/mm/mmu.c > @@@ -493,21 -483,10 +494,15 @@@ static void __init map_mem(pgd_t *pgdp > #endif > > /* map all the memory banks */ > - for_each_memblock(memory, reg) { > - phys_addr_t start = reg->base; > - phys_addr_t end = start + reg->size; > - > + for_each_mem_range(i, &start, &end) { > if (start >= end) > break; > - if (memblock_is_nomap(reg)) > - continue; > - > - __map_memblock(pgdp, start, end, PAGE_KERNEL, flags); > + /* > + * The linear map must allow allocation tags reading/writing > + * if MTE is present. Otherwise, it has the same attributes as > + * PAGE_KERNEL. > + */ > + __map_memblock(pgdp, start, end, PAGE_KERNEL_TAGGED, flags); > } It looks fine. Thanks Stephen. -- Catalin