Commit 8cbd0eef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 

Pull thermal management updates from Zhang Rui:
 "There are not too many changes this time, except two new platform
  thermal drivers, ti-soc-thermal driver and x86_pkg_temp_thermal
  driver, and a couple of small fixes.

  Highlights:

   - move the ti-soc-thermal driver out of the staging tree to the
     thermal tree.

   - introduce the x86_pkg_temp_thermal driver.  This driver registers
     CPU digital temperature package level sensor as a thermal zone.

   - small fixes/cleanups including removing redundant use of
     platform_set_drvdata() and of_match_ptr for all platform thermal
     drivers"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits)
  thermal: cpu_cooling: fix stub function
  thermal: ti-soc-thermal: use standard GPIO DT bindings
  thermal: MAINTAINERS: Add git tree path for SoC specific updates
  thermal: fix x86_pkg_temp_thermal.c build and Kconfig
  Thermal: Documentation for x86 package temperature thermal driver
  Thermal: CPU Package temperature thermal
  thermal: consider emul_temperature while computing trend
  thermal: ti-soc-thermal: add DT example for DRA752 chip
  thermal: ti-soc-thermal: add dra752 chip to device table
  thermal: ti-soc-thermal: add thermal data for DRA752 chips
  thermal: ti-soc-thermal: remove usage of IS_ERR_OR_NULL
  thermal: ti-soc-thermal: freeze FSM while computing trend
  thermal: ti-soc-thermal: remove external heat while extrapolating hotspot
  thermal: ti-soc-thermal: update DT reference for OMAP5430
  x86, mcheck, therm_throt: Process package thresholds
  thermal: cpu_cooling: fix 'descend' check in get_property()
  Thermal: spear: Remove redundant use of of_match_ptr
  Thermal: kirkwood: Remove redundant use of of_match_ptr
  Thermal: dove: Remove redundant use of of_match_ptr
  Thermal: armada: Remove redundant use of of_match_ptr
  ...
parents 1466b77a e8d39240

drivers/staging/ti-soc-thermal/ti_soc_thermal.txt→Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt

+17 −4
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ Required properties: 
- interrupts : this entry should indicate which interrupt line

the talert signal is routed to;

Specific:

- ti,tshut-gpio : this entry should be used to inform which GPIO

line the tshut signal is routed to;

- gpios : this entry should be used to inform which GPIO

line the tshut signal is routed to. The informed GPIO will

be treated as an IRQ;

- regs : this entry must also be specified and it is specific

to each bandgap version, because the mapping may change from

soc to soc, apart of depending on available features.
@@ -37,7 +38,7 @@ bandgap { 
		0x4a002378 0x18>;

	compatible = "ti,omap4460-bandgap";

	interrupts = <0 126 4>; /* talert */

	ti,tshut-gpio = <86>;

	gpios = <&gpio3 22 0>; /* tshut */

};



OMAP4470:
@@ -47,7 +48,7 @@ bandgap { 
		0x4a002378 0x18>;

	compatible = "ti,omap4470-bandgap";

	interrupts = <0 126 4>; /* talert */

	ti,tshut-gpio = <86>;

	gpios = <&gpio3 22 0>; /* tshut */

};



OMAP5430:
@@ -59,3 +60,15 @@ bandgap { 
	compatible = "ti,omap5430-bandgap";

	interrupts = <0 126 4>; /* talert */

};



DRA752:

bandgap {

	reg = <0x4a0021e0 0xc

		0x4a00232c 0xc

		0x4a002380 0x2c

		0x4a0023C0 0x3c

		0x4a002564 0x8

		0x4a002574 0x50>;

	compatible = "ti,dra752-bandgap";

	interrupts = <0 126 4>; /* talert */

};

Documentation/thermal/x86_pkg_temperature_thermal

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Kernel driver: x86_pkg_temp_thermal

===================



Supported chips:

* x86: with package level thermal management

(Verify using: CPUID.06H:EAX[bit 6] =1)



Authors: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>



Reference

---

Intel® 64 and IA-32 Architectures Software Developer’s Manual (Jan, 2013):

Chapter 14.6: PACKAGE LEVEL THERMAL MANAGEMENT



Description

---------



This driver register CPU digital temperature package level sensor as a thermal

zone with maximum two user mode configurable trip points. Number of trip points

depends on the capability of the package. Once the trip point is violated,

user mode can receive notification via thermal notification mechanism and can

take any action to control temperature.





Threshold management

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

Each package will register as a thermal zone under /sys/class/thermal.

Example:

/sys/class/thermal/thermal_zone1



This contains two trip points:

- trip_point_0_temp

- trip_point_1_temp



User can set any temperature between 0 to TJ-Max temperature. Temperature units

are in milli-degree Celsius. Refer to "Documentation/thermal/sysfs-api.txt" for

thermal sys-fs details.



Any value other than 0 in these trip points, can trigger thermal notifications.

Setting 0, stops sending thermal notifications.



Thermal notifications: To get kobject-uevent notifications, set the thermal zone

policy to "user_space". For example: echo -n "user_space" > policy

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -8159,6 +8159,7 @@ M: Zhang Rui <rui.zhang@intel.com> 
M:      Eduardo Valentin <eduardo.valentin@ti.com>

L:      linux-pm@vger.kernel.org

T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git

T:      git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git

Q:      https://patchwork.kernel.org/project/linux-pm/list/

S:      Supported

F:      drivers/thermal/
@@ -8183,8 +8184,8 @@ F: drivers/platform/x86/thinkpad_acpi.c 
TI BANDGAP AND THERMAL DRIVER

