From patchwork Wed Aug 21 14:52:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 171975 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1080104ily; Wed, 21 Aug 2019 07:53:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqzlcxkj4igZQCA7h5CF2c3vwnVi1idFJDayg4tAS6fB36uN5owNdPAvRc0iTu4wkuqxzQ3f X-Received: by 2002:a17:90a:ae15:: with SMTP id t21mr415774pjq.50.1566399203103; Wed, 21 Aug 2019 07:53:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566399203; cv=none; d=google.com; s=arc-20160816; b=st8BXbebbKgW3EeeIXkOqXTGa+SnSbIhMT1hJ/tnuPCnDPAS/gobU9oxXJj0hdJHJP KnPvh/qEzshsAnSgOlk2CbBwRWdDvjpiQaFwG+IT2j1R7f5Er1WLAy8JH9O/Go8IpCL8 ffNDBgq9XZRGgO7Bym5VvSZQSgQlM+o4dKwGIb3iws18LwP7ZShZ8f8Yg1uP6NGL0rFT dabc8j8M7BLnZKt7fgcG3MPwLczRTby0045Eg6qCuTlszL01pwkH8vQj99QRiXvlTing SjusjtBEW5nLxsIwE0QKOzicK1n4EAH7WkTag7JLcXU5DltYIwZQ4+53sZarNZgau0kZ H4+w== 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=XNRaPqhIfeI8NASt+mbbPZZ0KOa14jmXdBNihnZTeGk=; b=LuZHsGqnKWJ6ow6802qjiICV6Bo4TQthGHQNGRoDU6CAADzbdpW/33im4sQJnUA349 YxgeccN/IlRyIa5QED6rL9NgM8mjGswVNN9U+TSPPU0YIQwbLeNyNWbewApu96uI6EN0 yq6SAHRmLwlFpYkOg1xN67xb/R+DWDps9fhezGFB920eqn8Djnb+7yx4a0eznr/K4lyg ZIID8c9Kk8qTtMNAk/M4ze053rrSHye1PXTory/b6D0anPe8t2Qb0jKJ9I+dCHYB5T2O ceeqc2WmgbtSUdmnjbpZU3PX+i2C7JYmd4h+CPcaCFWIc94Qp4z6cm8bDLNxlmk4Bey3 KEbA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 y8si152748pjp.22.2019.08.21.07.53.22; Wed, 21 Aug 2019 07:53:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728037AbfHUOxS (ORCPT + 28 others); Wed, 21 Aug 2019 10:53:18 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:4753 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727014AbfHUOxP (ORCPT ); Wed, 21 Aug 2019 10:53:15 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id A73F3D22D9709479EC69; Wed, 21 Aug 2019 22:53:11 +0800 (CST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.439.0; Wed, 21 Aug 2019 22:53:01 +0800 From: Jonathan Cameron To: , , , CC: Keith Busch , , "Rafael J . Wysocki" , , Andrew Morton , Dan Williams , Jonathan Cameron Subject: [PATCH 1/4] ACPI: Support Generic Initiator only domains Date: Wed, 21 Aug 2019 22:52:39 +0800 Message-ID: <20190821145242.2330-2-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190821145242.2330-1-Jonathan.Cameron@huawei.com> References: <20190821145242.2330-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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.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.c b/drivers/acpi/numa.c index eadbf90e65d1..fe34315a9234 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.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 75b7e6f6535b..6f60689af5f8 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -980,6 +980,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[] = { @@ -991,6 +993,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 47a3e3c08036..2f97754e0508 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -125,6 +125,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 Wed Aug 21 14:52:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 171976 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1080186ily; Wed, 21 Aug 2019 07:53:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxZ8iMOZ6LrAW/rbDeOpehMMsVTssp1QSFYaY3T04DzoJUV9ghptg7scyxtcNaea/RN+8Ku X-Received: by 2002:a62:7d0d:: with SMTP id y13mr34871794pfc.150.1566399207825; Wed, 21 Aug 2019 07:53:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566399207; cv=none; d=google.com; s=arc-20160816; b=ss+WnqJ6iGQI4WU2jJ+5AfGh2MsJ/aXNe1kZrD4UByVIO+beUNMYGG2XYgQJp0xzOG 8R2H4D0butqAuJQpmB3zfwyrjgwtCuamBiufCIuTCfZayGkB40RKcf8Q+fFYtfJWsoAL 1wwI4pvnRpzXM4Si4DNEASe5fyYn5EfZN/Ryx7885z24gXOdHkCfW1gf2MQqa24nl93z NvBCSmHzqLP3apY24nY8d7X38DTqYDcub/xtqMeUDyMyfao6FtmsIExa6BsJ2GoXmYRe R4uWBRaEDFFtZozro3ub+pHV6zOxduoZ54KhJqzahNa425xmXKL6ElSgz4wxdQ+StxpF 6/eQ== 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=NELQabED1UbtscShW7i6y6QIH7Wp2Ag17wK7+gBaEGg=; b=kSjYMlmfLGKm7GmQlxHCw8tv+Z9gDNlgQ7fRh+Y0pA5wXCZkyk5EbaCyJu1uOFVG9q 8SznriZzrjrrX1u5QvHgKaIvWSXinlB/LtE5muBKQ0BABy239Ny/WdEzS9t2EeWbhct1 FCRRah2YYNzKYlxtNuPClj7oPhjU6uq9hnw4UqFL3KHuGP9MKZLPCtQM/UT8CXmFDEgN O/PTpqJpmcYnz4jLuOQqLzTvRZgqqgnLEgzxWgIqPhbvMkkdw/YU+mWTTxKh6aEVA8ex 6rFog6J25gvgCWavg/pfWKQv585qUpFRCG6J1hTnSpnP0WG3RZZ1RrlN8u+aup+JNAvH JtOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 d37si15298906pla.165.2019.08.21.07.53.27; Wed, 21 Aug 2019 07:53:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729612AbfHUOx0 (ORCPT + 28 others); Wed, 21 Aug 2019 10:53:26 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:4754 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727696AbfHUOxZ (ORCPT ); Wed, 21 Aug 2019 10:53:25 -0400 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id CBE1B946D84C55FF265F; Wed, 21 Aug 2019 22:53:21 +0800 (CST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.439.0; Wed, 21 Aug 2019 22:53:11 +0800 From: Jonathan Cameron To: , , , CC: Keith Busch , , "Rafael J . Wysocki" , , Andrew Morton , Dan Williams , Jonathan Cameron Subject: [PATCH 4/4] ACPI: Let ACPI know we support Generic Initiator Affinity Structures Date: Wed, 21 Aug 2019 22:52:42 +0800 Message-ID: <20190821145242.2330-5-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190821145242.2330-1-Jonathan.Cameron@huawei.com> References: <20190821145242.2330-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. Note that this currently doesn't take into account whether we have the relevant setup code for a given architecture. Do we want to make this optional, or should the initial patch set just enable it for all ACPI supporting architectures? 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 9426b9aaed86..cfa3a48f0c81 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;