From patchwork Fri Dec 1 22:23:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 120403 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1705991qgn; Fri, 1 Dec 2017 14:24:03 -0800 (PST) X-Google-Smtp-Source: AGs4zMZR0LcBzD6vrH8lpADJGWERoLR86LNTkMoxoAevldUuBDOfJ8OMqYBtD1MeqSLgj72etbAi X-Received: by 10.99.127.25 with SMTP id a25mr7182815pgd.10.1512167043875; Fri, 01 Dec 2017 14:24:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512167043; cv=none; d=google.com; s=arc-20160816; b=rotUBklrnOouurxT1H9Wy00BU5E9Qfr8RPxoYWWd4zTNNbB9egP4gfnQ8q8CIf4pHg DhmSF4PqtNJso9BrloHxPmBWiY3Ar/93DZTm/GsVQbl+mfyNqEWzTbFAieC8f5x9nKnT tRA7f+WPGWKi0HRj8OLzi+QNekdVVOvWFRdSUnGog/yDLW6yHG2yf6WvGllm8SrvQ5YP qZdmiqvHuTgpWhVjEr01HXYQZ6AeWeSQSiXhU/DgXOAVIT5StrF8H3xFpon3ocl4NNyc Z/lVcvD+UpoxiEIxDObKx4i1IbeB3atXwBjxhk4pL9EQFNRoqO0VW+06H1ItXwtpIXJY 10iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=PjOYFjQ7z8nQAwMhBcMkd7ArEJ/MpgWc/hpZ9IPNmGE=; b=OpKyHYXmCsFC5hKNLqj7nHY2A0wAnV8fT8uV+zaMsX7p4BzqsG7ebS4VpU6fyCNzTz 36CBFl9C5xrUbxL+b167mHM9Nh8yJnF9XlK57s+87gEDVfTXO4eHxUkuTJN6ejkTHP4h r7W279bXv59bj0PPkbIhQUCWdhdc3q7XiMBoHjpgqZpvWtWH1bSe+7O3a+zPeaTaBWQh 9A79bf00GmUSZzwxPA9dTvr0eEl7XEiRwh49dTsewL1ER441yEzL5/jXnLTivucCpOKT wJQgK8PUOvuwicxtRdUwU5AcO6YkAJLuxeJTooH6YpIts58nYT6hh4NQOFM+y+s4ttDk 8+9A== 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 s189si5460375pgb.104.2017.12.01.14.24.03; Fri, 01 Dec 2017 14:24:03 -0800 (PST) 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 S1751745AbdLAWYC (ORCPT + 28 others); Fri, 1 Dec 2017 17:24:02 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:47056 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560AbdLAWYA (ORCPT ); Fri, 1 Dec 2017 17:24:00 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9D1251610; Fri, 1 Dec 2017 14:23:59 -0800 (PST) Received: from beelzebub.austin.arm.com (beelzebub.austin.arm.com [10.118.12.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B7F113F246; Fri, 1 Dec 2017 14:23:58 -0800 (PST) From: Jeremy Linton To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, sudeep.holla@arm.com, hanjun.guo@linaro.org, lorenzo.pieralisi@arm.com, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com, gregkh@linuxfoundation.org, viresh.kumar@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, jhugo@codeaurora.org, wangxiongfeng2@huawei.com, Jonathan.Zhang@cavium.com, ahs3@redhat.com, Jayachandran.Nair@cavium.com, austinwc@codeaurora.org, lenb@kernel.org, Jeremy Linton Subject: [PATCH v5 4/9] drivers: base cacheinfo: Add support for ACPI based firmware tables Date: Fri, 1 Dec 2017 16:23:25 -0600 Message-Id: <20171201222330.18863-5-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171201222330.18863-1-jeremy.linton@arm.com> References: <20171201222330.18863-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a entry to to struct cacheinfo to maintain a reference to the PPTT node which can be used to match identical caches across cores. Also stub out cache_setup_acpi() so that individual architectures can enable ACPI topology parsing. Signed-off-by: Jeremy Linton --- drivers/acpi/pptt.c | 1 + drivers/base/cacheinfo.c | 20 ++++++++++++++------ include/linux/cacheinfo.h | 13 ++++++++++++- 3 files changed, 27 insertions(+), 7 deletions(-) -- 2.13.5 diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index 0f8a1631af33..a35e457cefb7 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -329,6 +329,7 @@ static void update_cache_properties(struct cacheinfo *this_leaf, { int valid_flags = 0; + this_leaf->firmware_node = cpu_node; if (found_cache->flags & ACPI_PPTT_SIZE_PROPERTY_VALID) { this_leaf->size = found_cache->size; valid_flags++; diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index eb3af2739537..ba89f9310e6f 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -86,7 +86,10 @@ static int cache_setup_of_node(unsigned int cpu) static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf, struct cacheinfo *sib_leaf) { - return sib_leaf->of_node == this_leaf->of_node; + if (acpi_disabled) + return sib_leaf->of_node == this_leaf->of_node; + else + return sib_leaf->firmware_node == this_leaf->firmware_node; } /* OF properties to query for a given cache type */ @@ -215,6 +218,11 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf, } #endif +int __weak cache_setup_acpi(unsigned int cpu) +{ + return -ENOTSUPP; +} + static int cache_shared_cpu_map_setup(unsigned int cpu) { struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); @@ -225,11 +233,11 @@ static int cache_shared_cpu_map_setup(unsigned int cpu) if (this_cpu_ci->cpu_map_populated) return 0; - if (of_have_populated_dt()) + if (!acpi_disabled) + ret = cache_setup_acpi(cpu); + else if (of_have_populated_dt()) ret = cache_setup_of_node(cpu); - else if (!acpi_disabled) - /* No cache property/hierarchy support yet in ACPI */ - ret = -ENOTSUPP; + if (ret) return ret; @@ -286,7 +294,7 @@ static void cache_shared_cpu_map_remove(unsigned int cpu) static void cache_override_properties(unsigned int cpu) { - if (of_have_populated_dt()) + if (acpi_disabled && of_have_populated_dt()) return cache_of_override_properties(cpu); } diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h index 3d9805297cda..7ebff157ae6c 100644 --- a/include/linux/cacheinfo.h +++ b/include/linux/cacheinfo.h @@ -37,6 +37,8 @@ enum cache_type { * @of_node: if devicetree is used, this represents either the cpu node in * case there's no explicit cache node or the cache node itself in the * device tree + * @firmware_node: When not using DT, this may contain pointers to other + * firmware based values. Particularly ACPI/PPTT unique values. * @disable_sysfs: indicates whether this node is visible to the user via * sysfs or not * @priv: pointer to any private data structure specific to particular @@ -65,8 +67,8 @@ struct cacheinfo { #define CACHE_ALLOCATE_POLICY_MASK \ (CACHE_READ_ALLOCATE | CACHE_WRITE_ALLOCATE) #define CACHE_ID BIT(4) - struct device_node *of_node; + void *firmware_node; bool disable_sysfs; void *priv; }; @@ -99,6 +101,15 @@ int func(unsigned int cpu) \ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu); int init_cache_level(unsigned int cpu); int populate_cache_leaves(unsigned int cpu); +int cache_setup_acpi(unsigned int cpu); +int acpi_find_last_cache_level(unsigned int cpu); +#ifndef CONFIG_ACPI +int acpi_find_last_cache_level(unsigned int cpu) +{ + /*ACPI kernels should be built with PPTT support*/ + return 0; +} +#endif const struct attribute_group *cache_get_priv_group(struct cacheinfo *this_leaf);