Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1306695

[PATCH v4 1/4] cpufreq: powernv: Remove cpu_to_chip_id() from hot-path

Show all headers | View raw

cpu_to_chip_id() does a DT walk through to find out the chip id by taking a
contended device tree lock. This adds an unnecessary overhead in a hot-path.
So instead of cpu_to_chip_id() use PIR of the cpu to find the chip id.

Reported-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com>
---
 drivers/cpufreq/powernv-cpufreq.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/cpufreq/powernv-cpufreq.c b/drivers/cpufreq/powernv-cpufreq.c
index cb50138..597a084 100644
--- a/drivers/cpufreq/powernv-cpufreq.c
+++ b/drivers/cpufreq/powernv-cpufreq.c
@@ -39,6 +39,7 @@
 #define PMSR_PSAFE_ENABLE	(1UL << 30)
 #define PMSR_SPR_EM_DISABLE	(1UL << 31)
 #define PMSR_MAX(x)		((x >> 32) & 0xFF)
+#define pir_to_chip_id(pir)	(((pir) >> 7) & 0x3f)
 
 static struct cpufreq_frequency_table powernv_freqs[POWERNV_MAX_PSTATES+1];
 static bool rebooting, throttled, occ_reset;
@@ -312,13 +313,14 @@ static inline unsigned int get_nominal_index(void)
 static void powernv_cpufreq_throttle_check(void *data)
 {
 	unsigned int cpu = smp_processor_id();
+	unsigned int chip_id = pir_to_chip_id(hard_smp_processor_id());
 	unsigned long pmsr;
 	int pmsr_pmax, i;
 
 	pmsr = get_pmspr(SPRN_PMSR);
 
 	for (i = 0; i < nr_chips; i++)
-		if (chips[i].id == cpu_to_chip_id(cpu))
+		if (chips[i].id == chip_id)
 			break;
 
 	/* Check for Pmax Capping */
@@ -558,7 +560,8 @@ static int init_chip_info(void)
 	unsigned int prev_chip_id = UINT_MAX;
 
 	for_each_possible_cpu(cpu) {
-		unsigned int id = cpu_to_chip_id(cpu);
+		unsigned int id =
+			pir_to_chip_id(get_hard_smp_processor_id(cpu));
 
 		if (prev_chip_id != id) {
 			prev_chip_id = id;
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/2] cpufreq: powernv: Redesign the presentation of throttle notification Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-04 10:30 +0100
  [PATCH v3 2/2] cpufreq: powernv: Redesign the presentation of throttle notification Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-04 10:30 +0100
  [PATCH v3 1/2] cpufreq: powernv/tracing: Add powernv_throttle tracepoint Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-04 10:30 +0100
  Re: [PATCH v3 0/2] cpufreq: powernv: Redesign the presentation of throttle notification Stewart Smith <stewart@linux.vnet.ibm.com> - 2016-01-06 08:00 +0100
  [PATCH v4 4/4] cpufreq: powernv: Add sysfs attributes to show throttle stats Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-11 22:00 +0100
  [PATCH v4 2/4] cpufreq: powernv/tracing: Add powernv_throttle tracepoint Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-11 22:00 +0100
  [PATCH v4 1/4] cpufreq: powernv: Remove cpu_to_chip_id() from hot-path Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-11 22:00 +0100
  [PATCH v4 0/4] cpufreq: powernv: Redesign the presentation of throttle notification Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-11 22:00 +0100
    [PATCH v4 3/4] cpufreq: powernv: Add a trace print for the throttle event Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com> - 2016-01-11 22:00 +0100
    Re: [PATCH v4 0/4] cpufreq: powernv: Redesign the presentation of  throttle notification Greg KH <gregkh@linuxfoundation.org> - 2016-01-11 23:30 +0100
      Re: [PATCH v4 0/4] cpufreq: powernv: Redesign the presentation of  throttle notification Viresh Kumar <viresh.kumar@linaro.org> - 2016-01-12 03:40 +0100

csiph-web