All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeremy Linton <jeremy.linton@arm.com>
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, mturquette@baylibre.com,
	sboyd@codeaurora.org, viresh.kumar@linaro.org,
	mark.rutland@arm.com, linux-kernel@vger.kernel.org,
	linux-clk@vger.kernel.org, linux-pm@vger.kernel.org,
	jhugo@codeaurora.org, wangxiongfeng2@huawei.com,
	Jonathan.Zhang@cavium.com, ahs3@redhat.com,
	Jeremy Linton <jeremy.linton@arm.com>
Subject: [PATCH v2 5/6] arm64: Fixup users of topology_physical_package_id
Date: Tue, 19 Sep 2017 13:47:50 -0500	[thread overview]
Message-ID: <20170919184751.25110-6-jeremy.linton@arm.com> (raw)
In-Reply-To: <20170919184751.25110-1-jeremy.linton@arm.com>

There are a few arm64 specific users (cpufreq, psci, etc) which really
want the cluster rather than the topology_physical_package_id(). Lets
convert those users to topology_cod_id(). That way when we start
differentiating the socket/cluster they will continue to behave correctly.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 drivers/clk/clk-mb86s7x.c        | 2 +-
 drivers/cpufreq/arm_big_little.c | 2 +-
 drivers/firmware/psci_checker.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/clk-mb86s7x.c b/drivers/clk/clk-mb86s7x.c
index 2a83a3ff1d09..da4b456f9afc 100644
--- a/drivers/clk/clk-mb86s7x.c
+++ b/drivers/clk/clk-mb86s7x.c
@@ -338,7 +338,7 @@ static struct clk_hw *mb86s7x_clclk_register(struct device *cpu_dev)
 		return ERR_PTR(-ENOMEM);
 
 	clc->hw.init = &init;
-	clc->cluster = topology_physical_package_id(cpu_dev->id);
+	clc->cluster = topology_cod_id(cpu_dev->id);
 
 	init.name = dev_name(cpu_dev);
 	init.ops = &clk_clc_ops;
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
index 17504129fd77..6ee69b3820de 100644
--- a/drivers/cpufreq/arm_big_little.c
+++ b/drivers/cpufreq/arm_big_little.c
@@ -72,7 +72,7 @@ static struct mutex cluster_lock[MAX_CLUSTERS];
 
 static inline int raw_cpu_to_cluster(int cpu)
 {
-	return topology_physical_package_id(cpu);
+	return topology_cod_id(cpu);
 }
 
 static inline int cpu_to_cluster(int cpu)
diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci_checker.c
index 6523ce962865..a9465f5d344a 100644
--- a/drivers/firmware/psci_checker.c
+++ b/drivers/firmware/psci_checker.c
@@ -202,7 +202,7 @@ static int hotplug_tests(void)
 	 */
 	for (i = 0; i < nb_cluster; ++i) {
 		int cluster_id =
-			topology_physical_package_id(cpumask_any(clusters[i]));
+			topology_cod_id(cpumask_any(clusters[i]));
 		ssize_t len = cpumap_print_to_pagebuf(true, page_buf,
 						      clusters[i]);
 		/* Remove trailing newline. */
-- 
2.13.5

WARNING: multiple messages have this Message-ID (diff)
From: jeremy.linton@arm.com (Jeremy Linton)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/6] arm64: Fixup users of topology_physical_package_id
Date: Tue, 19 Sep 2017 13:47:50 -0500	[thread overview]
Message-ID: <20170919184751.25110-6-jeremy.linton@arm.com> (raw)
In-Reply-To: <20170919184751.25110-1-jeremy.linton@arm.com>

There are a few arm64 specific users (cpufreq, psci, etc) which really
want the cluster rather than the topology_physical_package_id(). Lets
convert those users to topology_cod_id(). That way when we start
differentiating the socket/cluster they will continue to behave correctly.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
 drivers/clk/clk-mb86s7x.c        | 2 +-
 drivers/cpufreq/arm_big_little.c | 2 +-
 drivers/firmware/psci_checker.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/clk-mb86s7x.c b/drivers/clk/clk-mb86s7x.c
index 2a83a3ff1d09..da4b456f9afc 100644
--- a/drivers/clk/clk-mb86s7x.c
+++ b/drivers/clk/clk-mb86s7x.c
@@ -338,7 +338,7 @@ static struct clk_hw *mb86s7x_clclk_register(struct device *cpu_dev)
 		return ERR_PTR(-ENOMEM);
 
 	clc->hw.init = &init;
