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=-2.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 CA830C4360D for ; Sun, 8 Sep 2019 21:27:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 98DA5216C8 for ; Sun, 8 Sep 2019 21:27:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="is1P3yhG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98DA5216C8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=NDzcmEENtHb6z8ID7sJq+6KGOpmNDQwTS5ixkfTiICU=; b=is1P3yhGBmtBkB WFZTRAUCT4FVXofOpfmtCp2zLfcB0VEyqHRHgXv0qnKm4cj514vdMjslJAnmsQ+d7ndpMB7Z5lR4O uo17kPrBrgEsBYgrqe7ddLSEvMJhDbPCDwSqx1z2COZxBLiGOSQeOhPQoznvpIR/j3YkX0MfW9L/y G7stfUctFga28s2/zQW+1Dt4aaGAgvFty9+5AKqaW98R32l2MXthIGE+7JoKvXqK+3W8IJX0rKDeZ 5tvF6CJ73OsaXmjV6Ekd2dICT/QKAPyIKg7pXaM+8lS0D+bvDfH/kYmqtj9f6eXqp6P6XP13+XDXy nSQby9mJ9s2G10orWQXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i74iY-0005Yd-61; Sun, 08 Sep 2019 21:27:30 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i74iR-0005Sj-42; Sun, 08 Sep 2019 21:27:24 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C23C2337; Sun, 8 Sep 2019 14:27:16 -0700 (PDT) Received: from huawei_p9_lite.cambridge.arm.com (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id AC4243F67D; Sun, 8 Sep 2019 14:27:13 -0700 (PDT) Date: Sun, 8 Sep 2019 22:27:11 +0100 From: Catalin Marinas To: Nicolas Saenz Julienne Subject: Re: [PATCH v4 3/4] arm64: use both ZONE_DMA and ZONE_DMA32 Message-ID: <20190908212711.GA84759@huawei_p9_lite.cambridge.arm.com> References: <20190906120617.18836-1-nsaenzjulienne@suse.de> <20190906120617.18836-4-nsaenzjulienne@suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190906120617.18836-4-nsaenzjulienne@suse.de> User-Agent: Mutt/1.12.1 (2019-06-15) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190908_142723_209774_FA5CEC08 X-CRM114-Status: GOOD ( 11.49 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: f.fainelli@gmail.com, mbrugger@suse.com, marc.zyngier@arm.com, robin.murphy@arm.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, robh+dt@kernel.org, wahrenst@gmx.net, m.szyprowski@samsung.com, linux-riscv@lists.infradead.org, phill@raspberrypi.org, Will Deacon , hch@lst.de, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org On Fri, Sep 06, 2019 at 02:06:14PM +0200, Nicolas Saenz Julienne wrote: > @@ -430,7 +454,7 @@ void __init arm64_memblock_init(void) > > high_memory = __va(memblock_end_of_DRAM() - 1) + 1; > > - dma_contiguous_reserve(arm64_dma32_phys_limit); > + dma_contiguous_reserve(arm64_dma_phys_limit ? : arm64_dma32_phys_limit); > } > > void __init bootmem_init(void) > @@ -534,6 +558,7 @@ static void __init free_unused_memmap(void) > void __init mem_init(void) > { > if (swiotlb_force == SWIOTLB_FORCE || > + max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT) || > max_pfn > (arm64_dma32_phys_limit >> PAGE_SHIFT)) > swiotlb_init(1); So here we want to initialise the swiotlb only if we need bounce buffers. Prior to this patch, we assumed that swiotlb is needed if max_pfn is beyond the reach of 32-bit devices. With ZONE_DMA, we need to lower this limit to arm64_dma_phys_limit. If ZONE_DMA is enabled, just comparing max_pfn with arm64_dma_phys_limit is sufficient since the dma32 one limit always higher. However, if ZONE_DMA is disabled, arm64_dma_phys_limit is 0, so we may initialise swiotlb unnecessarily. I guess you need a similar check to the dma_contiguous_reserve() above. With that: Reviewed-by: Catalin Marinas Unless there are other objections, I can queue this series for 5.5 in a few weeks time (too late for 5.4). -- Catalin _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv