From patchwork Wed Feb 28 22:06:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 130075 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp271056lja; Wed, 28 Feb 2018 14:08:36 -0800 (PST) X-Google-Smtp-Source: AG47ELvchv620lMWncXNSbQRJRb9UFuA8bAejgVo3iNjCFDCWOBya0Qvr1sVXYMO4doLfCHF3HYm X-Received: by 2002:a17:902:6d0f:: with SMTP id s15-v6mr12421519plk.375.1519855716700; Wed, 28 Feb 2018 14:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519855716; cv=none; d=google.com; s=arc-20160816; b=FtTjGGbl23lGZIoUaCkMfv/zsRt3/OJqkewVR6qjMBfXsYkmaKFaTTzmnI6Fcn+Iba aItEMY5VCH5CXHgHThwpyLtW65MBl6u5aatEl9zm3R+9GEND+EN6CfvRvrM2hGty5vrS ntBW1v0GWw45fH33cGaM4JAwfJM9XZJj+xnWy4NXnH0qmku1ngQzuqxyOW4WqqN/Qcjh YNtkrUXYNNk/BfMglGxMMYJjfLHHUgjTViXQawxGhUv4AnDkaTrgWdpFvtr386Rr1633 FEZlnEKr7o731r0OPROjwaHPq9g3JuYEo36YWZiMnH/SUm4PkkFRTARJL4qspvfBJvQ3 Qy+g== 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=g48U7T9obHvyujG/MgRlNwxncW7fdznKGiUwChjx5Gc=; b=RnPvZ3g1cENmsNfc4r1nnuNGZkCIPqXsCB8DMt7YaO/pZWPUz8D83jKC9V/b2Te+Gx 6B4Ul5dhE0ydSuPt7gaQNWwkOdQPgGnLlBBor+b9B+yKCv9l9Xch9BQktxKwh3JXyncY 3ARutPZ6TpQFcmPuUDguSuAnNIKvgb66oEdUdRd1Rx+kRW8di6G/STPfv88Mq+pgtvA0 Zlj++LryVszCahQjlvBj6reoZqt9aL89cxmH5S4HNGExhz2Qt7BCdJbhNLIGTVTtNgKh ETKerezzQ3DjOCp4jC6bGj8l6XENOlol40suGVTr1+4ONX2U2rok7lS9wgwDYQXaODPI uDqw== 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 v10-v6si2036475plo.61.2018.02.28.14.08.36; Wed, 28 Feb 2018 14:08:36 -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 S935374AbeB1WHb (ORCPT + 28 others); Wed, 28 Feb 2018 17:07:31 -0500 Received: from foss.arm.com ([217.140.101.70]:58058 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935325AbeB1WHY (ORCPT ); Wed, 28 Feb 2018 17:07:24 -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 4501C15BF; Wed, 28 Feb 2018 14:07:24 -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 4D8F03F246; Wed, 28 Feb 2018 14:07:23 -0800 (PST) From: Jeremy Linton To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, sudeep.holla@arm.com, lorenzo.pieralisi@arm.com, hanjun.guo@linaro.org, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com, gregkh@linuxfoundation.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, wangxiongfeng2@huawei.com, vkilari@codeaurora.org, ahs3@redhat.com, dietmar.eggemann@arm.com, morten.rasmussen@arm.com, palmer@sifive.com, lenb@kernel.org, john.garry@huawei.com, austinwc@codeaurora.org, tnowicki@caviumnetworks.com, Jeremy Linton Subject: [PATCH v7 07/13] drivers: base cacheinfo: Add support for ACPI based firmware tables Date: Wed, 28 Feb 2018 16:06:13 -0600 Message-Id: <20180228220619.6992-8-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180228220619.6992-1-jeremy.linton@arm.com> References: <20180228220619.6992-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Call ACPI cache parsing routines from base cacheinfo code if ACPI is enable. 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 | 14 ++++++++++---- include/linux/cacheinfo.h | 9 +++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) -- 2.13.6 diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index 883e4318c6cd..c98f94ebd272 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -343,6 +343,7 @@ static void update_cache_properties(struct cacheinfo *this_leaf, { int valid_flags = 0; + this_leaf->fw_token = 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 597aacb233fc..2880e2ab01f5 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -206,7 +206,7 @@ static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf, struct cacheinfo *sib_leaf) { /* - * For non-DT systems, assume unique level 1 cache, system-wide + * For non-DT/ACPI systems, assume unique level 1 caches, system-wide * shared caches for all other levels. This will be used only if * arch specific code has not populated shared_cpu_map */ @@ -214,6 +214,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); @@ -227,8 +232,8 @@ static int cache_shared_cpu_map_setup(unsigned int cpu) 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; + ret = cache_setup_acpi(cpu); + if (ret) return ret; @@ -279,7 +284,8 @@ static void cache_shared_cpu_map_remove(unsigned int cpu) cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map); cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map); } - of_node_put(this_leaf->fw_token); + if (of_have_populated_dt()) + of_node_put(this_leaf->fw_token); } } diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h index 0c6f658054d2..1446d3f053a2 100644 --- a/include/linux/cacheinfo.h +++ b/include/linux/cacheinfo.h @@ -97,6 +97,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);