Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branches 'pm-avs', 'pm-clk', 'powercap' and 'pm-tools' 

* pm-avs:
  PM / AVS: rockchip-io: make io-domains a child of the GRF

* pm-clk:
  PM / clk: ensure we don't allocate a -ve size of count clks

* powercap:
  powercap/intel_rapl: Add support for Kabylake

* pm-tools:
  cpupower: fix potential memory leak
  cpupower: Add cpuidle parts into library
  cpupowerutils: bench: trivial fix of spelling mistake on "average"
  Fix cpupower manpages "NAME" section
  cpupower: bench: parse.c: fix several resource leaks
  Honour user's LDFLAGS
parents aa24781b bc19b9a8 0b26985a 6c51cc02 0b81561c

Documentation/devicetree/bindings/power/rockchip-io-domain.txt

+3 −1
Original line number Diff line number Diff line
@@ -37,8 +37,10 @@ Required properties: 
  - "rockchip,rk3368-pmu-io-voltage-domain" for rk3368 pmu-domains

  - "rockchip,rk3399-io-voltage-domain" for rk3399

  - "rockchip,rk3399-pmu-io-voltage-domain" for rk3399 pmu-domains

- rockchip,grf: phandle to the syscon managing the "general register files"



Deprecated properties:

- rockchip,grf: phandle to the syscon managing the "general register files"

    Systems should move the io-domains to a sub-node of the grf simple-mfd.



You specify supplies using the standard regulator bindings by including

a phandle the relevant regulator.  All specified supplies must be able

drivers/base/power/clock_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ int of_pm_clk_add_clks(struct device *dev) 


	count = of_count_phandle_with_args(dev->of_node, "clocks",

					   "#clock-cells");

	if (count == 0)

	if (count <= 0)

		return -ENODEV;



	clks = kcalloc(count, sizeof(*clks), GFP_KERNEL);

drivers/power/avs/rockchip-io-domain.c

+9 −1
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *match;

	struct rockchip_iodomain *iod;

	struct device *parent;

	int i, ret = 0;



	if (!np)
@@ -351,7 +352,14 @@ static int rockchip_iodomain_probe(struct platform_device *pdev) 
	match = of_match_node(rockchip_iodomain_match, np);

	iod->soc_data = (struct rockchip_iodomain_soc_data *)match->data;



	parent = pdev->dev.parent;

	if (parent && parent->of_node) {

		iod->grf = syscon_node_to_regmap(parent->of_node);

	} else {

		dev_dbg(&pdev->dev, "falling back to old binding\n");

		iod->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");

	}



	if (IS_ERR(iod->grf)) {

		dev_err(&pdev->dev, "couldn't find grf regmap\n");

		return PTR_ERR(iod->grf);

drivers/powercap/intel_rapl.c

+2 −0
Original line number Diff line number Diff line
@@ -1101,6 +1101,8 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { 
	RAPL_CPU(0X5C, rapl_defaults_core),/* Broxton */

	RAPL_CPU(0x5E, rapl_defaults_core),/* Skylake-H/S */

	RAPL_CPU(0x57, rapl_defaults_hsw_server),/* Knights Landing */

	RAPL_CPU(0x8E, rapl_defaults_core),/* Kabylake */

	RAPL_CPU(0x9E, rapl_defaults_core),/* Kabylake */

	{}

};

MODULE_DEVICE_TABLE(x86cpu, rapl_ids);

tools/power/cpupower/Makefile

+7 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ DESTDIR ?= 
# and _should_ modify the PACKAGE_BUGREPORT definition



VERSION=			$(shell ./utils/version-gen.sh)

LIB_MAJ=			0.0.0

LIB_MAJ=			0.0.1

LIB_MIN=			0



PACKAGE =			cpupower
@@ -129,7 +129,7 @@ WARNINGS += -Wshadow 
CFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \

		-DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE



UTIL_OBJS =  utils/helpers/amd.o utils/helpers/topology.o utils/helpers/msr.o \

UTIL_OBJS =  utils/helpers/amd.o utils/helpers/msr.o \

	utils/helpers/sysfs.o utils/helpers/misc.o utils/helpers/cpuid.o \

	utils/helpers/pci.o utils/helpers/bitmask.o \

	utils/idle_monitor/nhm_idle.o utils/idle_monitor/snb_idle.o \
@@ -148,9 +148,9 @@ UTIL_HEADERS = utils/helpers/helpers.h utils/idle_monitor/cpupower-monitor.h \ 
	utils/helpers/bitmask.h \

	utils/idle_monitor/idle_monitors.h utils/idle_monitor/idle_monitors.def



LIB_HEADERS = 	lib/cpufreq.h lib/sysfs.h

LIB_SRC = 	lib/cpufreq.c lib/sysfs.c

LIB_OBJS = 	lib/cpufreq.o lib/sysfs.o

LIB_HEADERS = 	lib/cpufreq.h lib/cpupower.h lib/cpuidle.h

LIB_SRC = 	lib/cpufreq.c lib/cpupower.c lib/cpuidle.c

LIB_OBJS = 	lib/cpufreq.o lib/cpupower.o lib/cpuidle.o

LIB_OBJS :=	$(addprefix $(OUTPUT),$(LIB_OBJS))



CFLAGS +=	-pipe
@@ -280,6 +280,7 @@ install-lib: 
	$(CP) $(OUTPUT)libcpupower.so* $(DESTDIR)${libdir}/

	$(INSTALL) -d $(DESTDIR)${includedir}

	$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h

	$(INSTALL_DATA) lib/cpuidle.h $(DESTDIR)${includedir}/cpuidle.h



install-tools:

	$(INSTALL) -d $(DESTDIR)${bindir}
@@ -315,6 +316,7 @@ endif 
uninstall:

	- rm -f $(DESTDIR)${libdir}/libcpupower.*

	- rm -f $(DESTDIR)${includedir}/cpufreq.h

	- rm -f $(DESTDIR)${includedir}/cpuidle.h

	- rm -f $(DESTDIR)${bindir}/utils/cpupower

	- rm -f $(DESTDIR)${mandir}/man1/cpupower.1

	- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1