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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_RED 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 D8AE7C433DB for ; Sun, 7 Mar 2021 15:25:57 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6011465114 for ; Sun, 7 Mar 2021 15:25:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6011465114 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AA5966B0074; Sun, 7 Mar 2021 10:25:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A54456B0075; Sun, 7 Mar 2021 10:25:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F4A26B0078; Sun, 7 Mar 2021 10:25:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0170.hostedemail.com [216.40.44.170]) by kanga.kvack.org (Postfix) with ESMTP id 709F46B0074 for ; Sun, 7 Mar 2021 10:25:56 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 2C2BB18035425 for ; Sun, 7 Mar 2021 15:25:56 +0000 (UTC) X-FDA: 77893453512.06.9C5E370 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf04.hostedemail.com (Postfix) with ESMTP id DACB5132 for ; Sun, 7 Mar 2021 15:25:54 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 13A2565106; Sun, 7 Mar 2021 15:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615130754; bh=wtrL4fjAG4kiDEurlTA9//RwCwfz7N27etvauyhLrSE=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=TFf55ZVteoOds9uZYd0W+DGXTIyd1t6BsCrAR8SUDoST/7JYrMWXenG7cxiud7l6K hM1oiD9s9T7GRPnMdGpeKOZ3uLw8pg/0m2zjFS0gJtkxTDpHoLLjd0QjK7dpvswVP4 1fJ79n2V9fVaeFVr3NnwAB6AYnJuHGa/sShewA/8= Subject: Patch "arm64: mm: Move zone_dma_bits initialization into zone_sizes_init()" has been added to the 5.10-stable tree To: akpm@linux-foundation.org,anshuman.khandual@arm.com,aou@eecs.berkeley.edu,ardb@kernel.org,bhelgaas@google.com,catalin.marinas@arm.com,frowand.list@gmail.com,gregkh@linuxfoundation.org,guohanjun@huawei.com,guro@fb.com,jeremy.linton@arm.com,jingxiangfeng@huawei.com,lenb@kernel.org,linux-arm-kernel@lists.infradead.org,linux-mm@kvack.org,linux-riscv@lists.infradead.org,lorenzo.pieralisi@arm.com,nsaenzjulienne@suse.de,palmer@dabbelt.com,paul.walmsley@sifive.com,rjw@rjwysocki.net,robh+dt@kernel.org,rppt@kernel.org,song.bao.hua@hisilicon.com,sudeep.holla@arm.com,wangkefeng.wang@huawei.com,will@kernel.org Cc: From: Date: Sun, 07 Mar 2021 16:25:44 +0100 In-Reply-To: <20210303073319.2215839-3-jingxiangfeng@huawei.com> Message-ID: <1615130744227221@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 X-stable: commit X-Patchwork-Hint: ignore X-Stat-Signature: gycponnxzuocaqq48mi83tb3eawhbnpm X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: DACB5132 Received-SPF: none (linuxfoundation.org>: No applicable sender policy available) receiver=imf04; identity=mailfrom; envelope-from=""; helo=mail.kernel.org; client-ip=198.145.29.99 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1615130754-851070 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This is a note to let you know that I've just added the patch titled arm64: mm: Move zone_dma_bits initialization into zone_sizes_init() to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=3Dlinux/kernel/git/stable/stable-queue.g= it;a=3Dsummary The filename of the patch is: arm64-mm-move-zone_dma_bits-initialization-into-zone_sizes_init.patc= h and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Sun Mar 7 04:22:37 PM CET 2021 From: Jing Xiangfeng Date: Wed, 3 Mar 2021 15:33:14 +0800 Subject: arm64: mm: Move zone_dma_bits initialization into zone_sizes_ini= t() To: , , , , , , , , , , , , , , , , , , , Cc: , , , , , , , , , Jeremy Linton Message-ID: <20210303073319.2215839-3-jingxiangfeng@huawei.com> From: Nicolas Saenz Julienne commit 9804f8c69b04a39d0ba41d19e6bdc6aa91c19725 upstream zone_dma_bits's initialization happens earlier that it's actually needed, in arm64_memblock_init(). So move it into the more suitable zone_sizes_init(). Signed-off-by: Nicolas Saenz Julienne Tested-by: Jeremy Linton Link: https://lore.kernel.org/r/20201119175400.9995-3-nsaenzjulienne@suse= .de Signed-off-by: Catalin Marinas Cc: Signed-off-by: Jing Xiangfeng Signed-off-by: Greg Kroah-Hartman --- arch/arm64/mm/init.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -190,6 +190,8 @@ static void __init zone_sizes_init(unsig unsigned long max_zone_pfns[MAX_NR_ZONES] =3D {0}; =20 #ifdef CONFIG_ZONE_DMA + zone_dma_bits =3D ARM64_ZONE_DMA_BITS; + arm64_dma_phys_limit =3D max_zone_phys(zone_dma_bits); max_zone_pfns[ZONE_DMA] =3D PFN_DOWN(arm64_dma_phys_limit); #endif #ifdef CONFIG_ZONE_DMA32 @@ -376,11 +378,6 @@ void __init arm64_memblock_init(void) =20 early_init_fdt_scan_reserved_mem(); =20 - if (IS_ENABLED(CONFIG_ZONE_DMA)) { - zone_dma_bits =3D ARM64_ZONE_DMA_BITS; - arm64_dma_phys_limit =3D max_zone_phys(ARM64_ZONE_DMA_BITS); - } - if (IS_ENABLED(CONFIG_ZONE_DMA32)) arm64_dma32_phys_limit =3D max_zone_phys(32); else Patches currently in stable-queue which might be from jingxiangfeng@huawe= i.com are queue-5.10/of-unittest-add-test-for-of_dma_get_max_cpu_address.patch queue-5.10/mm-remove-examples-from-enum-zone_type-comment.patch queue-5.10/arm64-mm-set-zone_dma-size-based-on-devicetree-s-dma-ranges.pa= tch queue-5.10/of-address-introduce-of_dma_get_max_cpu_address.patch queue-5.10/arm64-mm-move-zone_dma_bits-initialization-into-zone_sizes_ini= t.patch queue-5.10/arm64-mm-set-zone_dma-size-based-on-early-iort-scan.patch queue-5.10/arm64-mm-move-reserve_crashkernel-into-mem_init.patch