From: Jeremy Linton <jeremy.linton@arm.com>
To: linux-acpi@vger.kernel.org
Cc: Sudeep.Holla@arm.com, linux-arm-kernel@lists.infradead.org,
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, jhugo@codeaurora.org,
ard.biesheuvel@linaro.org, Jeremy Linton <jeremy.linton@arm.com>
Subject: [PATCH v9 08/12] arm64: Add support for ACPI based firmware tables
Date: Fri, 11 May 2018 18:58:03 -0500 [thread overview]
Message-ID: <20180511235807.30834-9-jeremy.linton@arm.com> (raw)
In-Reply-To: <20180511235807.30834-1-jeremy.linton@arm.com>
The /sys cache entries should support ACPI/PPTT generated cache
topology information. For arm64, if ACPI is enabled, determine
the max number of cache levels and populate them using the PPTT
table if one is available.
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Vijaya Kumar K <vkilari@codeaurora.org>
Tested-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
Tested-by: Tomasz Nowicki <Tomasz.Nowicki@cavium.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm64/kernel/cacheinfo.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c
index 380f2e2fbed5..0bf0a835122f 100644
--- a/arch/arm64/kernel/cacheinfo.c
+++ b/arch/arm64/kernel/cacheinfo.c
@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <linux/acpi.h>
#include <linux/cacheinfo.h>
#include <linux/of.h>
@@ -46,7 +47,7 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,
static int __init_cache_level(unsigned int cpu)
{
- unsigned int ctype, level, leaves, of_level;
+ unsigned int ctype, level, leaves, fw_level;
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
for (level = 1, leaves = 0; level <= MAX_CACHE_LEVEL; level++) {
@@ -59,15 +60,19 @@ static int __init_cache_level(unsigned int cpu)
leaves += (ctype == CACHE_TYPE_SEPARATE) ? 2 : 1;
}
- of_level = of_find_last_cache_level(cpu);
- if (level < of_level) {
+ if (acpi_disabled)
+ fw_level = of_find_last_cache_level(cpu);
+ else
+ fw_level = acpi_find_last_cache_level(cpu);
+
+ if (level < fw_level) {
/*
* some external caches not specified in CLIDR_EL1
* the information may be available in the device tree
* only unified external caches are considered here
*/
- leaves += (of_level - level);
- level = of_level;
+ leaves += (fw_level - level);
+ level = fw_level;
}
this_cpu_ci->num_levels = level;
--
2.13.6
next prev parent reply other threads:[~2018-05-11 23:58 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-11 23:57 [PATCH v9 00/12] Support PPTT for ARM64 Jeremy Linton
2018-05-11 23:57 ` [PATCH v9 01/12] drivers: base: cacheinfo: move cache_setup_of_node() Jeremy Linton
2018-05-11 23:57 ` [PATCH v9 02/12] drivers: base: cacheinfo: setup DT cache properties early Jeremy Linton
2018-05-15 17:15 ` Jeremy Linton
2018-05-15 19:32 ` Andy Shevchenko
2018-05-16 10:56 ` Sudeep Holla
2018-05-17 15:47 ` Sudeep Holla
2018-05-18 21:50 ` Andy Shevchenko
2018-05-21 9:27 ` Sudeep Holla
2018-05-21 10:15 ` Sudeep Holla
2018-05-21 10:32 ` [PATCH] drivers: base: cacheinfo: use OF property_read_u64 instead of get_property,read_number Sudeep Holla
2018-05-21 12:53 ` [PATCH v2] drivers: base: cacheinfo: use OF property_read_u32 " Sudeep Holla
2018-06-05 16:21 ` Andy Shevchenko
2018-06-05 16:26 ` Sudeep Holla
2018-06-05 16:34 ` Andy Shevchenko
2018-05-17 6:54 ` [PATCH v9 02/12] drivers: base: cacheinfo: setup DT cache properties early Greg KH
2018-05-17 9:08 ` Sudeep Holla
2018-05-17 9:35 ` Greg KH
2018-05-11 23:57 ` [PATCH v9 03/12] cacheinfo: rename of_node to fw_token Jeremy Linton
2018-05-11 23:57 ` [PATCH v9 04/12] arm64/acpi: Create arch specific cpu to acpi id helper Jeremy Linton
2018-05-14 14:41 ` Sudeep Holla
2018-05-11 23:58 ` [PATCH v9 05/12] ACPI/PPTT: Add Processor Properties Topology Table parsing Jeremy Linton
2018-05-12 10:09 ` Rafael J. Wysocki
2018-05-15 21:42 ` Jeremy Linton
2018-05-16 8:24 ` Rafael J. Wysocki
2018-05-11 23:58 ` [PATCH v9 06/12] ACPI: Enable PPTT support on ARM64 Jeremy Linton
2018-05-11 23:58 ` [PATCH v9 07/12] drivers: base cacheinfo: Add support for ACPI based firmware tables Jeremy Linton
2018-05-11 23:58 ` Jeremy Linton [this message]
2018-05-11 23:58 ` [PATCH v9 09/12] arm64: topology: rename cluster_id Jeremy Linton
2018-05-11 23:58 ` [PATCH v9 10/12] arm64: topology: enable ACPI/PPTT based CPU topology Jeremy Linton
2018-05-11 23:58 ` [PATCH v9 11/12] ACPI: Add PPTT to injectable table list Jeremy Linton
2018-05-12 10:10 ` Rafael J. Wysocki
2018-05-11 23:58 ` [PATCH v9 12/12] arm64: topology: divorce MC scheduling domain from core_siblings Jeremy Linton
2018-05-17 17:05 ` [PATCH v9 00/12] Support PPTT for ARM64 Catalin Marinas
2018-05-29 10:48 ` Geert Uytterhoeven
2018-05-29 11:14 ` Sudeep Holla
2018-05-29 11:56 ` Geert Uytterhoeven
2018-05-29 13:18 ` Sudeep Holla
2018-05-29 15:08 ` Will Deacon
2018-05-29 15:51 ` Geert Uytterhoeven
2018-05-29 17:08 ` Robin Murphy
2018-05-29 17:18 ` Geert Uytterhoeven
2018-05-29 17:31 ` Sudeep Holla
2018-05-29 20:16 ` Will Deacon
2018-05-29 20:48 ` Jeremy Linton
2018-05-29 21:52 ` Jeremy Linton
2018-05-30 13:24 ` Sudeep Holla
2018-05-29 15:23 ` Jeremy Linton
2018-05-29 15:50 ` Geert Uytterhoeven
2018-05-30 8:52 ` Morten Rasmussen
2018-06-05 13:55 ` [PATCH 1/3] Revert "arm64: topology: divorce MC scheduling domain from core_siblings" Sudeep Holla
2018-06-05 13:55 ` [PATCH 2/3] ACPI / PPTT: fix build when CONFIG_ACPI_PPTT is not enabled Sudeep Holla
2018-06-05 13:55 ` [PATCH 3/3] arm64: disable ACPI PPTT support temporarily Sudeep Holla
2018-06-05 14:09 ` [PATCH 1/3] Revert "arm64: topology: divorce MC scheduling domain from core_siblings" Geert Uytterhoeven
2018-06-05 14:12 ` Sudeep Holla
2018-06-04 15:12 ` [PATCH v9 00/12] Support PPTT for ARM64 Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180511235807.30834-9-jeremy.linton@arm.com \
--to=jeremy.linton@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Dietmar.Eggemann@arm.com \
--cc=Lorenzo.Pieralisi@arm.com \
--cc=Mark.Rutland@arm.com \
--cc=Morten.Rasmussen@arm.com \
--cc=Sudeep.Holla@arm.com \
--cc=Will.Deacon@arm.com \
--cc=ahs3@redhat.com \
--cc=ard.biesheuvel@linaro.org \
--cc=austinwc@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=hanjun.guo@linaro.org \
--cc=jhugo@codeaurora.org \
--cc=john.garry@huawei.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@sifive.com \
--cc=rjw@rjwysocki.net \
--cc=tnowicki@caviumnetworks.com \
--cc=vkilari@codeaurora.org \
--cc=wangxiongfeng2@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).