Commit a02bed41 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-opp' and 'pm-tools' 

Merge OPP (operating performance points) and tooling updates for
6.11-rc1:

 - Fix missing cleanup on error in _opp_attach_genpd() (Viresh Kumar).

 - Introduce an OF helper function to inform if required-opps is used
   and drop a redundant in-parameter to _set_opp_level() (Ulf Hansson).

 - Update pm-graph to v5.12 which includes fixes and major code revamp
   for python3.12 (Todd Brandt).

 - Address several assorted issues in the cpupower utility (Roman
   Storozhenko).

* pm-opp:
  OPP: Introduce an OF helper function to inform if required-opps is used
  OPP: Drop a redundant in-parameter to _set_opp_level()
  OPP: Fix missing cleanup on error in _opp_attach_genpd()

* pm-tools:
  cpupower: fix lib default installation path
  cpupower: Disable direct build of the 'bench' subproject
  cpupower: Change the var type of the 'monitor' subcommand display mode
  cpupower: Remove absent 'v' parameter from monitor man page
  cpupower: Improve cpupower build process description
  cpupower: Add 'help' target to the main Makefile
  cpupower: Replace a dead reference link with working ones
  pm-graph: v5.12, code revamp for python3.12
  pm-graph: v5.12, fixes
parents 7fae6f8b 161bd53e b48b342d

drivers/opp/core.c

+8 −7
Original line number Diff line number Diff line
@@ -1102,8 +1102,7 @@ static int _set_required_opps(struct device *dev, struct opp_table *opp_table, 
	return 0;

}



static int _set_opp_level(struct device *dev, struct opp_table *opp_table,

			  struct dev_pm_opp *opp)

static int _set_opp_level(struct device *dev, struct dev_pm_opp *opp)

{

	unsigned int level = 0;

	int ret = 0;
@@ -1171,7 +1170,7 @@ static int _disable_opp_table(struct device *dev, struct opp_table *opp_table) 
	if (opp_table->regulators)

		regulator_disable(opp_table->regulators[0]);



	ret = _set_opp_level(dev, opp_table, NULL);

	ret = _set_opp_level(dev, NULL);

	if (ret)

		goto out;
@@ -1220,7 +1219,7 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table, 
			return ret;

		}



		ret = _set_opp_level(dev, opp_table, opp);

		ret = _set_opp_level(dev, opp);

		if (ret)

			return ret;
@@ -1267,7 +1266,7 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table, 
			return ret;

		}



		ret = _set_opp_level(dev, opp_table, opp);

		ret = _set_opp_level(dev, opp);

		if (ret)

			return ret;
