From: Atish Patra <atishp@atishpatra.org>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: Atish Patra <atish.patra@wdc.com>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
David Hildenbrand <david@redhat.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Zong Li <zong.li@sifive.com>,
linux-riscv <linux-riscv@lists.infradead.org>,
Will Deacon <will@kernel.org>,
linux-arch@vger.kernel.org,
Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>,
Jia He <justin.he@arm.com>, Anup Patel <anup@brainfault.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Steven Price <steven.price@arm.com>,
Greentime Hu <greentime.hu@sifive.com>,
Albert Ou <aou@eecs.berkeley.edu>, Arnd Bergmann <arnd@arndb.de>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"linux-kernel@vger.kernel.org List"
<linux-kernel@vger.kernel.org>,
Palmer Dabbelt <palmer@dabbelt.com>,
Mike Rapoport <rppt@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: Re: [PATCH v4 2/5] arm64, numa: Change the numa init functions name to be generic
Date: Fri, 6 Nov 2020 09:33:14 -0800 [thread overview]
Message-ID: <CAOnJCUJo795yX_7am0hdB_JFio3_ZBRHioHNcydhqEouCUynUg@mail.gmail.com> (raw)
In-Reply-To: <20201106171403.GK29329@gaia>
On Fri, Nov 6, 2020 at 9:14 AM Catalin Marinas <catalin.marinas@arm.com> wrote:
>
> On Mon, Oct 05, 2020 at 05:17:49PM -0700, Atish Patra wrote:
> > diff --git a/arch/arm64/kernel/acpi_numa.c b/arch/arm64/kernel/acpi_numa.c
> > index 7ff800045434..96502ff92af5 100644
> > --- a/arch/arm64/kernel/acpi_numa.c
> > +++ b/arch/arm64/kernel/acpi_numa.c
> > @@ -117,16 +117,3 @@ void __init acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa)
> >
> > node_set(node, numa_nodes_parsed);
> > }
> > -
> > -int __init arm64_acpi_numa_init(void)
> > -{
> > - int ret;
> > -
> > - ret = acpi_numa_init();
> > - if (ret) {
> > - pr_info("Failed to initialise from firmware\n");
> > - return ret;
> > - }
> > -
> > - return srat_disabled() ? -EINVAL : 0;
> > -}
>
> I think it's better if arm64_acpi_numa_init() and arm64_numa_init()
> remained in the arm64 code. It's not really much code to be shared.
>
RISC-V will probably support ACPI one day. The idea is to not to do
exercise again in future.
Moreover, there will be arch_numa_init which will be used by RISC-V
and there will be arm64_numa_init
used by arm64. However, if you feel strongly about it, I am happy to
move back those two functions to arm64.
In case, we decide to go that route, can we define arm64_numa_init in
mm/init.c ?
Defining numa.c just for arm64_numa_init in arm64 may be an overkill.
> > diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c
> > index 73f8b49d485c..74b4f2ddad70 100644
> > --- a/drivers/base/arch_numa.c
> > +++ b/drivers/base/arch_numa.c
> > @@ -13,7 +13,6 @@
> > #include <linux/module.h>
> > #include <linux/of.h>
> >
> > -#include <asm/acpi.h>
> > #include <asm/sections.h>
> >
> > struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
> > @@ -444,16 +443,37 @@ static int __init dummy_numa_init(void)
> > return 0;
> > }
> >
> > +#ifdef CONFIG_ACPI_NUMA
> > +static int __init arch_acpi_numa_init(void)
> > +{
> > + int ret;
> > +
> > + ret = acpi_numa_init();
> > + if (ret) {
> > + pr_info("Failed to initialise from firmware\n");
> > + return ret;
> > + }
> > +
> > + return srat_disabled() ? -EINVAL : 0;
> > +}
> > +#else
> > +static int __init arch_acpi_numa_init(void)
> > +{
> > + return -EOPNOTSUPP;
> > +}
> > +
> > +#endif
> > +
> > /**
> > - * arm64_numa_init() - Initialize NUMA
> > + * arch_numa_init() - Initialize NUMA
> > *
> > * Try each configured NUMA initialization method until one succeeds. The
> > - * last fallback is dummy single node config encomapssing whole memory.
> > + * last fallback is dummy single node config encompassing whole memory.
> > */
> > -void __init arm64_numa_init(void)
> > +void __init arch_numa_init(void)
> > {
> > if (!numa_off) {
> > - if (!acpi_disabled && !numa_init(arm64_acpi_numa_init))
> > + if (!acpi_disabled && !numa_init(arch_acpi_numa_init))
> > return;
> > if (acpi_disabled && !numa_init(of_numa_init))
> > return;
>
> Does riscv even have an acpi_disabled variable?
>
It is defined in "include/linux/acpi.h" which is included in arch_numa.c
> --
> Catalin
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
--
Regards,
Atish
next prev parent reply other threads:[~2020-11-06 17:33 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 0:17 [PATCH v4 0/5] Unify NUMA implementation between ARM64 & RISC-V Atish Patra
2020-10-06 0:17 ` [PATCH v4 1/5] numa: Move numa implementation to common code Atish Patra
2020-10-06 0:17 ` [PATCH v4 2/5] arm64, numa: Change the numa init functions name to be generic Atish Patra
2020-11-06 17:14 ` Catalin Marinas
2020-11-06 17:33 ` Atish Patra [this message]
2020-11-06 19:08 ` Catalin Marinas
2020-11-07 0:53 ` Atish Patra
2020-10-06 0:17 ` [PATCH v4 3/5] riscv: Separate memory init from paging init Atish Patra
2020-10-22 5:37 ` Anup Patel
2020-11-05 17:34 ` Palmer Dabbelt
2020-10-06 0:17 ` [PATCH v4 4/5] riscv: Add support pte_protnone and pmd_protnone if CONFIG_NUMA_BALANCING Atish Patra
2020-10-22 5:38 ` Anup Patel
2020-11-05 17:34 ` Palmer Dabbelt
2020-10-06 0:17 ` [PATCH v4 5/5] riscv: Add numa support for riscv64 platform Atish Patra
2020-10-22 5:40 ` Anup Patel
2020-11-05 17:34 ` Palmer Dabbelt
2020-10-13 20:19 ` [PATCH v4 0/5] Unify NUMA implementation between ARM64 & RISC-V Atish Patra
2020-10-19 21:29 ` Palmer Dabbelt
2020-11-05 18:07 ` Palmer Dabbelt
2020-11-06 17:18 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOnJCUJo795yX_7am0hdB_JFio3_ZBRHioHNcydhqEouCUynUg@mail.gmail.com \
--to=atishp@atishpatra.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=anup@brainfault.org \
--cc=aou@eecs.berkeley.edu \
--cc=arnd@arndb.de \
--cc=atish.patra@wdc.com \
--cc=catalin.marinas@arm.com \
--cc=david@redhat.com \
--cc=greentime.hu@sifive.com \
--cc=gregkh@linuxfoundation.org \
--cc=justin.he@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=nsaenzjulienne@suse.de \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rafael@kernel.org \
--cc=rppt@kernel.org \
--cc=steven.price@arm.com \
--cc=wangkefeng.wang@huawei.com \
--cc=will@kernel.org \
--cc=zong.li@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).