Skip to contentSkip to conversation

powerpc powernv platform support

PATCH In review Stewart Smith 2 participants 4 messages Nov 27, 2015 – Dec 9, 2015

lore
Share & tools
lore

Stewart Smith

author
#0 lore raw

cover powerpc powernv platform support

Hi!

These two patches get powertop to work on current powernv machines.

These are POWER8 based systems from IBM (and others) running OPAL firmware.

The first patch correctly parses /proc/cpuinfo so information about processors and pstates is displayed (at all).

The second uses the existing userspace interface for getting power consumption.

Stewart Smith (2):
cpu: support powerpc /proc/cpuinfo
Add support for power consumption sensors through opal-sensors sysfs

 src/Makefile.am                  |  2 ++
 src/cpu/cpu.cpp                  | 20 ++++++----------
 src/measurement/measurement.cpp  | 14 +++++++++++
 src/measurement/opal-sensors.cpp | 50 ++++++++++++++++++++++++++++++++++++++++
 src/measurement/opal-sensors.h   | 41 ++++++++++++++++++++++++++++++++
 5 files changed, 114 insertions(+), 13 deletions(-)
 create mode 100644 src/measurement/opal-sensors.cpp
 create mode 100644 src/measurement/opal-sensors.h
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 1/2 cpu: support powerpc /proc/cpuinfo

Clean up duplicate code added for ARM and add support for what seems to be a good deliminator on ppc64.

This patch makes powertop pick up CPUs on powernv platform.

Signed-off-by Stewart Smith <stewart(a)linux.vnet.ibm.com>
---
 src/cpu/cpu.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
src/cpu/cpu.cpp +7 -13
index 9ca320f50449..64e1d3d9feab 100644
@@ -285,19 +285,13 @@ void enumerate_cpus(void)
 				model = strtoull(c, NULL, 10);
 			}
 		}
-		if (strncasecmp(line, "bogomips\t", 9) == 0) {
-			if (number == -1) {
-				/* Not all /proc/cpuinfo include "processor\t". */
-				number = 0;
-			}
-			if (number >= 0) {
-				handle_one_cpu(number, vendor, family, model);
-				set_max_cpu(number);
-				number = -2;
-			}
-		}
-		/* bogomips is removed in ARM, using CPU revision to enumerate */
-		if (strncasecmp(line, "CPU revision\t", 13) == 0) {
+		/* on x86 and others 'bogomips' is last
+		 * on ARM it *can* be bogomips, or 'CPU revision'
+		 * on POWER, it's revision
+		 */
+		if (strncasecmp(line, "bogomips\t", 9) == 0
+		    || strncasecmp(line, "CPU revision\t", 13) == 0
+		    || strncmp(line, "revision", 7) == 0) {
 			if (number == -1) {
 				/* Not all /proc/cpuinfo include "processor\t". */
 				number = 0;
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 2/2 Add support for power consumption sensors through opal-sensors sysfs

In reply to Stewart Smith

The OPAL firmware on PowerNV (non-virtualized POWER) may export certain sensors in the system through sysfs entries.

While arguably we *should* go and support the more standard locations in sysfs to put power information (which existing powertop code would pick up without modification), existing systems do have this interface and the extra code needed to get information from it is minimal.

With this patch, on a powernv system that has a power consumption sensor (e.g. an IBM S822L), powertop will display current power usage.

Signed-off-by Stewart Smith <stewart(a)linux.vnet.ibm.com>
---
 src/Makefile.am                  |  2 ++
 src/measurement/measurement.cpp  | 14 +++++++++++
 src/measurement/opal-sensors.cpp | 50 ++++++++++++++++++++++++++++++++++++++++
 src/measurement/opal-sensors.h   | 41 ++++++++++++++++++++++++++++++++
 4 files changed, 107 insertions(+)
 create mode 100644 src/measurement/opal-sensors.cpp
 create mode 100644 src/measurement/opal-sensors.h
src/Makefile.am +2 -0
index 87d8469b2e01..8357bae831d3 100644
@@ -67,6 +67,8 @@ powertop_SOURCES = \
 	measurement/measurement.h \
 	measurement/sysfs.cpp \
 	measurement/sysfs.h \
+	measurement/opal-sensors.cpp \
+	measurement/opal-sensors.h \
 	parameters/learn.cpp \
 	parameters/parameters.cpp \
 	parameters/parameters.h \
src/measurement/measurement.cpp +14 -0
index efbdc1e6041a..68c41fef3163 100644
@@ -26,6 +26,7 @@
 #include "acpi.h"
 #include "extech.h"
 #include "sysfs.h"
+#include "opal-sensors.h"
 #include "../parameters/parameters.h"
 #include "../lib.h"
 
@@ -130,9 +131,22 @@ void acpi_power_meters_callback(const char *d_name)
 		power_meters.push_back(meter);
 }
 
+void sysfs_opal_sensors_callback(const char *d_name)
+{
+	class opal_sensors_power_meter *meter;
+
+	if (strncmp(d_name, "power", 5) != 0)
+		return;
+
+	meter = new(std::nothrow) class opal_sensors_power_meter(d_name);
+	if (meter)
+		power_meters.push_back(meter);
+}
+
 void detect_power_meters(void)
 {
 	process_directory("/sys/class/power_supply", sysfs_power_meters_callback);
+	process_directory("/sys/devices/platform/opal-sensor/hwmon/hwmon0", sysfs_opal_sensors_callback);
 	if (power_meters.size() == 0) {
 		process_directory("/proc/acpi/battery", acpi_power_meters_callback);
 	}
src/measurement/opal-sensors.cpp new file +50 -0

50 lines not on this page · raw message

src/measurement/opal-sensors.h new file +41 -0

41 lines not on this page · raw message

Signature · 1 line
2.1.4
#3 lore raw
In reply to Stewart Smith

Thank you for sending your patch. Your patch has been added to the github repository.

Regards,
Nivedita

-----Original Message-----
From: PowerTop [mailto:powertop-bounces(a)lists.01.org] On Behalf Of Stewart Smith
Sent: Thursday, November 26, 2015 4:07 PM
To: powertop(a)lists.01.org
Cc: svaidy(a)linux.vnet.ibm.com
Subject: [Powertop] [PATCH 0/2] powerpc powernv platform support

Hi!

These two patches get powertop to work on current powernv machines.

These are POWER8 based systems from IBM (and others) running OPAL firmware.

The first patch correctly parses /proc/cpuinfo so information about processors and pstates is displayed (at all).

The second uses the existing userspace interface for getting power consumption.

Stewart Smith (2):
cpu: support powerpc /proc/cpuinfo
Add support for power consumption sensors through opal-sensors sysfs

 src/Makefile.am                  |  2 ++
 src/cpu/cpu.cpp                  | 20 ++++++----------
 src/measurement/measurement.cpp  | 14 +++++++++++  src/measurement/opal-sensors.cpp | 50 ++++++++++++++++++++++++++++++++++++++++
 src/measurement/opal-sensors.h   | 41 ++++++++++++++++++++++++++++++++
 5 files changed, 114 insertions(+), 13 deletions(-)  create mode 100644 src/measurement/opal-sensors.cpp  create mode 100644 src/measurement/opal-sensors.h

--
2.1.4

_______________________________________________
PowerTop mailing list
PowerTop(a)lists.01.org
https://lists.01.org/mailman/listinfo/powertop