-	clc->cluster = topology_physical_package_id(cpu_dev->id);
+	clc->cluster = topology_cod_id(cpu_dev->id);
 
 	init.name = dev_name(cpu_dev);
 	init.ops = &clk_clc_ops;
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c
index 17504129fd77..6ee69b3820de 100644
--- a/drivers/cpufreq/arm_big_little.c
+++ b/drivers/cpufreq/arm_big_little.c
@@ -72,7 +72,7 @@ static struct mutex cluster_lock[MAX_CLUSTERS];
 
 static inline int raw_cpu_to_cluster(int cpu)
 {
-	return topology_physical_package_id(cpu);
+	return topology_cod_id(cpu);
 }
 
 static inline int cpu_to_cluster(int cpu)
diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci_checker.c
index 6523ce962865..a9465f5d344a 100644
--- a/drivers/firmware/psci_checker.c
+++ b/drivers/firmware/psci_checker.c
@@ -202,7 +202,7 @@ static int hotplug_tests(void)
 	 */
 	for (i = 0; i < nb_cluster; ++i) {
 		int cluster_id =
-			topology_physical_package_id(cpumask_any(clusters[i]));
+			topology_cod_id(cpumask_any(clusters[i]));
 		ssize_t len = cpumap_print_to_pagebuf(true, page_buf,
 						      clusters[i]);
 		/* Remove trailing newline. */
-- 
2.13.5

  parent reply	other threads:[~2017-09-19 18:47 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-19 18:47 [PATCH v2 0/6] Support PPTT for ARM64 Jeremy Linton
2017-09-19 18:47 ` Jeremy Linton
2017-09-19 18:47 ` Jeremy Linton
2017-09-19 18:47 ` [PATCH v2 1/6] ACPI/PPTT: Add Processor Properties Topology Table parsing Jeremy Linton
2017-09-19 18:47   ` Jeremy Linton
2017-09-20  7:15   ` Xiongfeng Wang
2017-09-20  7:15     ` Xiongfeng Wang
2017-09-20  7:15     ` Xiongfeng Wang
2017-09-20  7:15     ` Xiongfeng Wang
2017-09-21 18:48     ` Jeremy Linton
2017-09-21 18:48       ` Jeremy Linton
2017-09-22  1:15       ` Xiongfeng Wang
2017-09-22  1:15         ` Xiongfeng Wang
2017-09-22  1:15         ` Xiongfeng Wang
2017-09-19 18:47 ` [PATCH v2 2/6] ACPI: Enable PPTT support on ARM64 Jeremy Linton
2017-09-19 18:47   ` Jeremy Linton
2017-09-19 18:47   ` Jeremy Linton
2017-09-19 18:47 ` [PATCH v2 3/6] drivers: base: cacheinfo: arm64: Add support for ACPI based firmware tables Jeremy Linton
2017-09-19 18:47   ` Jeremy Linton
2017-09-20 15:45   ` Jeremy Linton
2017-09-20 15:45     ` Jeremy Linton
2017-09-19 18:47 ` [PATCH v2 4/6] Topology: Add cluster on die macros and arm64 decoding Jeremy Linton
2017-09-19 18:47   ` Jeremy Linton
2017-09-19 18:47 ` Jeremy Linton [this message]
2017-09-19 18:47   ` [PATCH v2 5/6] arm64: Fixup users of topology_physical_package_id Jeremy Linton
2017-10-02 21:56   ` Stephen Boyd
2017-10-02 21:56     ` Stephen Boyd
2017-09-19 18:47 ` [PATCH v2 6/6] arm64: topology: Enable ACPI/PPTT based CPU topology Jeremy Linton
2017-09-19 18:47   ` Jeremy Linton
2017-09-20  6:56 ` [PATCH v2 0/6] Support PPTT for ARM64 Xiongfeng Wang
2017-09-20  6:56   ` Xiongfeng Wang
2017-09-20  6:56   ` Xiongfeng Wang

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=20170919184751.25110-6-jeremy.linton@arm.com \
    --to=jeremy.linton@arm.com \
    --cc=Jonathan.Zhang@cavium.com \
    --cc=ahs3@redhat.com \
    --cc=catalin.marinas@arm.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hanjun.guo@linaro.org \
    --cc=jhugo@codeaurora.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=mturquette@baylibre.com \
    --cc=rjw@rjwysocki.net \
    --cc=sboyd@codeaurora.org \
    --cc=sudeep.holla@arm.com \
    --cc=viresh.kumar@linaro.org \
    --cc=wangxiongfeng2@huawei.com \
    --cc=will.deacon@arm.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.