ACPI: Support Generic Initiator only domains

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 <Jonathan.Cameron@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
index 2c9a66c203ff5b887490a0cbbf409409d92a2375..979e76b94e54ccb0966de196040cbbd61a868b96 100644 (file)
--- a/drivers/acpi/numa/srat.c
+++ b/drivers/acpi/numa/srat.c
@@ -130,6 +130,36 @@ 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;
+
+               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
+                        */
+                       pr_debug("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);
@@ -332,6 +362,41 @@ acpi_parse_gicc_affinity(union acpi_subtable_headers *header,
        return 0;
 }
 
+#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
+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;
+}
+#else
+static int __init
+acpi_parse_gi_affinity(union acpi_subtable_headers *header,
+                      const unsigned long end)
+{
+       return 0;
+}
+#endif /* defined(CONFIG_X86) || defined (CONFIG_ARM64) */
+
 static int __initdata parsed_numa_memblks;
 
 static int __init
@@ -385,7 +450,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;
@@ -394,6 +459,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 508b80f6329b4e06f1fbd4958ea006f146334c91..53383f1f683c4093170ab276a8725a82c52df124 100644 (file)
--- 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/linux/nodemask.h b/include/linux/nodemask.h
index 27e7fa36f707fb6307fdd0abd4e3114e2e90ae12..3334ce0563355ae799084b9e9caade7792c64b2d 100644 (file)
--- 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 has one or more Generic Initiators */
        NR_NODE_STATES
 };