From patchwork Wed Apr 24 05:46:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 13641216 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E5C8EC4345F for ; Wed, 24 Apr 2024 05:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k5gCM0rGS3lD84HaLsGHVW0uVEPBFKdcFfTgyP8ULq0=; b=uBQf/6Qu8VkYep iUNFRWFUoDGdU5cJ0eDDeDu5WQA94mJq/dpUwLWL/XhZ/IGaSxTXyPxEsNMDx3uflU5JU4oPeB82F IrER5j6/gpwLN05ZPd77VQRCzoo5uGP7X60AGjPIcKCyt6BjH74ODSDfwtUhFV1PXnybTwHCKgO0H B+/QyP7lfJAdcOaCFsN8xAARGhvchPyHwxtr9KL2/4ma7DX4rcahuEnxkwzN7280n0uOEh3k/RWM2 rkUVH6SnFVNv5xY9GiQ1AXpxJuALl+AvIwOJN6BLOtl4V3xhaHFlsCLKhvFfgVcqgN4vR8q9gvMqG sfgrQi6ZG0LCYnScZHrw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVCW-00000002g89-0eGa; Wed, 24 Apr 2024 05:29:48 +0000 Received: from mgamail.intel.com ([198.175.65.10]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVCT-00000002g76-1oLk; Wed, 24 Apr 2024 05:29:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713936586; x=1745472586; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vVb6RIIvOt4enB6/MzuWcA6dkAPHXShQ2Vxb7to1nk8=; b=RGQnoufZII6jQNW8lA++dA0x/bwNpDJqWF2SEDqKWYxSn/06p7yctrLh fwIE4acPlPnXmRG2aWtswGH8mrtbKvJp19OPEcx/FINQC/gaM9B2+kGX/ yyyTPXjolcGvvxNZ4vdZpgF3zKP1M1X0Lv3xJBr9ejKDWO7M1EppPVJF5 w8hbYIF+t8WkHfqpmQKinlI1svWGyUx0EKzfQ1SeAI1KTCXZXZCJgWW7k DyKeR2idNaPNEVmeRiVhGq8FHGTGWVSPe3/cCaq2+IPiwiRLL97QEDLsp abu1Yi/G6Y09as+1dWSNFNd9Dz3ril8KO97OrCWbdn3E2FuQm2jyEF63W w==; X-CSE-ConnectionGUID: 2BWkiULyR5iNNfk+2vZnRA== X-CSE-MsgGUID: lQ6XDdGlS3KTCXYFu/fLuw== X-IronPort-AV: E=McAfee;i="6600,9927,11053"; a="27004183" X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="27004183" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2024 22:29:45 -0700 X-CSE-ConnectionGUID: L2sj6Cs+Tj+J/3PjA4uG7g== X-CSE-MsgGUID: cBYvsSoMS+GBiu/n6bwCcA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="62049714" Received: from unknown (HELO haibo-OptiPlex-7090.sh.intel.com) ([10.239.159.132]) by orviesa001.jf.intel.com with ESMTP; 23 Apr 2024 22:29:35 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, arnd@arndb.de Cc: xiaobo55x@gmail.com, ajones@ventanamicro.com, Haibo Xu , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , Robert Moore , Conor Dooley , Guo Ren , Alexandre Ghiti , Charlie Jenkins , Baoquan He , Greentime Hu , Zong Li , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Chen Jiahao , Samuel Holland , Jisheng Zhang , James Morse , "Russell King (Oracle)" , Evan Green , Yang Li , Thomas Gleixner , Ard Biesheuvel , Tony Luck , Yuntao Wang , Dan Williams , Alison Schofield , Dave Jiang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v3 1/6] ACPICA: SRAT: Add RISC-V RINTC affinity structure Date: Wed, 24 Apr 2024 13:46:21 +0800 Message-Id: <400608fe1804f5f2b52e611bf58e3a3a0b839b92.1713778236.git.haibo1.xu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240423_222945_786327_13090ED5 X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org ACPICA commit 93caddbf2f620769052c59ec471f018281dc3a24 Add definition of RISC-V Interrupt Controller(RINTC) affinity structure which was approved by UEFI forum and will be part of next ACPI spec version(6.6). Link: https://github.com/acpica/acpica/commit/93caddbf Signed-off-by: Haibo Xu --- include/acpi/actbl3.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/acpi/actbl3.h b/include/acpi/actbl3.h index c080d579a546..5202e3fc9b41 100644 --- a/include/acpi/actbl3.h +++ b/include/acpi/actbl3.h @@ -192,7 +192,8 @@ enum acpi_srat_type { ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4, /* ACPI 6.2 */ ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5, /* ACPI 6.3 */ ACPI_SRAT_TYPE_GENERIC_PORT_AFFINITY = 6, /* ACPI 6.4 */ - ACPI_SRAT_TYPE_RESERVED = 7 /* 7 and greater are reserved */ + ACPI_SRAT_TYPE_RINTC_AFFINITY = 7, /* ACPI 6.6 */ + ACPI_SRAT_TYPE_RESERVED = 8 /* 8 and greater are reserved */ }; /* @@ -296,6 +297,21 @@ struct acpi_srat_generic_affinity { #define ACPI_SRAT_GENERIC_AFFINITY_ENABLED (1) /* 00: Use affinity structure */ #define ACPI_SRAT_ARCHITECTURAL_TRANSACTIONS (1<<1) /* ACPI 6.4 */ +/* 7: RINTC Affinity (ACPI 6.6) */ + +struct acpi_srat_rintc_affinity { + struct acpi_subtable_header header; + u16 reserved; /* Reserved, must be zero */ + u32 proximity_domain; + u32 acpi_processor_uid; + u32 flags; + u32 clock_domain; +}; + +/* Flags for struct acpi_srat_rintc_affinity */ + +#define ACPI_SRAT_RINTC_ENABLED (1) /* 00: Use affinity structure */ + /******************************************************************************* * * STAO - Status Override Table (_STA override) - ACPI 6.0 From patchwork Wed Apr 24 05:46:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 13641217 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3B8D1C4345F for ; Wed, 24 Apr 2024 05:30:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4cvoIqwk2EqJNpqUK1S7RYvHveiGjpmtkEWpgjPKLlQ=; b=WF5wXuvxGSkmRU +dZEfi7wIppRZm7ER9g1s7OHsKQONO8nd02FLpnKWForWotXRwbe9yVce69e9Z71RCSNK1YyGzXQp aQ+vGmHppgfQj6XX7vhSfTsQ4EYvyiQBlx/jZ5mxNVQmu+M7P/vcn4y21uTGYwWd+q9A0UlMU8kjh B7DVQ84rqJjyKPLaIW9ZFrWxlQsAoLsTYKfOBGvnpHFtxbmRYvLEyRAguQI4PxpmwYWL2+WI2VouC L5PFr6TgwC3288ib9yv6z9uA+1/SrRK/X6Iz8KLu2NosnSXX6k9EbD5dCsm7C1XphJdoNz3RczQWs Mk/8cVfnfu3DjsgKxQfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVCr-00000002gIf-2wRt; Wed, 24 Apr 2024 05:30:09 +0000 Received: from mgamail.intel.com ([198.175.65.10]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVCn-00000002gHP-2wWF; Wed, 24 Apr 2024 05:30:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713936606; x=1745472606; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m94xgFiC9Egx8aA5jSWnNCr+cu96SO8oXS5hvtC918o=; b=WM9LYHzyRtKnvUnGZA80OE5K2mnOUcijTUjPJfckH7k87gJRJ7wrw+D/ zw+9QlQu20KlWVbGIlBHkdT6z3ssImVJSpI7gRNpNnek90gOZhbiLwSYt 2zEgGVs0BavfbWa6siXYZ0Zaacu4njSnnfZk/tq3+zuk09oknN4KYvv2a FDGPNBTI4wpR25AvsWbvWvJRUQoh80vYanepyVi2MWx6971E5DUPKgGx4 mHFVU+XcNKU/qh76QKnM8y0+xOBwr+kAivN2hjb7hJwRUkKKeo97uVQoi sNiC+8Yd1NCmAQ6IAeOgZDXdenrODtwpeelsXgXQRiuGCdexuYLIQpuWG Q==; X-CSE-ConnectionGUID: 0Ky47hHKTyyLbD0uz64lWg== X-CSE-MsgGUID: j3NMZu3cTKWJ+3aphCosXA== X-IronPort-AV: E=McAfee;i="6600,9927,11053"; a="27004264" X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="27004264" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2024 22:30:06 -0700 X-CSE-ConnectionGUID: TV3x9Wh/SXakiir18y3vQA== X-CSE-MsgGUID: lbzoQyNzTZ++rY75L2VhXA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="62049888" Received: from unknown (HELO haibo-OptiPlex-7090.sh.intel.com) ([10.239.159.132]) by orviesa001.jf.intel.com with ESMTP; 23 Apr 2024 22:29:55 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, arnd@arndb.de Cc: xiaobo55x@gmail.com, ajones@ventanamicro.com, Haibo Xu , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , Robert Moore , Conor Dooley , Alexandre Ghiti , Guo Ren , Charlie Jenkins , Baoquan He , Greentime Hu , Zong Li , Sami Tolvanen , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Chen Jiahao , Jisheng Zhang , Samuel Holland , James Morse , "Russell King (Oracle)" , Evan Green , Thomas Gleixner , Tony Luck , Ard Biesheuvel , Yuntao Wang , Dan Williams , Alison Schofield , Dave Jiang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v3 2/6] ACPI: RISCV: Add NUMA support based on SRAT and SLIT Date: Wed, 24 Apr 2024 13:46:22 +0800 Message-Id: <060957b1c052a97eced29a5f85f647e95ddb91e9.1713778236.git.haibo1.xu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240423_223007_357228_A3046BF3 X-CRM114-Status: GOOD ( 25.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add acpi_numa.c file to enable parse NUMA information from ACPI SRAT and SLIT tables. SRAT table provide CPUs(Hart) and memory nodes to proximity domain mapping, while SLIT table provide the distance metrics between proximity domains. Signed-off-by: Haibo Xu Reviewed-by: Sunil V L --- arch/riscv/include/asm/acpi.h | 15 +++- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/acpi.c | 5 -- arch/riscv/kernel/acpi_numa.c | 131 ++++++++++++++++++++++++++++++++++ arch/riscv/kernel/setup.c | 4 +- arch/riscv/kernel/smpboot.c | 2 - include/linux/acpi.h | 6 ++ 7 files changed, 154 insertions(+), 10 deletions(-) create mode 100644 arch/riscv/kernel/acpi_numa.c diff --git a/arch/riscv/include/asm/acpi.h b/arch/riscv/include/asm/acpi.h index 7dad0cf9d701..e0a1f84404f3 100644 --- a/arch/riscv/include/asm/acpi.h +++ b/arch/riscv/include/asm/acpi.h @@ -61,11 +61,14 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { } void acpi_init_rintc_map(void); struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu); -u32 get_acpi_id_for_cpu(int cpu); +static inline u32 get_acpi_id_for_cpu(int cpu) +{ + return acpi_cpu_get_madt_rintc(cpu)->uid; +} + int acpi_get_riscv_isa(struct acpi_table_header *table, unsigned int cpu, const char **isa); -static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; } void acpi_get_cbo_block_size(struct acpi_table_header *table, u32 *cbom_size, u32 *cboz_size, u32 *cbop_size); #else @@ -87,4 +90,12 @@ static inline void acpi_get_cbo_block_size(struct acpi_table_header *table, #endif /* CONFIG_ACPI */ +#ifdef CONFIG_ACPI_NUMA +int acpi_numa_get_nid(unsigned int cpu); +void acpi_map_cpus_to_nodes(void); +#else +static inline int acpi_numa_get_nid(unsigned int cpu) { return NUMA_NO_NODE; } +static inline void acpi_map_cpus_to_nodes(void) { } +#endif /* CONFIG_ACPI_NUMA */ + #endif /*_ASM_ACPI_H*/ diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 81d94a8ee10f..960e627d2ad1 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -109,3 +109,4 @@ obj-$(CONFIG_COMPAT) += compat_vdso/ obj-$(CONFIG_64BIT) += pi/ obj-$(CONFIG_ACPI) += acpi.o +obj-$(CONFIG_ACPI_NUMA) += acpi_numa.o diff --git a/arch/riscv/kernel/acpi.c b/arch/riscv/kernel/acpi.c index e619edc8b0cc..040bdbfea2b4 100644 --- a/arch/riscv/kernel/acpi.c +++ b/arch/riscv/kernel/acpi.c @@ -191,11 +191,6 @@ struct acpi_madt_rintc *acpi_cpu_get_madt_rintc(int cpu) return &cpu_madt_rintc[cpu]; } -u32 get_acpi_id_for_cpu(int cpu) -{ - return acpi_cpu_get_madt_rintc(cpu)->uid; -} - /* * __acpi_map_table() will be called before paging_init(), so early_ioremap() * or early_memremap() should be called here to for ACPI table mapping. diff --git a/arch/riscv/kernel/acpi_numa.c b/arch/riscv/kernel/acpi_numa.c new file mode 100644 index 000000000000..0231482d6946 --- /dev/null +++ b/arch/riscv/kernel/acpi_numa.c @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ACPI 6.6 based NUMA setup for RISCV + * Lots of code was borrowed from arch/arm64/kernel/acpi_numa.c + * + * Copyright 2004 Andi Kleen, SuSE Labs. + * Copyright (C) 2013-2016, Linaro Ltd. + * Author: Hanjun Guo + * Copyright (C) 2024 Intel Corporation. + * + * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs. + * + * Called from acpi_numa_init while reading the SRAT and SLIT tables. + * Assumes all memory regions belonging to a single proximity domain + * are in one chunk. Holes between them will be included in the node. + */ + +#define pr_fmt(fmt) "ACPI: NUMA: " fmt + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +static int acpi_early_node_map[NR_CPUS] __initdata = { NUMA_NO_NODE }; + +int __init acpi_numa_get_nid(unsigned int cpu) +{ + return acpi_early_node_map[cpu]; +} + +static inline int get_cpu_for_acpi_id(u32 uid) +{ + int cpu; + + for (cpu = 0; cpu < nr_cpu_ids; cpu++) + if (uid == get_acpi_id_for_cpu(cpu)) + return cpu; + + return -EINVAL; +} + +static int __init acpi_parse_rintc_pxm(union acpi_subtable_headers *header, + const unsigned long end) +{ + struct acpi_srat_rintc_affinity *pa; + int cpu, pxm, node; + + if (srat_disabled()) + return -EINVAL; + + pa = (struct acpi_srat_rintc_affinity *)header; + if (!pa) + return -EINVAL; + + if (!(pa->flags & ACPI_SRAT_RINTC_ENABLED)) + return 0; + + pxm = pa->proximity_domain; + node = pxm_to_node(pxm); + + /* + * If we can't map the UID to a logical cpu this + * means that the UID is not part of possible cpus + * so we do not need a NUMA mapping for it, skip + * the SRAT entry and keep parsing. + */ + cpu = get_cpu_for_acpi_id(pa->acpi_processor_uid); + if (cpu < 0) + return 0; + + acpi_early_node_map[cpu] = node; + pr_info("SRAT: PXM %d -> HARTID 0x%lx -> Node %d\n", pxm, + cpuid_to_hartid_map(cpu), node); + + return 0; +} + +void __init acpi_map_cpus_to_nodes(void) +{ + int i; + + /* + * In ACPI, SMP and CPU NUMA information is provided in separate + * static tables, namely the MADT and the SRAT. + * + * Thus, it is simpler to first create the cpu logical map through + * an MADT walk and then map the logical cpus to their node ids + * as separate steps. + */ + acpi_table_parse_entries(ACPI_SIG_SRAT, sizeof(struct acpi_table_srat), + ACPI_SRAT_TYPE_RINTC_AFFINITY, acpi_parse_rintc_pxm, 0); + + for (i = 0; i < nr_cpu_ids; i++) + early_map_cpu_to_node(i, acpi_numa_get_nid(i)); +} + +/* Callback for Proximity Domain -> logical node ID mapping */ +void __init acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa) +{ + int pxm, node; + + if (srat_disabled()) + return; + + if (pa->header.length < sizeof(struct acpi_srat_rintc_affinity)) { + pr_err("SRAT: Invalid SRAT header length: %d\n", pa->header.length); + bad_srat(); + return; + } + + if (!(pa->flags & ACPI_SRAT_RINTC_ENABLED)) + return; + + pxm = pa->proximity_domain; + node = acpi_map_pxm_to_node(pxm); + + if (node == NUMA_NO_NODE) { + pr_err("SRAT: Too many proximity domains %d\n", pxm); + bad_srat(); + return; + } + + node_set(node, numa_nodes_parsed); +} diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 4f73c0ae44b2..a2cde65b69e9 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -281,8 +281,10 @@ void __init setup_arch(char **cmdline_p) setup_smp(); #endif - if (!acpi_disabled) + if (!acpi_disabled) { acpi_init_rintc_map(); + acpi_map_cpus_to_nodes(); + } riscv_init_cbo_blocksizes(); riscv_fill_hwcap(); diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c index d41090fc3203..7b63149128e7 100644 --- a/arch/riscv/kernel/smpboot.c +++ b/arch/riscv/kernel/smpboot.c @@ -96,7 +96,6 @@ static int __init acpi_parse_rintc(union acpi_subtable_headers *header, const un if (hart == cpuid_to_hartid_map(0)) { BUG_ON(found_boot_cpu); found_boot_cpu = true; - early_map_cpu_to_node(0, acpi_numa_get_nid(cpu_count)); return 0; } @@ -106,7 +105,6 @@ static int __init acpi_parse_rintc(union acpi_subtable_headers *header, const un } cpuid_to_hartid_map(cpu_count) = hart; - early_map_cpu_to_node(cpu_count, acpi_numa_get_nid(cpu_count)); cpu_count++; return 0; diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 34829f2c517a..bba6d6b35f68 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -269,6 +269,12 @@ acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { } int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); +#ifdef CONFIG_RISCV +void acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa); +#else +static inline void acpi_numa_rintc_affinity_init(struct acpi_srat_rintc_affinity *pa) { } +#endif + #ifndef PHYS_CPUID_INVALID typedef u32 phys_cpuid_t; #define PHYS_CPUID_INVALID (phys_cpuid_t)(-1) From patchwork Wed Apr 24 05:46:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 13641218 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A597BC4345F for ; Wed, 24 Apr 2024 05:30:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lt2IcMWRVL+uFhGJK8BgNYRQ8OTvWiM8vWebHyJjMm0=; b=SteHw7VAcwj5I3 rZvU6it1once40xSYxSDQg+9ladkT8LRl7EHiYknEBPSF2ysBYLaqD8eY0gMsIXdWK3SOIKfa1fks INGc15MkhDh7pQ0cMIheum+epVvENlcqt+oCw+aaKNIWJt+K61Yzx9wihOesEpcIIDPMw6Hllb6MA TM4Yvw3A69rld11y6DLv1KHhHKufgDyXj7lAImbMqsJF1K8Sgjzh7GHcR9ewfNwR7IQpTrc4Sonim TkR/B8GuxM4XxjsH449LWH6j0b9kw8c14vGSQ/2TFUzGUsO3RCcdfmUa48b0MY569VI8WocMfR3dl rwMQs5zQ3LDXeMNVfpHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVDD-00000002gVF-1zyf; Wed, 24 Apr 2024 05:30:31 +0000 Received: from mgamail.intel.com ([198.175.65.10]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVD7-00000002gS8-3AA5; Wed, 24 Apr 2024 05:30:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713936626; x=1745472626; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QpctZFOgjLCGZkae6U7fJY9a2aL5ED2kqQ9t0GVRrMI=; b=Ca908mHD+K3f0+0icjvlAJc5MLIAsXkbsycomwDEnCV8ulppjiXwrZS1 yOm+kDPX9TVErrFsuFTz08ZF+EJ+GymhKMIameKyfu4U9ZsWxU81UTvQj ccFo6p7HPTtQroEKIffB8vKA0nRWyXY92Bn61b5S0Yuc3rz4/qFDz5V/6 oyoIHOTCSM4rAdysw4Ku+kcsEfiBz35AcOfp4m+ENLjOrBChQ3NI+OkQP E/Yq7LdNP7h85n8ZF5lLoJbxu7X5nuOk0u2CpyvcqCYLlwoZt4u3FrAg8 BWDdwWTV6rkqfQFG4+F/Elk8uwAqVRNSCK6J+8TUe4OvVjHbFzvjYeYbS Q==; X-CSE-ConnectionGUID: QIaoTTohSoaKHWfqP5ReEg== X-CSE-MsgGUID: VoUE2IbJR/qHacRkQuAX9Q== X-IronPort-AV: E=McAfee;i="6600,9927,11053"; a="27004334" X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="27004334" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2024 22:30:26 -0700 X-CSE-ConnectionGUID: Gj/C8lUAS9OBNw5v0pwjHA== X-CSE-MsgGUID: IUvD6jDHSJS/9jHbK9aPLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="62050113" Received: from unknown (HELO haibo-OptiPlex-7090.sh.intel.com) ([10.239.159.132]) by orviesa001.jf.intel.com with ESMTP; 23 Apr 2024 22:30:15 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, arnd@arndb.de Cc: xiaobo55x@gmail.com, ajones@ventanamicro.com, Haibo Xu , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , Robert Moore , Conor Dooley , Alexandre Ghiti , Guo Ren , Greentime Hu , Charlie Jenkins , Baoquan He , Sami Tolvanen , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Samuel Holland , Jisheng Zhang , Chen Jiahao , James Morse , "Russell King (Oracle)" , Evan Green , Thomas Gleixner , Tony Luck , Ard Biesheuvel , Yuntao Wang , Dan Williams , Alison Schofield , Dave Jiang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v3 3/6] ACPI: NUMA: Add handler for SRAT RINTC affinity structure Date: Wed, 24 Apr 2024 13:46:23 +0800 Message-Id: <5f6167bbe37f19796b93dd20975853a2681e5ce8.1713778236.git.haibo1.xu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240423_223026_022754_FAC60915 X-CRM114-Status: GOOD ( 11.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add RINTC affinity structure handler during parsing SRAT table. Signed-off-by: Haibo Xu Reviewed-by: Sunil V L --- drivers/acpi/numa/srat.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index e45e64993c50..bc8f34b2ad51 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -167,6 +167,19 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) } } break; + + case ACPI_SRAT_TYPE_RINTC_AFFINITY: + { + struct acpi_srat_rintc_affinity *p = + (struct acpi_srat_rintc_affinity *)header; + pr_debug("SRAT Processor (acpi id[0x%04x]) in proximity domain %d %s\n", + p->acpi_processor_uid, + p->proximity_domain, + (p->flags & ACPI_SRAT_RINTC_ENABLED) ? + "enabled" : "disabled"); + } + break; + default: pr_warn("Found unsupported SRAT entry (type = 0x%x)\n", header->type); @@ -450,6 +463,21 @@ acpi_parse_gi_affinity(union acpi_subtable_headers *header, } #endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ +static int __init +acpi_parse_rintc_affinity(union acpi_subtable_headers *header, + const unsigned long end) +{ + struct acpi_srat_rintc_affinity *rintc_affinity; + + rintc_affinity = (struct acpi_srat_rintc_affinity *)header; + acpi_table_print_srat_entry(&header->common); + + /* let architecture-dependent part to do it */ + acpi_numa_rintc_affinity_init(rintc_affinity); + + return 0; +} + static int __initdata parsed_numa_memblks; static int __init @@ -503,7 +531,7 @@ int __init acpi_numa_init(void) /* SRAT: System Resource Affinity Table */ if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) { - struct acpi_subtable_proc srat_proc[4]; + struct acpi_subtable_proc srat_proc[5]; memset(srat_proc, 0, sizeof(srat_proc)); srat_proc[0].id = ACPI_SRAT_TYPE_CPU_AFFINITY; @@ -514,6 +542,8 @@ int __init acpi_numa_init(void) srat_proc[2].handler = acpi_parse_gicc_affinity; srat_proc[3].id = ACPI_SRAT_TYPE_GENERIC_AFFINITY; srat_proc[3].handler = acpi_parse_gi_affinity; + srat_proc[4].id = ACPI_SRAT_TYPE_RINTC_AFFINITY; + srat_proc[4].handler = acpi_parse_rintc_affinity; acpi_table_parse_entries_array(ACPI_SIG_SRAT, sizeof(struct acpi_table_srat), From patchwork Wed Apr 24 05:46:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 13641226 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 87606C07E8E for ; Wed, 24 Apr 2024 05:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/zkQF0rDQizK6VEn7EwoR4SNG8x3PnUwnRknji4vykE=; b=M0Yj4zUPuGRAZU rsWVlB2D+LwNeoswcGQg4xf7QRQfDUK74gbeDMCNEkHynHzOCvOJ4FKUYpArL6e2W0A8/X4yEVjpJ 2QZ/wK5wSXYhSDCbm4ggToq83CApV9z6tUVK2J28b+v4LeD4+cNyPvgdXeYB96MBZHi8yalJ8943+ s8RS1c1EMCHQeyqNF2GoU8G7r04VhOmmXwFlHpNeB2VLKp4CVku7IJFasSV+bdSN90iVLHXIJsrya CRh7Oprz3efN4YSaWFp54ouPiZbn4ChSb1af1/iDVKoj6zsdfh9V0VEN84oA1qF4pLbjLSJWhIibC 9hIet/LrJS2efH2Q1zuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVDe-00000002ghK-2tOQ; Wed, 24 Apr 2024 05:30:58 +0000 Received: from mgamail.intel.com ([198.175.65.10]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVDS-00000002gdH-0ANG; Wed, 24 Apr 2024 05:30:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713936647; x=1745472647; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LBRamLcaPYBt1vaIiWAE+5pLGZIJAaHQiWBQITKAtzg=; b=GbDBCcQ6Xhf/sWegGNDkPrJvIYcbBl5d/ndugUt2g3C19OLp6Q2D/FO8 OAW9qhEEQzrPaahRWq7V0jwbP4Zexyx1Wz9Ffvro7ro39LsfBTYTP7HZq GgNf+1QgG+Nyvo6XbSILBa/UcSf4XrzPM6ZsPGYeaaxV/lxSD/66+ZJgG EYwjhvtjMmE/vzB0agsQYz8W6Mqht83jyAWjh9LCjN1GGSl/EyWAKT1uM +V8kzpCvQyLJ229igZMiZgIp3mlpWF/Plb7u9e3QqzS1Te2Cz2u74IxqB uRQnX9Sln+S0qwmw5luOLrZSzTdUIi5D3v50NWsBpAyX/CqDxp1Es88Pe w==; X-CSE-ConnectionGUID: OIPKG7GEREm6KU3kcmib3Q== X-CSE-MsgGUID: MNy3Qq+5TYqnOSrDOUpe0A== X-IronPort-AV: E=McAfee;i="6600,9927,11053"; a="27004356" X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="27004356" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2024 22:30:46 -0700 X-CSE-ConnectionGUID: NJ2MBZ8YRCSg/pZQf2DG6g== X-CSE-MsgGUID: aZfxAwKdTxWSKMg1Rak9mA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="62050299" Received: from unknown (HELO haibo-OptiPlex-7090.sh.intel.com) ([10.239.159.132]) by orviesa001.jf.intel.com with ESMTP; 23 Apr 2024 22:30:35 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, arnd@arndb.de Cc: xiaobo55x@gmail.com, ajones@ventanamicro.com, Haibo Xu , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , Robert Moore , Conor Dooley , Guo Ren , Alexandre Ghiti , Baoquan He , Charlie Jenkins , Greentime Hu , Zong Li , Sami Tolvanen , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Samuel Holland , Chen Jiahao , Jisheng Zhang , "Russell King (Oracle)" , James Morse , Evan Green , Yang Li , Thomas Gleixner , Ard Biesheuvel , Tony Luck , Yuntao Wang , Dan Williams , Alison Schofield , Dave Jiang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v3 4/6] ACPI: NUMA: Make some NUMA related parse functions common Date: Wed, 24 Apr 2024 13:46:24 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240423_223054_842622_55F047D8 X-CRM114-Status: UNSURE ( 8.96 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The acpi_numa_slit_init(), acpi_numa_memory_affinity_init() and acpi_parse_cfmws() functions are common enough to be used on platforms that support ACPI_NUMA(x86/arm64/loongarch). Remove the condition to avoid long defined(CONFIG_ARCH) check when new platform(riscv) support was enabled. Suggested-by: Sunil V L Signed-off-by: Haibo Xu Reviewed-by: Sunil V L --- drivers/acpi/numa/srat.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index bc8f34b2ad51..860900faa843 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -221,7 +221,6 @@ int __init srat_disabled(void) return acpi_numa < 0; } -#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH) /* * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for * I/O localities since SRAT does not list them. I/O localities are @@ -353,13 +352,6 @@ static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, (*fake_pxm)++; return 0; } -#else -static int __init acpi_parse_cfmws(union acpi_subtable_headers *header, - void *arg, const unsigned long table_end) -{ - return 0; -} -#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */ static int __init acpi_parse_slit(struct acpi_table_header *table) { From patchwork Wed Apr 24 05:46:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 13641227 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 76A4FC4345F for ; Wed, 24 Apr 2024 05:31:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iBTzZD4pn86bIrj/fkMCnTK4Yek275g3N3Xh15ZCr84=; b=EO6NdwyrLX8t7a zW8T7btEo35Iu6As/UDW8qdO7YuKaylGHZtgKVqVlL+mV+hvbPMxRuG46dnpd11x0O6GzYSLyr/N1 QM3uMGpOirKBIPtRG5GdXOuNhYwCQrqLZ87zFwOZKUUUF9ciDTzN1GpMJEYr1WaLKlFkoyxCSybvM a6PAWzsHEKz26MYDltX7EdxNUAugbwmmbBB+pW52uO8hKWhKZNaiU+47iHAuxp2N74lzbDHyQFGrS GO1ac9g68c9hM3RVCVdJyEquZMs/FF1IjThQzwi+yKFxx3rxwSafmGfpLgoOCvBCD/vXYmBH1EAbc UActKQLmadsI7JhmdVUQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVDt-00000002grE-3vjo; Wed, 24 Apr 2024 05:31:13 +0000 Received: from mgamail.intel.com ([198.175.65.10]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVDm-00000002gmG-0j2z; Wed, 24 Apr 2024 05:31:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713936667; x=1745472667; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Xx39zSGpS7CLVBj5LielZhHEXa/MDDWMlQjEZWaS27o=; b=OA9mFPSnE+SHBYO3BftzWPtlKspDpmsy7qgRUNOie2Qfy9CZgvxzZu+8 BD+Tspq1ML9uHLBGh/Fhrnwbp+Vm6eryZ28zt5SVQJjlXx0tt1fJxCYHH L6m8shgsdfuX2f8SkqcJXl1f0+PEf4lb/wJ8CsfLdhJuNXWTuwIFQI5VL QJpn4gqg9Z1NkL2GJxftO2qcF6X8fH3ewRpcde/KTCwHOU7wOqNELgtS9 MXh7lMlMjzCD8YZNAZ6zq+h3a5+HILIfS6bpAs0ZP6nQMfyQFIzxtsZRd 7llYVe6VTjqVOEdk1D8xgZ/mQOFMam42pDiY+4ETTQF2K99UYlwXX/a25 Q==; X-CSE-ConnectionGUID: 3VAGuhRYSp6ZZIHSug2d1w== X-CSE-MsgGUID: 9gv3rurTSTO9Ya/ZfraIxg== X-IronPort-AV: E=McAfee;i="6600,9927,11053"; a="27004421" X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="27004421" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2024 22:31:06 -0700 X-CSE-ConnectionGUID: qWS/ZITWTV66hOx7yeOqmQ== X-CSE-MsgGUID: Nbe1G5h2Sai4uMbWmluw7Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="62050438" Received: from unknown (HELO haibo-OptiPlex-7090.sh.intel.com) ([10.239.159.132]) by orviesa001.jf.intel.com with ESMTP; 23 Apr 2024 22:30:56 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, arnd@arndb.de Cc: xiaobo55x@gmail.com, ajones@ventanamicro.com, Haibo Xu , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , Robert Moore , Conor Dooley , Alexandre Ghiti , Guo Ren , Baoquan He , Charlie Jenkins , Greentime Hu , Sami Tolvanen , Zong Li , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Chen Jiahao , Jisheng Zhang , "Russell King (Oracle)" , James Morse , Samuel Holland , Evan Green , Thomas Gleixner , Ard Biesheuvel , Tony Luck , Yuntao Wang , Alison Schofield , Dave Jiang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v3 5/6] ACPI: NUMA: change the ACPI_NUMA to a hidden option Date: Wed, 24 Apr 2024 13:46:25 +0800 Message-Id: <5c3a005a67096010cf3c465f8e3362651763fe3b.1713778236.git.haibo1.xu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240423_223106_919783_CDD286D6 X-CRM114-Status: GOOD ( 11.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org x86/arm64/loongarch would select ACPI_NUMA by default and riscv would do the same thing, so change it to a hidden option and the select statements except for the X86_64_ACPI_NUMA can also go away. Suggested-by: Arnd Bergmann Suggested-by: Sunil V L Signed-off-by: Haibo Xu Reviewed-by: Sunil V L --- arch/arm64/Kconfig | 1 - arch/loongarch/Kconfig | 1 - drivers/acpi/numa/Kconfig | 5 +---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7b11c98b3e84..c6c667898da6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1439,7 +1439,6 @@ config HOTPLUG_CPU config NUMA bool "NUMA Memory Allocation and Scheduler Support" select GENERIC_ARCH_NUMA - select ACPI_NUMA if ACPI select OF_NUMA select HAVE_SETUP_PER_CPU_AREA select NEED_PER_CPU_EMBED_FIRST_CHUNK diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index a5f300ec6f28..29d574a5c34c 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -465,7 +465,6 @@ config NR_CPUS config NUMA bool "NUMA Support" select SMP - select ACPI_NUMA if ACPI help Say Y to compile the kernel with NUMA (Non-Uniform Memory Access) support. This option improves performance on systems with more diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig index 849c2bd820b9..f33194d1e43f 100644 --- a/drivers/acpi/numa/Kconfig +++ b/drivers/acpi/numa/Kconfig @@ -1,9 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 config ACPI_NUMA - bool "NUMA support" - depends on NUMA - depends on (X86 || ARM64 || LOONGARCH) - default y if ARM64 + def_bool NUMA && !X86 config ACPI_HMAT bool "ACPI Heterogeneous Memory Attribute Table Support" From patchwork Wed Apr 24 05:46:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haibo Xu X-Patchwork-Id: 13641228 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D92ACC4345F for ; Wed, 24 Apr 2024 05:31:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=E+jn/cbmwjmgTXQEAv/abEBet58gGLO+mqGd7cm1jRI=; b=VDPfzFzkSOS6J8 HPOoAljT9BLDsPBG7QKPVrxGlNIk5uFvK6kx6bKXI4l0gNInK+ImYSayZiWY6gzqpGH6UTtB4zTWA qnnooFVxP3FkrVDrLGrMuUJ7BLC3V/weYYMIwJx8dk3QaM83ub7Y5xk2cl73GihuS6DZGoTNOU6aU pfHqA+eE/XLFYUs2zhUVAQWnwERe1uO0xKKtcHy3KLVk+wineJ6ctfiBUIJ7xZLDHm8wUwGVD1/W+ 4WIXMr58XyeZXOXldDLLIFY11/fbtrTGJ9wKAO5UIj6T4aWi32T2ihDWO1sSZ9LXPpj9CQfOZE0UJ KhRT04pBIjQEPI2SIjuA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVED-00000002h2z-2VkL; Wed, 24 Apr 2024 05:31:33 +0000 Received: from mgamail.intel.com ([198.175.65.10]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzVE7-00000002h0T-2icP; Wed, 24 Apr 2024 05:31:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713936688; x=1745472688; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tPo4ypzFj/KicqcCKxaiOjCo7Eyu+TsGnLXFq3hFYTc=; b=gL0SCOdXaEOJkH48CwLlNNYb6X1X+WgXbMhxfce6c9ajjf80uUQd2Y20 zeDuvOBH0G2EjuNKylfmUC3P/Xo7+hg+ehq0kJWcJInFDGYlSRzh8zZMV m/wVG4i1TVN7zKSGppqK22sLVoWcb7ZmXu7+Fz5mGv+ivflyfqhz0nZIV nJMB7HpeKo0agO08rYM0WFxPRgUFiWodR2j+bLc/qg+lxFMAu9ondfK/N MXvMoKpagHAVsJbTIVPb/TkOQ4MOdspxdlEYj633+63E+buxi5fY1sfm/ Q6IiKZEST49vy5VNN/y92fYhrYp/Qd3JDtZhHXxk9Wx2SL2MmxRbFc+s2 A==; X-CSE-ConnectionGUID: qcD7O2ZyTy64D0OIYhliYQ== X-CSE-MsgGUID: 9a0aIZVLQpGht0vMd0sB0w== X-IronPort-AV: E=McAfee;i="6600,9927,11053"; a="27004482" X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="27004482" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2024 22:31:28 -0700 X-CSE-ConnectionGUID: K2nGZA+6SxS85oF+8k8ISA== X-CSE-MsgGUID: idXSMI25RBWTdeIp9t4v1A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,225,1708416000"; d="scan'208";a="62050525" Received: from unknown (HELO haibo-OptiPlex-7090.sh.intel.com) ([10.239.159.132]) by orviesa001.jf.intel.com with ESMTP; 23 Apr 2024 22:31:16 -0700 From: Haibo Xu To: sunilvl@ventanamicro.com, arnd@arndb.de Cc: xiaobo55x@gmail.com, ajones@ventanamicro.com, Haibo Xu , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Paul Walmsley , Palmer Dabbelt , Albert Ou , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , Robert Moore , Conor Dooley , Alexandre Ghiti , Guo Ren , Greentime Hu , Baoquan He , Charlie Jenkins , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Chen Jiahao , Jisheng Zhang , James Morse , "Russell King (Oracle)" , Evan Green , Samuel Holland , Thomas Gleixner , Marc Zyngier , Tony Luck , Ard Biesheuvel , Yuntao Wang , Alison Schofield , Dave Jiang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v3 6/6] ACPI: NUMA: replace pr_info with pr_debug in arch_acpi_numa_init Date: Wed, 24 Apr 2024 13:46:26 +0800 Message-Id: <70870d88a26f50677eb31ac72bd8c343f428e5b6.1713778236.git.haibo1.xu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240423_223130_030276_60964A58 X-CRM114-Status: GOOD ( 11.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There are lots of ACPI enabled systems that aren't NUMA and If the firmware didn't provide the SRAT/SLIT, then there will be a message "Failed to initialise from firmware" from arch_acpi_numa_init() which adding noise to the boot on all of those kind of systems. Replace the pr_info with pr_debug in arch_acpi_numa_init() to avoid it. Suggested-by: Sunil V L Signed-off-by: Haibo Xu Reviewed-by: Sunil V L --- drivers/base/arch_numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c index 5b59d133b6af..555aee3ee8e7 100644 --- a/drivers/base/arch_numa.c +++ b/drivers/base/arch_numa.c @@ -445,7 +445,7 @@ static int __init arch_acpi_numa_init(void) ret = acpi_numa_init(); if (ret) { - pr_info("Failed to initialise from firmware\n"); + pr_debug("Failed to initialise from firmware\n"); return ret; }