From patchwork Wed Apr 27 18:07:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Daney X-Patchwork-Id: 66813 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp2334749qge; Wed, 27 Apr 2016 11:08:10 -0700 (PDT) X-Received: by 10.66.139.9 with SMTP id qu9mr13968154pab.101.1461780484287; Wed, 27 Apr 2016 11:08:04 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gs6si6480877pac.81.2016.04.27.11.08.04; Wed, 27 Apr 2016 11:08:04 -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; dkim=pass header.i=@gmail.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; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753786AbcD0SHz (ORCPT + 29 others); Wed, 27 Apr 2016 14:07:55 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34065 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753742AbcD0SHv (ORCPT ); Wed, 27 Apr 2016 14:07:51 -0400 Received: by mail-pa0-f68.google.com with SMTP id yl2so5678639pac.1; Wed, 27 Apr 2016 11:07:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RkNMYiRPQIPylyxPMkorrOE035Ro3Rw6pLslpyxVujo=; b=YkbeBZXNtODZdlLKNIPoiV9xiZXa08e2kG/Ll9R7+o5bUzemwJMeyh4jTcxGZACMFt QCv/a+AG7+aG+Rydq5ZejPwH2CPRatxBQ4FVzrKG/5Tao9rQWGxh6M+ix7uxPeLvhsZs LB+yAdNaV0klBlEQnqyedgmtS+IBviTuLcLjhfXAw1vu3LhO0KbeF+0lmTOB7+hEBnsr Cu/yDrwky2m7L5APmuzi+QHoEL1Ll3srlCKJ78ur7uJEg4JUl+btvgYDZ327swj+olkj 3VF5sT/4ZPrbJxs0nHLln/0sHxg+y4FdH1gxPvPeBJWxCJaOOpVKyUIBtzKOxEpfGtZl AnLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RkNMYiRPQIPylyxPMkorrOE035Ro3Rw6pLslpyxVujo=; b=URuE14Lid121vZK6M7yStabhp6c0TwV5B40WMwwwuDc133wE/Gm+67xAp5G9YaWovo 1gReF+IRBPs+zuS3agMzpPVRRmybjoMHmUFNSiUhIA6k9MvwmzocYO2g0WZocXDSNGGp 5aTtseJWoEnCt5EfWgozW+wV8k+dnqXoBTYkdLkRaDQ0QWdHR8+lJMSzMVy+vmBoQc4S 7JseKvrnV5UZUm2Hmd9L1VjaHmT40uxr8Rz4DqtY/uVGOYqpohQrM+DnqAZDT5PosAR3 qF1tz0PlQ3X6G+BhG3a8HwK7eVRA8DkyzDILtHbYUwaqV3WZ7vAimCnnzNFWluH1QT01 eiXQ== X-Gm-Message-State: AOPr4FUD+4ZYs1P9AdHSZmzwtCj1tC1WBcjWs1QxyWKunzR5OtFoMUvQkSAd4M9l7Q+hbw== X-Received: by 10.66.63.104 with SMTP id f8mr13941861pas.109.1461780465772; Wed, 27 Apr 2016 11:07:45 -0700 (PDT) Received: from dl.caveonetworks.com ([64.2.3.194]) by smtp.gmail.com with ESMTPSA id u65sm8265814pfa.9.2016.04.27.11.07.35 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Apr 2016 11:07:40 -0700 (PDT) Received: from dl.caveonetworks.com (localhost.localdomain [127.0.0.1]) by dl.caveonetworks.com (8.14.5/8.14.5) with ESMTP id u3RI7ZjH027287; Wed, 27 Apr 2016 11:07:35 -0700 Received: (from ddaney@localhost) by dl.caveonetworks.com (8.14.5/8.14.5/Submit) id u3RI7Yvh027286; Wed, 27 Apr 2016 11:07:34 -0700 From: David Daney To: Will Deacon , linux-arm-kernel@lists.infradead.org, Mark Rutland , Catalin Marinas , Tony Luck , Fenghua Yu , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Hanjun Guo , Marc Zyngier , linux-ia64@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org Cc: linux-kernel@vger.kernel.org, Robert Richter , David Daney Subject: [PATCH v6 14/14] acpi, numa: Enable ACPI based NUMA on ARM64 Date: Wed, 27 Apr 2016 11:07:16 -0700 Message-Id: <1461780436-27182-15-git-send-email-ddaney.cavm@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> References: <1461780436-27182-1-git-send-email-ddaney.cavm@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hanjun Guo Add function needed for cpu to node mapping, and enable ACPI based NUMA for ARM64 in Kconfig Signed-off-by: Hanjun Guo Signed-off-by: Robert Richter [david.daney@cavium.com added ACPI_NUMA default to y for ARM64] Signed-off-by: David Daney --- drivers/acpi/Kconfig | 4 ++-- drivers/acpi/numa.c | 35 +++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 17 ++++++++++++++++- 3 files changed, 53 insertions(+), 3 deletions(-) -- 1.7.11.7 Acked-by: Catalin Marinas diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index fa91ea2..5a3b161 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -291,8 +291,8 @@ config ACPI_THERMAL config ACPI_NUMA bool "NUMA support" depends on NUMA - depends on (X86 || IA64) - default y if IA64_GENERIC || IA64_SGI_SN2 + depends on (X86 || IA64 || ARM64) + default y if IA64_GENERIC || IA64_SGI_SN2 || ARM64 config ACPI_CUSTOM_DSDT_FILE string "Custom DSDT Table file to include" diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index 50c8f42..f6696ac 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -170,6 +170,18 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) } break; + case ACPI_SRAT_TYPE_GICC_AFFINITY: + { + struct acpi_srat_gicc_affinity *p = + (struct acpi_srat_gicc_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_GICC_ENABLED) ? + "enabled" : "disabled"); + } + break; + default: pr_warn("Found unsupported SRAT entry (type = 0x%x)\n", header->type); @@ -360,6 +372,24 @@ acpi_parse_processor_affinity(struct acpi_subtable_header *header, return 0; } +static int __init +acpi_parse_gicc_affinity(struct acpi_subtable_header *header, + const unsigned long end) +{ + struct acpi_srat_gicc_affinity *processor_affinity; + + processor_affinity = (struct acpi_srat_gicc_affinity *)header; + if (!processor_affinity) + return -EINVAL; + + acpi_table_print_srat_entry(header); + + /* let architecture-dependent part to do it */ + acpi_numa_gicc_affinity_init(processor_affinity); + + return 0; +} + static int __initdata parsed_numa_memblks; static int __init @@ -404,6 +434,9 @@ int __init acpi_numa_init(void) { int cnt = 0; + if (acpi_disabled) + return -EINVAL; + /* * Should not limit number with cpu num that is from NR_CPUS or nr_cpus= * SRAT cpu entries could have different order with that in MADT. @@ -416,6 +449,8 @@ int __init acpi_numa_init(void) acpi_parse_x2apic_affinity, 0); acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, acpi_parse_processor_affinity, 0); + acpi_table_parse_srat(ACPI_SRAT_TYPE_GICC_AFFINITY, + acpi_parse_gicc_affinity, 0); cnt = acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index ab6fd96..af34064 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -239,10 +239,25 @@ int acpi_table_parse_madt(enum acpi_madt_type id, int acpi_parse_mcfg (struct acpi_table_header *header); void acpi_table_print_madt_entry (struct acpi_subtable_header *madt); -/* the following four functions are architecture-dependent */ +/* the following numa functions are architecture-dependent */ void acpi_numa_slit_init (struct acpi_table_slit *slit); + +#if defined(CONFIG_X86) || defined(CONFIG_IA64) void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); +#else +static inline void +acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) { } +#endif + void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa); + +#ifdef CONFIG_ARM64 +void acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa); +#else +static inline void +acpi_numa_gicc_affinity_init(struct acpi_srat_gicc_affinity *pa) { } +#endif + int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); #ifndef PHYS_CPUID_INVALID