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=-8.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 B13FDC43457 for ; Mon, 12 Oct 2020 11:39:09 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3C9E1206E5 for ; Mon, 12 Oct 2020 11:39:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="bHpviDfK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C9E1206E5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sKmEDjVVu72wuSD9ms+Cx6xCgn9gvSAtXLWPJdbOWws=; b=bHpviDfKv7iIIX/HwJ8FLP+pq F+/CZTQN9vTOOETaxtOym3dbV2CyxtgglC4UVZDVNzAjEzsI3v5XRX0yvqreK18kYQ7uTfaNnjyp/ q4ekf0WdplspqP4jLSQUWfVA0eZqKABJIaEYVftTVTFVz2mL2jvKGRg2W8P5ATOn+I6dPH/C++ftl 73fucNLPkntICBzXFd9Vh0qpN5nPriIU+iXk/IGp3DRAEFBx511y0EqNIQyCC22ky4/GDTRpN8qE4 XcITZlS67aoPp9zRCD6xNJd1et1hyh255U9T7IY1+/rxXkXYdNUpgST1X/pgHGPY0Uqrh1N+qAo8H 41tNy9P0g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRw9O-0000n5-3N; Mon, 12 Oct 2020 11:37:58 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRw9K-0000m5-Ay; Mon, 12 Oct 2020 11:37:55 +0000 Received: from gaia (unknown [95.149.105.49]) (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 196EE206E5; Mon, 12 Oct 2020 11:37:50 +0000 (UTC) Date: Mon, 12 Oct 2020 12:37:48 +0100 From: Catalin Marinas To: Nicolas Saenz Julienne Subject: Re: [PATCH v2 1/5] arm64: mm: Move zone_dma_bits initialization into zone_sizes_init() Message-ID: <20201012113748.GE9844@gaia> References: <20201010151235.20585-1-nsaenzjulienne@suse.de> <20201010151235.20585-2-nsaenzjulienne@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201010151235.20585-2-nsaenzjulienne@suse.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201012_073754_497592_02E9BBD4 X-CRM114-Status: GOOD ( 16.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Will Deacon , linux-kernel@vger.kernel.org, jeremy.linton@arm.com, ardb@kernel.org, iommu@lists.linux-foundation.org, robh+dt@kernel.org, linux-rpi-kernel@lists.infradead.org, robin.murphy@arm.com, hch@lst.de, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sat, Oct 10, 2020 at 05:12:31PM +0200, Nicolas Saenz Julienne wrote: > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > index f6902a2b4ea6..0eca5865dcb1 100644 > --- a/arch/arm64/mm/init.c > +++ b/arch/arm64/mm/init.c > @@ -196,14 +196,16 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max) > unsigned long max_zone_pfns[MAX_NR_ZONES] = {0}; > > #ifdef CONFIG_ZONE_DMA > + zone_dma_bits = ARM64_ZONE_DMA_BITS; > + > if (IS_ENABLED(CONFIG_ACPI)) { > extern unsigned int acpi_iort_get_zone_dma_size(void); > > zone_dma_bits = min(zone_dma_bits, > acpi_iort_get_zone_dma_size()); > - arm64_dma_phys_limit = max_zone_phys(zone_dma_bits); > } > > + arm64_dma_phys_limit = max_zone_phys(zone_dma_bits); > max_zone_pfns[ZONE_DMA] = PFN_DOWN(arm64_dma_phys_limit); > #endif > #ifdef CONFIG_ZONE_DMA32 > @@ -394,11 +396,6 @@ void __init arm64_memblock_init(void) > > early_init_fdt_scan_reserved_mem(); > > - if (IS_ENABLED(CONFIG_ZONE_DMA)) { > - zone_dma_bits = ARM64_ZONE_DMA_BITS; > - arm64_dma_phys_limit = max_zone_phys(ARM64_ZONE_DMA_BITS); > - } arm64_dma_phys_limit is used by memblock_alloc_low() (via ARCH_LOW_ADDRESS_LIMIT). I think it's too late to leave its initialisation to zone_sizes_init(). -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel