From patchwork Fri Oct 4 11:43:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 175217 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp581113ill; Fri, 4 Oct 2019 04:44:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5F9EM+1NgwxXc/gewmjy733CWbHJ5tPE6CcyfR4R1dI4vCOBIU3z5kN4s3aXjneFIwLOj X-Received: by 2002:a05:6402:13cd:: with SMTP id a13mr14423269edx.6.1570189467906; Fri, 04 Oct 2019 04:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570189467; cv=none; d=google.com; s=arc-20160816; b=iQzNWHKdgqZEyCDxwpEhTigc+zESx4gg6M47WYGQjSi3R2gIrG6SHpxvMB1Es99gIV uQBwVYWxhhAdkdgwSw5S7/USNiF3EzkViGrKj537FS5+s3I33SJRmXNsbzXHfFu6ikMQ RRztua6HQx6X1rl8fXpLA/rhL8FW50x/Udat3vWlCQRVEDKKnfPxDaP3GIsy7D8NuAxH k00tl18z3AwRWRflcB6wVBOpHiEJHSD85qOVCDQx+heB01RRnLehY3VDXTDaB6mLEiaJ 7cWhKnWoTYeY4rBZMMDBVrf67C38A3QR9rIHOu16MhS7b0945U0PIAG+qETSJVeKI6Yd ktKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=+HNvCqntcAkM2HPl0ltoLa5tXRZcwpvC86fNlmlWvtw=; b=EAwEBt5xLgOcYO9Fi50sbsevDm/om5bcX3ECxACXkHVSd0JyMwJ/mMzSNBV/gwo3Tl LCl2gkoYrswYVNfeg3ufMv/gkqFeTZSCdNCBrRKgK9rKBpTgCpS2CRhmXVZYwMMXnwJi S/ev7DLugAmSRkn3EFWR2Dxe5oVOu27JtxeG2VOa9yo2p7KeD6NdQImb263E+AmeRkD5 iXaSaDnhp+ISm1To3xUOVprtAICTb5fQpRerrDtdpCxTNLcejFbCa6euVJ2dOXoXrErO I6cwF/BeX4SdyqrtwAGb4TFrg1prn2WNAVbNBW+rVZbRo+hLU8siqqA7F6B3O3xEI6r7 Y/Cw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e46si3426846eda.401.2019.10.04.04.44.27; Fri, 04 Oct 2019 04:44:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730423AbfJDLo1 (ORCPT + 7 others); Fri, 4 Oct 2019 07:44:27 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:36536 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726024AbfJDLo0 (ORCPT ); Fri, 4 Oct 2019 07:44:26 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 4A0CD4D78D6F1D03B630; Fri, 4 Oct 2019 19:44:25 +0800 (CST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.439.0; Fri, 4 Oct 2019 19:44:17 +0800 From: Jonathan Cameron To: , , , , CC: Keith Busch , , "Rafael J . Wysocki" , , Andrew Morton , Dan Williams , Jonathan Cameron Subject: [PATCH V5 3/4] x86: Support Generic Initiator only proximity domains Date: Fri, 4 Oct 2019 19:43:29 +0800 Message-ID: <20191004114330.104746-4-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191004114330.104746-1-Jonathan.Cameron@huawei.com> References: <20191004114330.104746-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-CFilter-Loop: Reflected Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Done in a somewhat different fashion to arm64. Here the infrastructure for memoryless domains was already in place. That infrastruture applies just as well to domains that also don't have a CPU, hence it works for Generic Initiator Domains. In common with memoryless domains we only register GI domains if the proximity node is not online. If a domain is already a memory containing domain, or a memoryless domain there is nothing to do just because it also contains a Generic Initiator. Signed-off-by: Jonathan Cameron --- arch/x86/include/asm/numa.h | 2 ++ arch/x86/kernel/setup.c | 1 + arch/x86/mm/numa.c | 14 ++++++++++++++ 3 files changed, 17 insertions(+) -- 2.20.1 diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h index bbfde3d2662f..f631467272a3 100644 --- a/arch/x86/include/asm/numa.h +++ b/arch/x86/include/asm/numa.h @@ -62,12 +62,14 @@ extern void numa_clear_node(int cpu); extern void __init init_cpu_to_node(void); extern void numa_add_cpu(int cpu); extern void numa_remove_cpu(int cpu); +extern void init_gi_nodes(void); #else /* CONFIG_NUMA */ static inline void numa_set_node(int cpu, int node) { } static inline void numa_clear_node(int cpu) { } static inline void init_cpu_to_node(void) { } static inline void numa_add_cpu(int cpu) { } static inline void numa_remove_cpu(int cpu) { } +static inline void init_gi_nodes(void) { } #endif /* CONFIG_NUMA */ #ifdef CONFIG_DEBUG_PER_CPU_MAPS diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index cfb533d42371..b6c977907ea5 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1264,6 +1264,7 @@ void __init setup_arch(char **cmdline_p) prefill_possible_map(); init_cpu_to_node(); + init_gi_nodes(); io_apic_init_mappings(); diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 4123100e0eaf..50bf724a425e 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -733,6 +733,20 @@ static void __init init_memory_less_node(int nid) */ } +/* + * Generic Initiator Nodes may have neither CPU nor Memory. + * At this stage if either of the others were present we would + * already be online. + */ +void __init init_gi_nodes(void) +{ + int nid; + + for_each_node_state(nid, N_GENERIC_INITIATOR) + if (!node_online(nid)) + init_memory_less_node(nid); +} + /* * Setup early cpu_to_node. *