@@ -2443,8 +2442,10 @@ static int _opp_attach_genpd(struct opp_table *opp_table, struct device *dev, 
		 * Cross check it again and fix if required.

		 */

		gdev = dev_to_genpd_dev(virt_dev);

		if (IS_ERR(gdev))

			return PTR_ERR(gdev);

		if (IS_ERR(gdev)) {

			ret = PTR_ERR(gdev);

			goto err;

		}



		genpd_table = _find_opp_table(gdev);

		if (!IS_ERR(genpd_table)) {

drivers/opp/of.c

+32 −0
Original line number Diff line number Diff line
@@ -1443,6 +1443,38 @@ int of_get_required_opp_performance_state(struct device_node *np, int index) 
}

EXPORT_SYMBOL_GPL(of_get_required_opp_performance_state);



/**

 * dev_pm_opp_of_has_required_opp - Find out if a required-opps exists.

 * @dev: The device to investigate.

 *

 * Returns true if the device's node has a "operating-points-v2" property and if

 * the corresponding node for the opp-table describes opp nodes that uses the

 * "required-opps" property.

 *

 * Return: True if a required-opps is present, else false.

 */

bool dev_pm_opp_of_has_required_opp(struct device *dev)

{

	struct device_node *opp_np, *np;

	int count;



	opp_np = _opp_of_get_opp_desc_node(dev->of_node, 0);

	if (!opp_np)

		return false;



	np = of_get_next_available_child(opp_np, NULL);

	of_node_put(opp_np);

	if (!np) {

		dev_warn(dev, "Empty OPP table\n");

		return false;

	}



	count = of_count_phandle_with_args(np, "required-opps", NULL);

	of_node_put(np);



	return count > 0;

}



/**

 * dev_pm_opp_get_of_node() - Gets the DT node corresponding to an opp

 * @opp:	opp for which DT node has to be returned for

include/linux/pm_opp.h

+6 −0
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpuma 
struct device_node *dev_pm_opp_of_get_opp_desc_node(struct device *dev);

struct device_node *dev_pm_opp_get_of_node(struct dev_pm_opp *opp);

int of_get_required_opp_performance_state(struct device_node *np, int index);

bool dev_pm_opp_of_has_required_opp(struct device *dev);

int dev_pm_opp_of_find_icc_paths(struct device *dev, struct opp_table *opp_table);

int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus);

int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,
@@ -552,6 +553,11 @@ static inline int of_get_required_opp_performance_state(struct device_node *np, 
	return -EOPNOTSUPP;

}



static inline bool dev_pm_opp_of_has_required_opp(struct device *dev)

{

	return false;

}



static inline int dev_pm_opp_of_find_icc_paths(struct device *dev, struct opp_table *opp_table)

{

	return -EOPNOTSUPP;

tools/power/cpupower/Makefile

+37 −10
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ LANGUAGES = de fr it cs pt ka 
bindir ?=	/usr/bin

sbindir ?=	/usr/sbin

mandir ?=	/usr/man

libdir ?=	/usr/lib

includedir ?=	/usr/include

localedir ?=	/usr/share/locale

docdir ?=       /usr/share/doc/packages/cpupower
@@ -94,15 +95,6 @@ RANLIB = $(CROSS)ranlib 
HOSTCC = gcc

MKDIR = mkdir



# 64bit library detection

include ../../scripts/Makefile.arch



ifeq ($(IS_64_BIT), 1)

libdir ?=	/usr/lib64

else

libdir ?=	/usr/lib

endif



# Now we set up the build system

#
@@ -332,4 +324,39 @@ uninstall: 
		rm -f $(DESTDIR)${localedir}/$$HLANG/LC_MESSAGES/cpupower.mo; \

	  done;



.PHONY: all utils libcpupower update-po create-gmo install-lib install-tools install-man install-gmo install uninstall clean
 
help:

	@echo  'Building targets:'

	@echo  '  all		  - Default target. Could be omitted. Put build artifacts'

	@echo  '                    to "O" cmdline option dir (default: current dir)'

	@echo  '  install	  - Install previously built project files from the output'

	@echo  '                    dir defined by "O" cmdline option (default: current dir)'

	@echo  '                    to the install dir  defined by "DESTDIR" cmdline or'

	@echo  '                    Makefile config block option (default: "")'

	@echo  '  install-lib	  - Install previously built library binary from the output'

	@echo  '                    dir defined by "O" cmdline option (default: current dir)'

	@echo  '                    and library headers from "lib/" for userspace to the install'

	@echo  '                    dir  defined by "DESTDIR" cmdline (default: "")'

	@echo  '  install-tools	  - Install previously built "cpupower" util from the output'

	@echo  '                    dir defined by "O" cmdline option (default: current dir) and'

	@echo  '                    "cpupower-completion.sh" script from the src dir to the'

	@echo  '                    install dir  defined by "DESTDIR" cmdline or Makefile'

	@echo  '                    config block option (default: "")'

	@echo  '  install-man	  - Install man pages from the "man" src subdir to the'

	@echo  '                    install dir  defined by "DESTDIR" cmdline or Makefile'

	@echo  '                    config block option (default: "")'

	@echo  '  install-gmo	  - Install previously built language files from the output'

	@echo  '                    dir defined by "O" cmdline option (default: current dir)'

	@echo  '                    to the install dir defined by "DESTDIR" cmdline or Makefile'

	@echo  '                    config block option (default: "")'

	@echo  '  install-bench	  - Install previously built "cpufreq-bench" util files from the'

	@echo  '                    output dir defined by "O" cmdline option (default: current dir)'

	@echo  '                    to the install dir  defined by "DESTDIR" cmdline or Makefile'

	@echo  '                    config block option (default: "")'

	@echo  ''

	@echo  'Cleaning targets:'

	@echo  '  clean		  - Clean build artifacts from the dir defined by "O" cmdline'

	@echo  '                    option (default: current dir)'

	@echo  '  uninstall	  - Remove previously installed files from the dir defined by "DESTDIR"'

	@echo  '                    cmdline or Makefile config block option (default: "")'



.PHONY: all utils libcpupower update-po create-gmo install-lib install-tools install-man install-gmo install uninstall clean help

tools/power/cpupower/README

+150 −10
Original line number Diff line number Diff line
@@ -22,16 +22,156 @@ interfaces [depending on configuration, see below]. 
compilation and installation

----------------------------



make

su

make install



should suffice on most systems. It builds libcpupower to put in

/usr/lib; cpupower, cpufreq-bench_plot.sh to put in /usr/bin; and

cpufreq-bench to put in /usr/sbin. If you want to set up the paths

differently and/or want to configure the package to your specific

needs, you need to open "Makefile" with an editor of your choice and

edit the block marked CONFIGURATION.

There are 2 output directories - one for the build output and another for

the installation of the build results, that is the utility, library,

man pages, etc...



default directory

-----------------



In the case of default directory, build and install process requires no

additional parameters:



build

-----



$ make



The output directory for the 'make' command is the current directory and

its subdirs in the kernel tree:

tools/power/cpupower



install

-------



$ sudo make install



'make install' command puts targets to default system dirs:



-----------------------------------------------------------------------

| Installing file        |               System dir                   |

-----------------------------------------------------------------------

| libcpupower            | /usr/lib                                   |

-----------------------------------------------------------------------

| cpupower               | /usr/bin                                   |

-----------------------------------------------------------------------

| cpufreq-bench_plot.sh  | /usr/bin                                   |

-----------------------------------------------------------------------

| man pages              | /usr/man                                   |

-----------------------------------------------------------------------



To put it in other words it makes build results available system-wide,

enabling any user to simply start using it without any additional steps



custom directory

----------------



There are 2 make's command-line variables 'O' and 'DESTDIR' that setup

appropriate dirs:

'O' - build directory

'DESTDIR' - installation directory. This variable could also be setup in

the 'CONFIGURATION' block of the "Makefile"



build

-----



$ make O=<your_custom_build_catalog>



Example:

$ make O=/home/hedin/prj/cpupower/build



install

-------



$ make O=<your_custom_build_catalog> DESTDIR=<your_custom_install_catalog>



Example:

$ make O=/home/hedin/prj/cpupower/build DESTDIR=/home/hedin/prj/cpupower \

> install



Notice that both variables 'O' and 'DESTDIR' have been provided. The reason

is that the build results are saved in the custom output dir defined by 'O'

variable. So, this dir is the source for the installation step. If only

'DESTDIR' were provided then the 'install' target would assume that the

build directory is the current one, build everything there and install

from the current dir.



The files will be installed to the following dirs:



-----------------------------------------------------------------------

| Installing file        |               System dir                   |

-----------------------------------------------------------------------

| libcpupower            | ${DESTDIR}/usr/lib                         |

-----------------------------------------------------------------------

| cpupower               | ${DESTDIR}/usr/bin                         |

-----------------------------------------------------------------------

| cpufreq-bench_plot.sh  | ${DESTDIR}/usr/bin                         |

-----------------------------------------------------------------------

| man pages              | ${DESTDIR}/usr/man                         |

-----------------------------------------------------------------------



If you look at the table for the default 'make' output dirs you will

notice that the only difference with the non-default case is the

${DESTDIR} prefix. So, the structure of the output dirs remains the same

regardles of the root output directory.





clean and uninstall

-------------------



'clean' target is intended for cleanup the build catalog from build results

'uninstall' target is intended for removing installed files from the

installation directory



default directory

-----------------



This case is a straightforward one:

$ make clean

$ make uninstall



custom directory

----------------



Use 'O' command line variable to remove previously built files from the

build dir:

$ make O=<your_custom_build_catalog> clean



Example:

$ make O=/home/hedin/prj/cpupower/build clean



Use 'DESTDIR' command line variable to uninstall previously installed files

from the given dir:

$ make DESTDIR=<your_custom_install_catalog>



Example:

make DESTDIR=/home/hedin/prj/cpupower uninstall





running the tool

----------------



default directory

-----------------



$ sudo cpupower



custom directory

----------------



When it comes to run the utility from the custom build catalog things

become a little bit complicated as 'just run' approach doesn't work.

Assuming that the current dir is '<your_custom_install_catalog>/usr',

issuing the following command:



$ sudo ./bin/cpupower

will produce the following error output:

./bin/cpupower: error while loading shared libraries: libcpupower.so.1:

cannot open shared object file: No such file or directory



The issue is that binary cannot find the 'libcpupower' library. So, we

shall point to the lib dir:

sudo LD_LIBRARY_PATH=lib64/ ./bin/cpupower





THANKS