M:	Eduardo Valentin <eduardo.valentin@ti.com>

L:	linux-pm@vger.kernel.org

S:	Maintained

F:	drivers/staging/omap-thermal/

S:	Supported

F:	drivers/thermal/ti-soc-thermal/



TI FLASH MEDIA INTERFACE DRIVER

M:	Alex Dubov <oakad@yahoo.com>

arch/x86/include/asm/mce.h

+7 −0
Original line number Diff line number Diff line
@@ -214,6 +214,13 @@ void mce_log_therm_throt_event(__u64 status); 
/* Interrupt Handler for core thermal thresholds */

extern int (*platform_thermal_notify)(__u64 msr_val);



/* Interrupt Handler for package thermal thresholds */

extern int (*platform_thermal_package_notify)(__u64 msr_val);



/* Callback support of rate control, return true, if

 * callback has rate control */

extern bool (*platform_thermal_package_rate_control)(void);



#ifdef CONFIG_X86_THERMAL_VECTOR

extern void mcheck_intel_therm_init(void);

#else

arch/x86/kernel/cpu/mcheck/therm_throt.c

+59 −4
Original line number Diff line number Diff line
@@ -55,12 +55,24 @@ struct thermal_state { 
	struct _thermal_state package_power_limit;

	struct _thermal_state core_thresh0;

	struct _thermal_state core_thresh1;

	struct _thermal_state pkg_thresh0;

	struct _thermal_state pkg_thresh1;

};



/* Callback to handle core threshold interrupts */

int (*platform_thermal_notify)(__u64 msr_val);

EXPORT_SYMBOL(platform_thermal_notify);



/* Callback to handle core package threshold_interrupts */

int (*platform_thermal_package_notify)(__u64 msr_val);

EXPORT_SYMBOL_GPL(platform_thermal_package_notify);



/* Callback support of rate control, return true, if

 * callback has rate control */

bool (*platform_thermal_package_rate_control)(void);

EXPORT_SYMBOL_GPL(platform_thermal_package_rate_control);





static DEFINE_PER_CPU(struct thermal_state, thermal_state);



static atomic_t therm_throt_en	= ATOMIC_INIT(0);
@@ -195,19 +207,25 @@ static int therm_throt_process(bool new_event, int event, int level) 
	return 0;

}



static int thresh_event_valid(int event)

static int thresh_event_valid(int level, int event)

{

	struct _thermal_state *state;

	unsigned int this_cpu = smp_processor_id();

	struct thermal_state *pstate = &per_cpu(thermal_state, this_cpu);

	u64 now = get_jiffies_64();



	state = (event == 0) ? &pstate->core_thresh0 : &pstate->core_thresh1;

	if (level == PACKAGE_LEVEL)

		state = (event == 0) ? &pstate->pkg_thresh0 :

						&pstate->pkg_thresh1;

	else

		state = (event == 0) ? &pstate->core_thresh0 :

						&pstate->core_thresh1;



	if (time_before64(now, state->next_check))

		return 0;



	state->next_check = now + CHECK_INTERVAL;



	return 1;

}
@@ -322,6 +340,39 @@ device_initcall(thermal_throttle_init_device); 


#endif /* CONFIG_SYSFS */



static void notify_package_thresholds(__u64 msr_val)

{

	bool notify_thres_0 = false;

	bool notify_thres_1 = false;



	if (!platform_thermal_package_notify)

		return;



	/* lower threshold check */

	if (msr_val & THERM_LOG_THRESHOLD0)

		notify_thres_0 = true;

	/* higher threshold check */

	if (msr_val & THERM_LOG_THRESHOLD1)

		notify_thres_1 = true;



	if (!notify_thres_0 && !notify_thres_1)

		return;



	if (platform_thermal_package_rate_control &&

		platform_thermal_package_rate_control()) {

		/* Rate control is implemented in callback */

		platform_thermal_package_notify(msr_val);

		return;

	}



	/* lower threshold reached */

	if (notify_thres_0 && thresh_event_valid(PACKAGE_LEVEL, 0))

		platform_thermal_package_notify(msr_val);

	/* higher threshold reached */

	if (notify_thres_1 && thresh_event_valid(PACKAGE_LEVEL, 1))

		platform_thermal_package_notify(msr_val);

}



static void notify_thresholds(__u64 msr_val)

{

	/* check whether the interrupt handler is defined;
@@ -331,10 +382,12 @@ static void notify_thresholds(__u64 msr_val) 
		return;



	/* lower threshold reached */

	if ((msr_val & THERM_LOG_THRESHOLD0) &&	thresh_event_valid(0))

	if ((msr_val & THERM_LOG_THRESHOLD0) &&

			thresh_event_valid(CORE_LEVEL, 0))

		platform_thermal_notify(msr_val);

	/* higher threshold reached */

	if ((msr_val & THERM_LOG_THRESHOLD1) && thresh_event_valid(1))

	if ((msr_val & THERM_LOG_THRESHOLD1) &&

			thresh_event_valid(CORE_LEVEL, 1))

		platform_thermal_notify(msr_val);

}
@@ -360,6 +413,8 @@ static void intel_thermal_interrupt(void) 


	if (this_cpu_has(X86_FEATURE_PTS)) {

		rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);

		/* check violations of package thermal thresholds */

		notify_package_thresholds(msr_val);

		therm_throt_process(msr_val & PACKAGE_THERM_STATUS_PROCHOT,

					THERMAL_THROTTLING_EVENT,

					PACKAGE_LEVEL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE