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=-11.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 DD0B7C433E6 for ; Fri, 28 Aug 2020 16:15:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BD9A320737 for ; Fri, 28 Aug 2020 16:15:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598631336; bh=WDy36I6Z4orTZPoGujoAX7lI0c2B80UVvjLy+uuLcNA=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=gPcDGWKOaI5jL/qEQxspTasg3FjnQ0rj1g8IE+faMA6F1EZcAERvkptrC0NgaGWM7 pacvWhpzk8ItR0mdIHzkGS6TXCGMekGnzhkGH6py3vyVs2ebRDYOTHfjKDx2bhzC2t yJTvSnOdr9ezvGgCSUpvHhQqOCEyB27VwI7381NM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725814AbgH1QPf (ORCPT ); Fri, 28 Aug 2020 12:15:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:57898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726197AbgH1QPZ (ORCPT ); Fri, 28 Aug 2020 12:15:25 -0400 Received: from localhost (104.sub-72-107-126.myvzw.com [72.107.126.104]) (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 B7DFA208D5; Fri, 28 Aug 2020 16:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598631325; bh=WDy36I6Z4orTZPoGujoAX7lI0c2B80UVvjLy+uuLcNA=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=XXzEkWMbwa7hJsKl3WWxYs9ZIzvl4XBfLjgS8Mijz+ElFIFxllHByPMzK3VHEqITH 1D4I/umOYAh/U5wOHQaoIwJATfekh83VfUHN8EJZaCCfchYknTM4ZCIMFUd0DL6dnq F9ieOAP4skNybw+ZwBfOKkffDedrwcNXg5u8hBDU= Date: Fri, 28 Aug 2020 11:15:23 -0500 From: Bjorn Helgaas To: Jonathan Cameron Cc: Atish Patra , linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Catalin Marinas , Zong Li , linux-riscv@lists.infradead.org, Will Deacon , linux-arch@vger.kernel.org, Rob Herring , Lorenzo Pieralisi , Ganapatrao Kulkarni , Steven Price , Greentime Hu , Albert Ou , Arnd Bergmann , Anshuman Khandual , Paul Walmsley , linux-arm-kernel@lists.infradead.org, Nick Hu , Greg Kroah-Hartman , Anup Patel , Palmer Dabbelt , Andrew Morton , Mike Rapoport , Bjorn Helgaas , linux-pci@vger.kernel.org Subject: Re: [RFC/RFT PATCH 3/6] arm64, numa: Move pcibus_to_node definition to generic numa code Message-ID: <20200828161523.GA2158345@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200828104830.000007bf@Huawei.com> Sender: linux-arch-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org On Fri, Aug 28, 2020 at 10:48:30AM +0100, Jonathan Cameron wrote: > On Fri, 14 Aug 2020 14:47:22 -0700 > Atish Patra wrote: > > > pcibus_to_node is used only when numa is enabled and does not depend > > on ISA. Thus, it can be moved the generic numa implementation. > > > > Signed-off-by: Atish Patra > > From a more general unification point of view, there seem to > be two ways architectures implement this. > Either > > bus->sysdata.node > > Or as here. > There are weird other options, but let us ignore those :) > > That is going to take a bit of unwinding should we > want to take this unification further and perhaps we want to think > about doing this in pci generic code rather than here? > > Perhaps this is one we are better keeping architecture specific for > now? > > +CC Bjorn and Linux-pci > > > > --- > > arch/arm64/kernel/pci.c | 10 ---------- > > drivers/base/arch_numa.c | 11 +++++++++++ > > 2 files changed, 11 insertions(+), 10 deletions(-) > > > > diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c > > index 1006ed2d7c60..07c122946c11 100644 > > --- a/arch/arm64/kernel/pci.c > > +++ b/arch/arm64/kernel/pci.c > > @@ -54,16 +54,6 @@ int raw_pci_write(unsigned int domain, unsigned int bus, > > return b->ops->write(b, devfn, reg, len, val); > > } > > > > -#ifdef CONFIG_NUMA > > - > > -int pcibus_to_node(struct pci_bus *bus) > > -{ > > - return dev_to_node(&bus->dev); > > -} > > -EXPORT_SYMBOL(pcibus_to_node); > > - > > -#endif > > - > > #ifdef CONFIG_ACPI > > > > struct acpi_pci_generic_root_info { > > diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c > > index 83341c807240..4ab1b20a615d 100644 > > --- a/drivers/base/arch_numa.c > > +++ b/drivers/base/arch_numa.c > > @@ -11,6 +11,7 @@ > > #include > > #include > > #include > > +#include > > #include > > > > #ifdef CONFIG_ARM64 > > @@ -60,6 +61,16 @@ EXPORT_SYMBOL(cpumask_of_node); > > > > #endif > > > > +#ifdef CONFIG_PCI > > + > > +int pcibus_to_node(struct pci_bus *bus) > > +{ > > + return dev_to_node(&bus->dev); > > +} > > +EXPORT_SYMBOL(pcibus_to_node); > > + > > +#endif I certainly agree that this should not be arch-specific, but I'm not really in favor of adding this PCI gunk in drivers/base. I think we can do better (eventually) by getting rid of pcibus_to_node() completely. It's not used very much except by cpumask_of_pcibus(), which itself is hardly used at all. > > static void numa_update_cpu(unsigned int cpu, bool remove) > > { > > int nid = cpu_to_node(cpu); > >