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

Commit b88af994 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix two issues in the Operating Performance Points (OPP)
  framework, one cpufreq driver issue, one problem related to the tasks
  freezer and a few build-related issues in the cpupower utility.

  Specifics:

   - Fix tasks freezer deadlock in de_thread() that occurs if one of its
     sub-threads has been frozen already (Chanho Min).

   - Avoid registering a platform device by the ti-cpufreq driver on
     platforms that cannot use it (Dave Gerlach).

   - Fix a mistake in the ti-opp-supply operating performance points
     (OPP) driver that caused an incorrect reference voltage to be used
     and make it adjust the minimum voltage dynamically to avoid hangs
     or crashes in some cases (Keerthy).

   - Fix issues related to compiler flags in the cpupower utility and
     correct a linking problem in it by renaming a file with a duplicate
     name (Jiri Olsa, Konstantin Khlebnikov)"

* tag 'pm-4.20-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  exec: make de_thread() freezable
  cpufreq: ti-cpufreq: Only register platform_device when supported
  opp: ti-opp-supply: Correct the supply in _get_optimal_vdd_voltage call
  opp: ti-opp-supply: Dynamically update u_volt_min
  tools cpupower: Override CFLAGS assignments
  tools cpupower debug: Allow to use outside build flags
  tools/power/cpupower: fix compilation with STATIC=true
parents e6005d3c 1d50088c

drivers/cpufreq/ti-cpufreq.c

+21 −5
Original line number Diff line number Diff line
@@ -201,19 +201,28 @@ static const struct of_device_id ti_cpufreq_of_match[] = { 
	{},

};



static const struct of_device_id *ti_cpufreq_match_node(void)

{

	struct device_node *np;

	const struct of_device_id *match;



	np = of_find_node_by_path("/");

	match = of_match_node(ti_cpufreq_of_match, np);

	of_node_put(np);



	return match;

}



static int ti_cpufreq_probe(struct platform_device *pdev)

{

	u32 version[VERSION_COUNT];

	struct device_node *np;

	const struct of_device_id *match;

	struct opp_table *ti_opp_table;

	struct ti_cpufreq_data *opp_data;

	const char * const reg_names[] = {"vdd", "vbb"};

	int ret;



	np = of_find_node_by_path("/");

	match = of_match_node(ti_cpufreq_of_match, np);

	of_node_put(np);

	match = dev_get_platdata(&pdev->dev);

	if (!match)

		return -ENODEV;
@@ -290,7 +299,14 @@ static int ti_cpufreq_probe(struct platform_device *pdev) 


static int ti_cpufreq_init(void)

{

	platform_device_register_simple("ti-cpufreq", -1, NULL, 0);

	const struct of_device_id *match;



	/* Check to ensure we are on a compatible platform */

	match = ti_cpufreq_match_node();

	if (match)

		platform_device_register_data(NULL, "ti-cpufreq", -1, match,

					      sizeof(*match));



	return 0;

}

module_init(ti_cpufreq_init);

drivers/opp/ti-opp-supply.c

+4 −1
Original line number Diff line number Diff line
@@ -288,7 +288,10 @@ static int ti_opp_supply_set_opp(struct dev_pm_set_opp_data *data) 
	int ret;



	vdd_uv = _get_optimal_vdd_voltage(dev, &opp_data,

					  new_supply_vbb->u_volt);

					  new_supply_vdd->u_volt);



	if (new_supply_vdd->u_volt_min < vdd_uv)

		new_supply_vdd->u_volt_min = vdd_uv;



	/* Scaling up? Scale voltage before frequency */

	if (freq > old_freq) {

fs/exec.c

+3 −2
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
#include <linux/oom.h>

#include <linux/compat.h>

#include <linux/vmalloc.h>

#include <linux/freezer.h>



#include <linux/uaccess.h>

#include <asm/mmu_context.h>
@@ -1083,7 +1084,7 @@ static int de_thread(struct task_struct *tsk) 
	while (sig->notify_count) {

		__set_current_state(TASK_KILLABLE);

		spin_unlock_irq(lock);

		schedule();

		freezable_schedule();

		if (unlikely(__fatal_signal_pending(tsk)))

			goto killed;

		spin_lock_irq(lock);
@@ -1111,7 +1112,7 @@ static int de_thread(struct task_struct *tsk) 
			__set_current_state(TASK_KILLABLE);

			write_unlock_irq(&tasklist_lock);

			cgroup_threadgroup_change_end(tsk);

			schedule();

			freezable_schedule();

			if (unlikely(__fatal_signal_pending(tsk)))

				goto killed;

		}

tools/power/cpupower/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ WARNINGS += $(call cc-supports,-Wno-pointer-sign) 
WARNINGS += $(call cc-supports,-Wdeclaration-after-statement)

WARNINGS += -Wshadow



CFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \

override CFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \

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



UTIL_OBJS =  utils/helpers/amd.o utils/helpers/msr.o \
@@ -156,12 +156,12 @@ 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

override CFLAGS +=	-pipe



ifeq ($(strip $(NLS)),true)

	INSTALL_NLS += install-gmo

	COMPILE_NLS += create-gmo

	CFLAGS += -DNLS

	override CFLAGS += -DNLS

endif



ifeq ($(strip $(CPUFREQ_BENCH)),true)
@@ -175,7 +175,7 @@ ifeq ($(strip $(STATIC)),true) 
        UTIL_SRC += $(LIB_SRC)

endif



CFLAGS += $(WARNINGS)

override CFLAGS += $(WARNINGS)



ifeq ($(strip $(V)),false)

	QUIET=@
@@ -188,10 +188,10 @@ export QUIET ECHO 


# if DEBUG is enabled, then we do not strip or optimize

ifeq ($(strip $(DEBUG)),true)

	CFLAGS += -O1 -g -DDEBUG

	override CFLAGS += -O1 -g -DDEBUG

	STRIPCMD = /bin/true -Since_we_are_debugging

else

	CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer

	override CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer

	STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment

endif

tools/power/cpupower/bench/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ endif 
ifeq ($(strip $(STATIC)),true)

LIBS = -L../ -L$(OUTPUT) -lm

OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o \

       $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/sysfs.o

       $(OUTPUT)../lib/cpufreq.o $(OUTPUT)../lib/cpupower.o

else

LIBS = -L../ -L$(OUTPUT) -lm -lcpupower

OBJS = $(OUTPUT)main.o $(OUTPUT)parse.o $(OUTPUT)system.o $(OUTPUT)benchmark.o