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, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 9E411C4727E for ; Thu, 1 Oct 2020 17:23:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4A929208B6 for ; Thu, 1 Oct 2020 17:23:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A929208B6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7C15A900007; Thu, 1 Oct 2020 13:23:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74AB5900003; Thu, 1 Oct 2020 13:23:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61149900007; Thu, 1 Oct 2020 13:23:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0122.hostedemail.com [216.40.44.122]) by kanga.kvack.org (Postfix) with ESMTP id 322D6900003 for ; Thu, 1 Oct 2020 13:23:27 -0400 (EDT) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id CBCBA8249980 for ; Thu, 1 Oct 2020 17:23:26 +0000 (UTC) X-FDA: 77324028012.10.turn57_0b03c6c2719d Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 9E99516A4A4 for ; Thu, 1 Oct 2020 17:23:26 +0000 (UTC) X-HE-Tag: turn57_0b03c6c2719d X-Filterd-Recvd-Size: 2593 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Thu, 1 Oct 2020 17:23:26 +0000 (UTC) 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 78DA72085B; Thu, 1 Oct 2020 17:23:23 +0000 (UTC) Date: Thu, 1 Oct 2020 18:23:21 +0100 From: Catalin Marinas To: Nicolas Saenz Julienne Cc: devicetree@vger.kernel.org, will@kernel.org, Frank Rowand , linux-kernel@vger.kernel.org, linux-mm@kvack.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 Subject: Re: [PATCH 1/4] of/fdt: Update zone_dma_bits when running in bcm2711 Message-ID: <20201001172320.GQ21544@gaia> References: <20201001161740.29064-1-nsaenzjulienne@suse.de> <20201001161740.29064-2-nsaenzjulienne@suse.de> <20201001171500.GN21544@gaia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201001171500.GN21544@gaia> User-Agent: Mutt/1.10.1 (2018-07-13) 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: On Thu, Oct 01, 2020 at 06:15:01PM +0100, Catalin Marinas wrote: > Hi Nicolas, > > Thanks for putting this together. > > On Thu, Oct 01, 2020 at 06:17:37PM +0200, Nicolas Saenz Julienne wrote: > > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > > index 4602e467ca8b..cd0d115ef329 100644 > > --- a/drivers/of/fdt.c > > +++ b/drivers/of/fdt.c > > @@ -25,6 +25,7 @@ > > #include > > #include > > #include > > +#include /* for zone_dma_bits */ > > > > #include /* for COMMAND_LINE_SIZE */ > > #include > > @@ -1198,6 +1199,14 @@ void __init early_init_dt_scan_nodes(void) > > of_scan_flat_dt(early_init_dt_scan_memory, NULL); > > } > > > > +void __init early_init_dt_update_zone_dma_bits(void) > > +{ > > + unsigned long dt_root = of_get_flat_dt_root(); > > + > > + if (of_flat_dt_is_compatible(dt_root, "brcm,bcm2711")) > > + zone_dma_bits = 30; > > +} > > I think we could keep this entirely in the arm64 setup_machine_fdt() and > not pollute the core code with RPi4-specific code. Actually, even better, could we not move the check to arm64_memblock_init() when we initialise zone_dma_bits? -- Catalin