From patchwork Fri Oct 4 11:43:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 175215 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp580922ill; Fri, 4 Oct 2019 04:44:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqzc/Kr1q+qu5AX+wXQEM4i49ygpmkFDVxz2swa/I6VzC9satttEDAGnNewP2MCqFldk8i5k X-Received: by 2002:a17:906:b74e:: with SMTP id fx14mr11873319ejb.226.1570189458979; Fri, 04 Oct 2019 04:44:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570189458; cv=none; d=google.com; s=arc-20160816; b=NqxcLLd0qHv1Pb7y/g/W6bD/l/pYGFprmHgRwXfHXlBpxp/J+8By5dgrY4pojNdTF8 nixs8KmAKzoSY6YQpFgXik/lq2MZrwb9O0Dj9HyWLKh7tTklbOencAL3c7HZDsqVCc8u W+zqZztIqYev04DMhxgAsYc0ASZeIKqGxOrhoAXHjBi7NR5Wh6vQTqe717jGOPSqtjVZ h+HWVKuTxCS1nsXbI25Zgm08FYfPIU5pXesYlId5paJ7Axju5tFBkbTi4l+PaOzaG3td rjToJJBGlH7bzvUlKrwmINjcKys0/+c48gbgfjsAtIwmF3c8QALFGJvh+451iMU4Fvm6 ySEQ== 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=Yz2T43D9aLlLec6z66ZxUgz52BHSlDyVRRxGGDtKfXk=; b=TtNkHplJ/pu3Mqs9UctyPR2IuVpFzHQNKcxqEvoGxIzDgZGHg+e4P9hA2rhox4Va8T vt2UaNPHFZpi6fq7njX30Y9Gz/KCzA2xe+OsPibBZuNL+tWZip7ba8mDDREDGCvp6S6f q0rARPPHPx3DhFmCapCfIMBawl4hHr+d7241HiPTJ3x0P9NXI+yEGpmR3TH21S4HUrxa Gwsfl2+AXIvEX2QWAAmDOh4AJBNmLUxllZyfP7J7KKE2Q3mUkbuObBngRYouTqYyu6AQ 5pG0U4G2G9ci3YcYPNxFbLSGVFXLnwUz00kHi6chSUVQB91OPeDcslEjWUe0iYBFernw QK7g== 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 si6si2822248ejb.195.2019.10.04.04.44.18; Fri, 04 Oct 2019 04:44:18 -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 S1728962AbfJDLoS (ORCPT + 7 others); Fri, 4 Oct 2019 07:44:18 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:3201 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727978AbfJDLoS (ORCPT ); Fri, 4 Oct 2019 07:44:18 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 29ACD63A75639EBF1B98; Fri, 4 Oct 2019 19:44:15 +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:07 +0800 From: Jonathan Cameron To: , , , , CC: Keith Busch , , "Rafael J . Wysocki" , , Andrew Morton , Dan Williams , Jonathan Cameron Subject: [PATCH V5 1/4] ACPI: Support Generic Initiator only domains Date: Fri, 4 Oct 2019 19:43:27 +0800 Message-ID: <20191004114330.104746-2-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 Generic Initiators are a new ACPI concept that allows for the description of proximity domains that contain a device which performs memory access (such as a network card) but neither host CPU nor Memory. This patch has the parsing code and provides the infrastructure for an architecture to associate these new domains with their nearest memory processing node. Signed-off-by: Jonathan Cameron --- drivers/acpi/numa/srat.c | 62 +++++++++++++++++++++++++++++++++- drivers/base/node.c | 3 ++ include/asm-generic/topology.h | 3 ++ include/linux/nodemask.h | 1 + include/linux/topology.h | 7 ++++ 5 files changed, 75 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index eadbf90e65d1..fe34315a9234 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -170,6 +170,38 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) } break; + case ACPI_SRAT_TYPE_GENERIC_AFFINITY: + { + struct acpi_srat_generic_affinity *p = + (struct acpi_srat_generic_affinity *)header; + char name[9] = {}; + + if (p->device_handle_type == 0) { + /* + * For pci devices this may be the only place they + * are assigned a proximity domain + */ + pr_debug("SRAT Generic Initiator(Seg:%u BDF:%u) in proximity domain %d %s\n", + *(u16 *)(&p->device_handle[0]), + *(u16 *)(&p->device_handle[2]), + p->proximity_domain, + (p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED) ? + "enabled" : "disabled"); + } else { + /* + * In this case we can rely on the device having a + * proximity domain reference + */ + memcpy(name, p->device_handle, 8); + pr_info("SRAT Generic Initiator(HID=%.8s UID=%.4s) in proximity domain %d %s\n", + (char *)(&p->device_handle[0]), + (char *)(&p->device_handle[8]), + p->proximity_domain, + (p->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED) ? + "enabled" : "disabled"); + } + } + break; default: pr_warn("Found unsupported SRAT entry (type = 0x%x)\n", header->type); @@ -378,6 +410,32 @@ acpi_parse_gicc_affinity(union acpi_subtable_headers *header, return 0; } +static int __init +acpi_parse_gi_affinity(union acpi_subtable_headers *header, + const unsigned long end) +{ + struct acpi_srat_generic_affinity *gi_affinity; + int node; + + gi_affinity = (struct acpi_srat_generic_affinity *)header; + if (!gi_affinity) + return -EINVAL; + acpi_table_print_srat_entry(&header->common); + + if (!(gi_affinity->flags & ACPI_SRAT_GENERIC_AFFINITY_ENABLED)) + return -EINVAL; + + node = acpi_map_pxm_to_node(gi_affinity->proximity_domain); + if (node == NUMA_NO_NODE || node >= MAX_NUMNODES) { + pr_err("SRAT: Too many proximity domains.\n"); + return -EINVAL; + } + node_set(node, numa_nodes_parsed); + node_set_state(node, N_GENERIC_INITIATOR); + + return 0; +} + static int __initdata parsed_numa_memblks; static int __init @@ -433,7 +491,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[3]; + struct acpi_subtable_proc srat_proc[4]; memset(srat_proc, 0, sizeof(srat_proc)); srat_proc[0].id = ACPI_SRAT_TYPE_CPU_AFFINITY; @@ -442,6 +500,8 @@ int __init acpi_numa_init(void) srat_proc[1].handler = acpi_parse_x2apic_affinity; srat_proc[2].id = ACPI_SRAT_TYPE_GICC_AFFINITY; 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; acpi_table_parse_entries_array(ACPI_SIG_SRAT, sizeof(struct acpi_table_srat), diff --git a/drivers/base/node.c b/drivers/base/node.c index 296546ffed6c..e5863baa8cb6 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -977,6 +977,8 @@ static struct node_attr node_state_attr[] = { #endif [N_MEMORY] = _NODE_ATTR(has_memory, N_MEMORY), [N_CPU] = _NODE_ATTR(has_cpu, N_CPU), + [N_GENERIC_INITIATOR] = _NODE_ATTR(has_generic_initiator, + N_GENERIC_INITIATOR), }; static struct attribute *node_state_attrs[] = { @@ -988,6 +990,7 @@ static struct attribute *node_state_attrs[] = { #endif &node_state_attr[N_MEMORY].attr.attr, &node_state_attr[N_CPU].attr.attr, + &node_state_attr[N_GENERIC_INITIATOR].attr.attr, NULL }; diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h index 238873739550..54d0b4176a45 100644 --- a/include/asm-generic/topology.h +++ b/include/asm-generic/topology.h @@ -71,6 +71,9 @@ #ifndef set_cpu_numa_mem #define set_cpu_numa_mem(cpu, node) #endif +#ifndef set_gi_numa_mem +#define set_gi_numa_mem(gi, node) +#endif #endif /* !CONFIG_NUMA || !CONFIG_HAVE_MEMORYLESS_NODES */ diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h index 27e7fa36f707..1aebf766fb52 100644 --- a/include/linux/nodemask.h +++ b/include/linux/nodemask.h @@ -399,6 +399,7 @@ enum node_states { #endif N_MEMORY, /* The node has memory(regular, high, movable) */ N_CPU, /* The node has one or more cpus */ + N_GENERIC_INITIATOR, /* The node is a GI only node */ NR_NODE_STATES }; diff --git a/include/linux/topology.h b/include/linux/topology.h index eb2fe6edd73c..05ccf011e489 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -140,6 +140,13 @@ static inline void set_numa_mem(int node) } #endif +#ifndef set_gi_numa_mem +static inline void set_gi_numa_mem(int gi, int node) +{ + _node_numa_mem_[gi] = node; +} +#endif + #ifndef node_to_mem_node static inline int node_to_mem_node(int node) { 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. * From patchwork Fri Oct 4 11:43:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 175218 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp581225ill; Fri, 4 Oct 2019 04:44:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqztJ8IGji4K+8zdFLgR6qMwTw6zHVKEqdrZ521T1SJFWRYmmFX1ykSEvWbKZyRwLmvv+1Ax X-Received: by 2002:aa7:d508:: with SMTP id y8mr14510610edq.171.1570189475382; Fri, 04 Oct 2019 04:44:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570189475; cv=none; d=google.com; s=arc-20160816; b=zvesmWs9Dy2PeW3m3xgTLMGbujiGmd3DVxzjOfcgp63qbSwPbcHMjNFa5KvSX/W8Xs p1snLH1j0PGVeiuiqC/bzyIzC7BSx2xWEmsmfcT/cJJKptzhdvriiArSWJJea8MH1b1a LeZdc9PmX5Bfi7WWyZXyVJUIHiVd6dRh3+CR/ZeHE3QqIQslBk83yW516WxgeMSLajFy ByFocFOH27hTY/nG7GCoKOGqSMq/PAta7TG8Yz8gwPS82xv9CTZfJfKpCTgOnd4tw7Du asJYFbwrwxgpjmHWRrYxBIKZKj9KU73lRmODyh+a4nIyVB5ica4EBEFOhaGlEfx8A6Rx CLsg== 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=7YnoB4C6mNxuXiVOBJiBomIB/ZmZazv/s6w9cUbGzig=; b=kP/Zb2T1ZrV3459FPL6v+ReU1qfR4BGmyq/Mk1maJkSCxZPFvEkNvRUs3DhfFVVaD3 bamrDH7lBeAuOAxXUH6f9UC6Z93zcu2oLGVKX3AodkGvEfCh8StsnF1Kl0faZ8oR0pFF 46tl7udxoLurw7fj71E+RTCRveIgDK6zfoevRrwL0yU/BPpQS7E7oDunhO8+j5WgW1uB krbt4x+f4/SuSo44fueAoC/sReK0SRqXIiaeIbHOaE+yj3tHgg4y7UGx6sx4+ehB4TxS cUXyFVz5erE+NJk01UlExxBChxgtm6ORrpo8YXXoeQD+u3B/OgS8Ll3kTrsIWCCj+jDN /DJw== 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 x3si3433596eda.285.2019.10.04.04.44.35; Fri, 04 Oct 2019 04:44:35 -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 S1731207AbfJDLod (ORCPT + 7 others); Fri, 4 Oct 2019 07:44:33 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:3202 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726024AbfJDLod (ORCPT ); Fri, 4 Oct 2019 07:44:33 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 5C8ABEC96BAA33C61D16; Fri, 4 Oct 2019 19:44:30 +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:22 +0800 From: Jonathan Cameron To: , , , , CC: Keith Busch , , "Rafael J . Wysocki" , , Andrew Morton , Dan Williams , Jonathan Cameron Subject: [PATCH V5 4/4] ACPI: Let ACPI know we support Generic Initiator Affinity Structures Date: Fri, 4 Oct 2019 19:43:30 +0800 Message-ID: <20191004114330.104746-5-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 Until we tell ACPI that we support generic initiators, it will have to operate in fall back domain mode and all _PXM entries should be on existing non GI domains. This patch sets the relevant OSC bit to make that happen. Signed-off-by: Jonathan Cameron --- drivers/acpi/bus.c | 1 + include/linux/acpi.h | 1 + 2 files changed, 2 insertions(+) -- 2.20.1 diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 48bc96d45bab..9d40e465232f 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -302,6 +302,7 @@ static void acpi_bus_osc_support(void) capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT; capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT; + capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GENERIC_INITIATOR_SUPPORT; #ifdef CONFIG_X86 if (boot_cpu_has(X86_FEATURE_HWP)) { diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 8b4e516bac00..195b21e93aaa 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -505,6 +505,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); #define OSC_SB_PCLPI_SUPPORT 0x00000080 #define OSC_SB_OSLPI_SUPPORT 0x00000100 #define OSC_SB_CPC_DIVERSE_HIGH_SUPPORT 0x00001000 +#define OSC_SB_GENERIC_INITIATOR_SUPPORT 0x00002000 extern bool osc_sb_apei_support_acked; extern bool osc_pc_lpi_support_confirmed;