deliverable/linux.git
11 years agoThermal: spear: Remove redundant platform_set_drvdata()
Sachin Kamat [Fri, 3 May 2013 09:57:13 +0000 (09:57 +0000)] 
Thermal: spear: Remove redundant platform_set_drvdata()

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Vincenzo Frascino <vincenzo.frascino@st.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: rcar: Remove redundant platform_set_drvdata()
Sachin Kamat [Fri, 3 May 2013 09:57:12 +0000 (09:57 +0000)] 
Thermal: rcar: Remove redundant platform_set_drvdata()

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: kirkwood: Remove redundant platform_set_drvdata()
Sachin Kamat [Fri, 3 May 2013 09:57:11 +0000 (09:57 +0000)] 
Thermal: kirkwood: Remove redundant platform_set_drvdata()

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: exynos: Remove redundant platform_set_drvdata()
Sachin Kamat [Fri, 3 May 2013 09:57:10 +0000 (09:57 +0000)] 
Thermal: exynos: Remove redundant platform_set_drvdata()

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: dove_thermal: Remove redundant platform_set_drvdata()
Sachin Kamat [Fri, 3 May 2013 09:57:09 +0000 (09:57 +0000)] 
Thermal: dove_thermal: Remove redundant platform_set_drvdata()

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Andrew Lunn <andrew@lunn.ch>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: armada_thermal: Remove redundant platform_set_drvdata()
Sachin Kamat [Fri, 3 May 2013 09:57:08 +0000 (09:57 +0000)] 
Thermal: armada_thermal: Remove redundant platform_set_drvdata()

Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMerge branch 'MAINTAINERS-update' of .git into next
Zhang Rui [Sat, 27 Apr 2013 12:48:57 +0000 (20:48 +0800)] 
Merge branch 'MAINTAINERS-update' of .git into next

11 years agoMerge branch 'cpu_cooling-doc-comments-update' of .git into next
Zhang Rui [Sat, 27 Apr 2013 01:28:56 +0000 (09:28 +0800)] 
Merge branch 'cpu_cooling-doc-comments-update' of .git into next

11 years agoMerge branch 'thermal_core-doc-comments-update' of .git into next
Zhang Rui [Sat, 27 Apr 2013 01:28:51 +0000 (09:28 +0800)] 
Merge branch 'thermal_core-doc-comments-update' of .git into next

11 years agothermal: db8500_cpufreq_cooling: remove usage of IS_ERR_OR_NULL()
Eduardo Valentin [Thu, 25 Apr 2013 14:13:34 +0000 (14:13 +0000)] 
thermal: db8500_cpufreq_cooling: remove usage of IS_ERR_OR_NULL()

This patch changes the driver to avoid the usage of IS_ERR_OR_NULL()
macro. This macro can lead to dangerous results, like returning
success (0) during a failure scenario (NULL pointer handling).

The case present in this driver can be translated to a simple
check for IS_ERR(), as the cpufreq_cooling_register() returns
either a valid pointer or an ERR_PTR().

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Hongbo Zhang <hongbo.zhang@stericsson.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: devicetree-discuss@lists.ozlabs.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: thermal_core: remove usage of IS_ERR_OR_NULL
Eduardo Valentin [Thu, 25 Apr 2013 14:13:33 +0000 (14:13 +0000)] 
thermal: thermal_core: remove usage of IS_ERR_OR_NULL

This patch changes the driver to avoid the usage of IS_ERR_OR_NULL()
macro. This macro can lead to dangerous results, like returning
success (0) during a failure scenario (NULL pointer handling).

The case present in this patch has simply be translated to
normal check for NULL and if the pointer has an error code.
The later case is needed because functions like
thermal_zone_get_zone_by_name() could return an ERR_PTR().

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: improve line breaking
Eduardo Valentin [Wed, 17 Apr 2013 17:12:23 +0000 (17:12 +0000)] 
thermal: cpu_cooling: improve line breaking

To improve code readiness, change the way the lines
are broken in this file.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: alignment improvements
Eduardo Valentin [Wed, 17 Apr 2013 17:12:11 +0000 (17:12 +0000)] 
thermal: cpu_cooling: alignment improvements

Improve code readiness by changing alignments so that
they match open parenthesis, like checkpatch.pl --strict
suggests.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove checkpatch.pl warning
Eduardo Valentin [Wed, 17 Apr 2013 17:12:06 +0000 (17:12 +0000)] 
thermal: cpu_cooling: remove checkpatch.pl warning

Simple code style fix.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove trailing blank line
Eduardo Valentin [Wed, 17 Apr 2013 17:12:04 +0000 (17:12 +0000)] 
thermal: cpu_cooling: remove trailing blank line

Remove unnecessary blank line.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: align on open parenthesis
Eduardo Valentin [Wed, 17 Apr 2013 17:12:03 +0000 (17:12 +0000)] 
thermal: cpu_cooling: align on open parenthesis

Improve code readiness by remove checkpatch.pl warnings
on get_property function.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: standardize comment style
Eduardo Valentin [Wed, 17 Apr 2013 17:12:02 +0000 (17:12 +0000)] 
thermal: cpu_cooling: standardize comment style

There are at least three patterns for oneline comments in this
file. This patch changes them to one single pattern

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: standardize end of function
Eduardo Valentin [Wed, 17 Apr 2013 17:11:59 +0000 (17:11 +0000)] 
thermal: cpu_cooling: standardize end of function

Just for code readiness, this patch makes all functions
on this file to have a blank line before their returns.
Now, some functions follow this pattern, and others will
not have a blank line. So, this patch makes it a single
pattern.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove trailing white spaces
Eduardo Valentin [Wed, 17 Apr 2013 17:11:55 +0000 (17:11 +0000)] 
thermal: cpu_cooling: remove trailing white spaces

Remove unnecessary white spaces.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: update documentation for thermal_zone_device_register
Zhang Rui [Wed, 24 Apr 2013 16:59:22 +0000 (16:59 +0000)] 
Thermal: update documentation for thermal_zone_device_register

Update kernel Documentation for thermal_zone_device_register.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMerge branch 'cpu_cooling-doc-comments-update' of .git into next
Zhang Rui [Wed, 24 Apr 2013 16:57:37 +0000 (00:57 +0800)] 
Merge branch 'cpu_cooling-doc-comments-update' of .git into next

11 years agoMerge branch 'thermal_core-doc-comments-update' of .git into next
Zhang Rui [Wed, 24 Apr 2013 16:57:22 +0000 (00:57 +0800)] 
Merge branch 'thermal_core-doc-comments-update' of .git into next

11 years agothermal: update kernel-doc for thermal_zone_device_register
Eduardo Valentin [Tue, 23 Apr 2013 21:48:20 +0000 (21:48 +0000)] 
thermal: update kernel-doc for thermal_zone_device_register

This patch updates the documentation for thermal_zone_device_register
and removes the warnings generated by scripts/kernel-doc -v.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: update kernel-doc for create_trip_attrs
Eduardo Valentin [Tue, 23 Apr 2013 21:48:19 +0000 (21:48 +0000)] 
thermal: update kernel-doc for create_trip_attrs

This patch updates the documentation for create_trip_attrs
and removes the warnings generated by scripts/kernel-doc -v.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: update kernel-doc for thermal_cooling_device_register
Eduardo Valentin [Tue, 23 Apr 2013 21:48:18 +0000 (21:48 +0000)] 
thermal: update kernel-doc for thermal_cooling_device_register

This patch updates the documentation for thermal_cooling_device_register
and removes the warnings generated by scripts/kernel-doc -v.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: update kernel-doc for thermal_zone_unbind_cooling_device
Eduardo Valentin [Tue, 23 Apr 2013 21:48:17 +0000 (21:48 +0000)] 
thermal: update kernel-doc for thermal_zone_unbind_cooling_device

This patch updates the documentation for thermal_zone_unbind_cooling_device
and removes the warnings generated by scripts/kernel-doc -v.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: update kernel-doc for thermal_zone_bind_cooling_device
Eduardo Valentin [Tue, 23 Apr 2013 21:48:16 +0000 (21:48 +0000)] 
thermal: update kernel-doc for thermal_zone_bind_cooling_device

This patch updates the documentation for thermal_zone_bind_cooling_device
and removes the warnings generated by scripts/kernel-doc -v.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: use EXPORT_SYMBOL_GPL
Eduardo Valentin [Tue, 23 Apr 2013 21:48:15 +0000 (21:48 +0000)] 
thermal: use EXPORT_SYMBOL_GPL

Restrict usage of GPL modules.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: rename notify_thermal_framework to thermal_notify_framework
Eduardo Valentin [Tue, 23 Apr 2013 21:48:14 +0000 (21:48 +0000)] 
thermal: rename notify_thermal_framework to thermal_notify_framework

To follow the prefix names used by the thermal functions,
this patch renames notify_thermal_framework to thermal_notify_framework.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: update driver license
Eduardo Valentin [Tue, 23 Apr 2013 21:48:13 +0000 (21:48 +0000)] 
thermal: update driver license

As per the comment at the top of this file, this is a GPLv2 driver.
This patch updates the driver license accordingly.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: use strlcpy instead of strcpy
Eduardo Valentin [Tue, 23 Apr 2013 21:48:12 +0000 (21:48 +0000)] 
thermal: use strlcpy instead of strcpy

For memory boundaries safety, use strlcpy instead of strcpy.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove unused symbols on cpu_cooling.h
Eduardo Valentin [Wed, 17 Apr 2013 17:12:22 +0000 (17:12 +0000)] 
thermal: cpu_cooling: remove unused symbols on cpu_cooling.h

Remove defines that are not in used.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: add needed header for cpu_cooling.h
Eduardo Valentin [Wed, 24 Apr 2013 15:10:28 +0000 (23:10 +0800)] 
thermal: cpu_cooling: add needed header for cpu_cooling.h

Update header list for cpu_cooling.h. Missing definition of cpumask.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove unused symbols
Eduardo Valentin [Wed, 17 Apr 2013 17:12:19 +0000 (17:12 +0000)] 
thermal: cpu_cooling: remove unused symbols

The list is not needed so far. Thus removing it.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove not needed curl brackets
Eduardo Valentin [Wed, 17 Apr 2013 17:12:18 +0000 (17:12 +0000)] 
thermal: cpu_cooling: remove not needed curl brackets

Just for style purposes, remove extra curl brackets.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: use snprintf instead of sprintf
Eduardo Valentin [Wed, 17 Apr 2013 17:12:17 +0000 (17:12 +0000)] 
thermal: cpu_cooling: use snprintf instead of sprintf

Limit the amount of bytes written to dev_name by
secure writing with snprintf.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update kernel-doc comment for cpufreq_cooling_unregister
Eduardo Valentin [Wed, 17 Apr 2013 17:12:16 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update kernel-doc comment for cpufreq_cooling_unregister

Update comments for this exported function.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update kernel-doc for cpufreq_cooling_register
Eduardo Valentin [Wed, 17 Apr 2013 17:12:15 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update kernel-doc for cpufreq_cooling_register

Add proper documentation for exported function cpufreq_cooling_register.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update documentation for cpufreq_set_cur_state
Eduardo Valentin [Wed, 17 Apr 2013 17:12:14 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update documentation for cpufreq_set_cur_state

Update documentation for cpufreq_set_cur_state callback.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update documentation for cpufreq_get_cur_state
Eduardo Valentin [Wed, 17 Apr 2013 17:12:13 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update documentation for cpufreq_get_cur_state

Update documentation for cpufreq_get_cur_state callback.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update documentation for cpufreq_get_max_state
Eduardo Valentin [Wed, 17 Apr 2013 17:12:12 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update documentation for cpufreq_get_max_state

Update documentation for cpufreq_get_max_state callback.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update Kconfig entry
Eduardo Valentin [Wed, 17 Apr 2013 17:12:10 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update Kconfig entry

There is no support for hotplug or any other means of reducing
temperature. So, this patch removes these references from Kconfig.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update documentation for cpufreq_thermal_notifier
Eduardo Valentin [Wed, 17 Apr 2013 17:12:09 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update documentation for cpufreq_thermal_notifier

Update kernel-doc comment and documentation for cpufreq_thermal_notifier.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: update documentation for cpufreq_apply_cooling
Eduardo Valentin [Wed, 17 Apr 2013 17:12:08 +0000 (17:12 +0000)] 
thermal: cpu_cooling: update documentation for cpufreq_apply_cooling

Update kernel-doc comments for cpufreq_apply_cooling function.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: improve documentation for get_cpu_frequency
Eduardo Valentin [Wed, 17 Apr 2013 17:12:07 +0000 (17:12 +0000)] 
thermal: cpu_cooling: improve documentation for get_cpu_frequency

Fix kernel-doc warning on get_cpu_frequency and improve
documentation comments.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: document cpufreq_get_cooling_level
Eduardo Valentin [Wed, 17 Apr 2013 17:12:05 +0000 (17:12 +0000)] 
thermal: cpu_cooling: document cpufreq_get_cooling_level

Add documentation for cpufreq_get_cooling_level. As this
is an exported function, it has to be documented.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: add documentation for get_property
Eduardo Valentin [Wed, 17 Apr 2013 17:12:01 +0000 (17:12 +0000)] 
thermal: cpu_cooling: add documentation for get_property

As this is one of the central functions of this file,
it deserves a proper documentation. This patch improves
the existing comment to format it as a kernel-doc style.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: fix kernel doc for is_cpufreq_valid
Eduardo Valentin [Wed, 17 Apr 2013 17:12:00 +0000 (17:12 +0000)] 
thermal: cpu_cooling: fix kernel doc for is_cpufreq_valid

Update documentation for is_cpufreq_valid function so
that kernel-doc does not complain about return value.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove compiler warning
Eduardo Valentin [Wed, 17 Apr 2013 17:11:58 +0000 (17:11 +0000)] 
thermal: cpu_cooling: remove compiler warning

level will be used only if GET_FREQ mode is requested.
There is no potential harm with current code. But for
cleaning the compilation log, this patch initializes
level to zero.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: use EXPORT_SYMBOL_GPL
Eduardo Valentin [Wed, 17 Apr 2013 17:11:57 +0000 (17:11 +0000)] 
thermal: cpu_cooling: use EXPORT_SYMBOL_GPL

Restrict the usage to GPL modules.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: fix kernel_doc for cpufreq_cooling_device
Eduardo Valentin [Wed, 17 Apr 2013 17:11:56 +0000 (17:11 +0000)] 
thermal: cpu_cooling: fix kernel_doc for cpufreq_cooling_device

Simple fixes for making kernel_doc happy about
struct cpufreq_cooling_device. Includes also a minor
spelling fix.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: cpu_cooling: remove unused headers
Eduardo Valentin [Wed, 17 Apr 2013 17:11:54 +0000 (17:11 +0000)] 
thermal: cpu_cooling: remove unused headers

Remove some unused header files.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMerge branch 'exynos-fix' of .git into next
Zhang Rui [Wed, 24 Apr 2013 16:04:06 +0000 (00:04 +0800)] 
Merge branch 'exynos-fix' of .git into next

11 years agoThermal: exynos: Add compatible string for exynos4412
Sachin Kamat [Thu, 18 Apr 2013 11:37:59 +0000 (11:37 +0000)] 
Thermal: exynos: Add compatible string for exynos4412

Added compatible string for Exynos4412 SoC.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Amit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: exynos: Add clk_{un}prepare APIs
Sachin Kamat [Thu, 18 Apr 2013 11:37:58 +0000 (11:37 +0000)] 
Thermal: exynos: Add clk_{un}prepare APIs

clk_{un}prepare APIs are required to migrate to common
clock framework. While at it convert to use devm_clk_get as
it removes some cleanup code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Amit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMAINTAINERS: update thermal entry by adding file cpu_cooling.h
Eduardo Valentin [Wed, 17 Apr 2013 17:12:21 +0000 (17:12 +0000)] 
MAINTAINERS: update thermal entry by adding file cpu_cooling.h

Add cpu_cooling.h to thermal entry in MAINTAINERS.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMAINTAINERS: Add patchwork entry for Thermal subsystem
Eduardo Valentin [Wed, 10 Apr 2013 14:44:09 +0000 (14:44 +0000)] 
MAINTAINERS: Add patchwork entry for Thermal subsystem

Update the Thermal subsystem MAINTAINERS entry by adding
its patchwork link.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMAINTAINERS: Add Thermal subsystem co-maintainer
Eduardo Valentin [Wed, 10 Apr 2013 14:44:08 +0000 (14:44 +0000)] 
MAINTAINERS: Add Thermal subsystem co-maintainer

Adding myself as co-maintainer for the thermal subsystem.

The agreed work split will be so that as a co-maintainer
I will be taking care of platform thermal drivers, non-ACPI
thermal drivers and making sure the thermal framework core
code will continue to suffice the non-ACPI thermal needs.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMerge branch 'eduardo-1' of .git into next
Zhang Rui [Wed, 24 Apr 2013 13:43:00 +0000 (21:43 +0800)] 
Merge branch 'eduardo-1' of .git into next

11 years agoThermal: cpufreq cooling: endian bug in cpufreq_get_max_state()
Dan Carpenter [Wed, 17 Apr 2013 07:18:28 +0000 (07:18 +0000)] 
Thermal: cpufreq cooling: endian bug in cpufreq_get_max_state()

This code doesn't work on big endian systems because we're storing low
values in the high bits of the unsigned long.  It makes it a very high
value instead.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: expose thermal_zone_get_temp API
Eduardo Valentin [Fri, 5 Apr 2013 12:32:29 +0000 (12:32 +0000)] 
thermal: expose thermal_zone_get_temp API

This patch exports the thermal_zone_get_temp API so that driver
writers can fetch temperature of thermal zones managed by other
drivers.

Acked-by: Durgadoss R <durgadoss.r@intel.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: introduce thermal_zone_get_zone_by_name helper function
Eduardo Valentin [Fri, 5 Apr 2013 12:32:28 +0000 (12:32 +0000)] 
thermal: introduce thermal_zone_get_zone_by_name helper function

This patch adds a helper function to get a reference of
a thermal zone, based on the zone type name.

It will perform a zone name lookup and return a reference
to a thermal zone device that matches the name requested.
In case the zone is not found or when several zones match
same name or if the required parameters are invalid, it will return
the corresponding error code (ERR_PTR).

Cc: Durgadoss R <durgadoss.r@intel.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Durgadoss R <durgadoss.r@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoMerge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux...
Zhang Rui [Mon, 15 Apr 2013 01:26:58 +0000 (09:26 +0800)] 
Merge branch 'thermal' of git://git./linux/kernel/git/rzhang/linux into next

Conflicts:
drivers/thermal/cpu_cooling.c

11 years agoThermal: build cpu_cooling code into thermal_sys module
Zhang Rui [Tue, 26 Mar 2013 15:57:01 +0000 (23:57 +0800)] 
Thermal: build cpu_cooling code into thermal_sys module

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Durgadoss R <durgadoss.r@intel.com>
11 years agoThermal: build thermal governors into thermal_sys module
Zhang Rui [Tue, 26 Mar 2013 08:38:29 +0000 (16:38 +0800)] 
Thermal: build thermal governors into thermal_sys module

The thermal governors are part of the thermal framework,
rather than a seperate feature/module.
Because the generic thermal layer can not work without
thermal governors, and it must load the thermal governors
during its initialization.

Build them into one module in this patch.

This also fix a problem that the generic thermal layer does not
work when CONFIG_THERMAL=m and CONFIG_THERMAL_GOV_XXX=y.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Durgadoss R <durgadoss.r@intel.com>
11 years agoThermal: rename thermal_sys.c to thermal_core.c
Zhang Rui [Tue, 26 Mar 2013 06:59:18 +0000 (14:59 +0800)] 
Thermal: rename thermal_sys.c to thermal_core.c

this is the preparation work to build all the thermal core framework
source file, like governors, cpu cooling, etc, into one module.

No functional change in this patch.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Acked-by: Durgadoss R <durgadoss.r@intel.com>
11 years agoThermal: exynos: remove unnecessary header inclusions
Arnd Bergmann [Thu, 11 Apr 2013 00:04:56 +0000 (00:04 +0000)] 
Thermal: exynos: remove unnecessary header inclusions

In multiplatform configurations, we cannot include headers
provided by only the exynos platform. Fortunately a number
of drivers that include those headers do not actually need
them, so we can just remove the inclusions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-pm@vger.kernel.org
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: step_wise: set throttle target within thermal instance limits
Andrew Bresticker [Tue, 9 Apr 2013 21:59:47 +0000 (21:59 +0000)] 
thermal: step_wise: set throttle target within thermal instance limits

When selecting a target cooling state in get_target_state(), make sure
that the state is at least as high as the minimum when the temperature
is rising and at least as low as the maximum when the temperature is
falling.  This is necessary because, in the THREAML_TREND_RAISING and
THERMAL_TREND_DROPPING cases, the current state may only be incremented
or decremented by one even if it is outside the bounds of the thermal
instance.  This might occur, for example, if the CPU is heating up
and hits a thermal trip point for the first time when it's frequency
is much higher than the range specified by the thermal instance
corresponding to the trip point.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: add a warning for temperature emulation feature
Eduardo Valentin [Tue, 26 Mar 2013 21:38:34 +0000 (21:38 +0000)] 
thermal: add a warning for temperature emulation feature

Because this feature is for debuging purposes, it is highly
recommended to do not enable this on production systems.
This patch adds warnings for system integrators, so that
people are aware of this potential security issue.

Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: exynos: Adapt to temperature emulation core thermal framework
Amit Daniel Kachhap [Mon, 11 Feb 2013 03:54:23 +0000 (03:54 +0000)] 
thermal: exynos: Adapt to temperature emulation core thermal framework

This removes the driver specific sysfs support of the temperature
emulation and uses the newly added core thermal framework for thermal
emulation. An exynos platform specific handler is added to support this.

In this patch, the exynos senor(tmu) related code and exynos framework
related (thermal zone, cooling devices) code are intentionally kept separate.
So an emulated function pointer is passed from sensor to framework. This is
beneficial in adding more sensor support using the same framework code
which is an ongoing work. The goal is to finally split them totally. Even
the existing read_temperature also follows the same execution method.

Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: rcar: add pm_runtime_xxx() support
Kuninori Morimoto [Tue, 26 Mar 2013 06:08:52 +0000 (06:08 +0000)] 
thermal: rcar: add pm_runtime_xxx() support

Current rcar_thermal() didn't care about own power.
Without this patch, rcar_thermal doesn't work on APE6 board

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: rcar: tidyup registration failure case
Kuninori Morimoto [Tue, 26 Mar 2013 06:08:10 +0000 (06:08 +0000)] 
thermal: rcar: tidyup registration failure case

Current rcar_thermal driver didn't care about rcar_theraml_irq_disable()
when registration failure case on _probe(), and _remove().
And, it returns without unregistering thermal zone when
registration failure case on _probe().
This patch fixes these issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: Add driver for Armada 370/XP SoC thermal management
Ezequiel Garcia [Tue, 2 Apr 2013 01:37:41 +0000 (01:37 +0000)] 
thermal: Add driver for Armada 370/XP SoC thermal management

This driver supports both Armada 370 and Armada XP SoC
thermal management controllers.

Armada 370 has a register to check a valid temperature, whereas
Armada XP does not. Each has a different initialization (i.e. calibration)
function. The temperature conversion formula is the same for both.

The controller present in each SoC have a very similar feature set,
so it corresponds to have one driver to support both of them.

Although this driver may present similarities to Dove and Kirkwood
thermal driver, the exact differences and coincidences are not fully
known. For this reason, support is given through a separate driver.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: dove: Fix thermal sensor formula
Ezequiel Garcia [Fri, 22 Mar 2013 12:23:03 +0000 (09:23 -0300)] 
thermal: dove: Fix thermal sensor formula

The currently formula has been taken from the 88AP510 SoC datasheet,
which is not exactly correct. The correct value for the temperature
in Celcius of the sensor present in this SoC is:

  Celsius = (322-reg)/1.3625

Signed-off-by: Lior Amsalem <alior@marvell.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: kirkwood: Fix thermal sensor formula
Ezequiel Garcia [Fri, 22 Mar 2013 12:23:02 +0000 (09:23 -0300)] 
thermal: kirkwood: Fix thermal sensor formula

The currently formula has been taken from the 88AP510 SoC datasheet,
which is not exactly correct. The correct value for the temperature
in Celcius of the sensor present in this SoC is:

  Celsius = (322-reg)/1.3625

Signed-off-by: Lior Amsalem <alior@marvell.com>
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: kirkwood: Fix valid check for thermal register
Ezequiel Garcia [Thu, 21 Mar 2013 20:42:07 +0000 (17:42 -0300)] 
thermal: kirkwood: Fix valid check for thermal register

The correct value is obtain by first shifting the register by the offset,
later applying the valid mask and finally invert the result.
This check was lacking an extra parenthesis to be strictly correct.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: Fix compiler warning
Ezequiel Garcia [Wed, 20 Mar 2013 21:38:07 +0000 (21:38 +0000)] 
thermal: Fix compiler warning

The following warning is obtained when CONFIG_NET is not defined:

In file included from drivers/thermal/mvebu_thermal.c:27:0:
include/linux/thermal.h:254:12: warning: 'thermal_generate_netlink_event'
defined but not used [-Wunused-function]

This patch fixes the warning by properly inlining
thermal_generate_netlink_event().

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: db8500: Fix missing mutex_unlock() in probe error paths
Axel Lin [Tue, 12 Mar 2013 15:43:29 +0000 (15:43 +0000)] 
thermal: db8500: Fix missing mutex_unlock() in probe error paths

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agothermal: db8500: Fix checking return value of thermal_zone_device_register
Axel Lin [Tue, 12 Mar 2013 15:42:20 +0000 (15:42 +0000)] 
thermal: db8500: Fix checking return value of thermal_zone_device_register

thermal_zone_device_register() returns ERR_PTR on error, thus use
IS_ERR rather than IS_ERR_OR_NULL to check return value.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agodrivers: thermal: cpu_cooling: fix checkpatch warning
Laurent Navet [Mali] [Tue, 12 Mar 2013 10:47:50 +0000 (10:47 +0000)] 
drivers: thermal: cpu_cooling: fix checkpatch warning

- WARNING: Avoid CamelCase: <maskPtr>

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
11 years agoThermal: exynos: fix cooling state translation
Zhang Rui [Fri, 8 Feb 2013 06:52:06 +0000 (14:52 +0800)] 
Thermal: exynos: fix cooling state translation

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Amit Daniel kachhap <amit.daniel@samsung.com>
11 years agoThermal: cpufreq cooling: fix parsing per_cpu cpufreq_frequency_table
Zhang Rui [Fri, 8 Feb 2013 05:09:32 +0000 (13:09 +0800)] 
Thermal: cpufreq cooling: fix parsing per_cpu cpufreq_frequency_table

cpufreq cooling uses different frequencies as different cooling states.

But the per_cpu cpufreq_frequency_table may contain duplicate,
invalid entries, and it may be in either ascending or descending order.
And currently, code for parsing the per_cpu cpufreq_frequency_table
is used in several places and inconsistent.

Now introduce new code to
1. get the maximum cooling states
2. translate cooling state to cpu frequency
3. translate cpu frequency to cooling state
in one place,
with the correct logic of handling per_cpu cpufreq_frequency_table.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Tested-by: Amit Daniel kachhap <amit.daniel@samsung.com>
11 years agoMerge tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Sun, 24 Mar 2013 17:11:29 +0000 (10:11 -0700)] 
Merge tag 'pinctrl-fixes-for-v3.9' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull pinctrl fixes from Linus Walleij:
 "Here are a few pinctrl fixes for the v3.9 rc series:
   - Usecount bounds checking so we do not go below zero on mux
     usecounts.
   - Loop range checking in GPIO ranges in the DT range parser.
   - Proper print in debugfs for pinconf state.
   - Fix compilation bug in generic pinconf code.
   - Minor bugfixes to abx500 and mvebu drivers."

* tag 'pinctrl-fixes-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinmux: forbid mux_usecount to be set at UINT_MAX
  pinctrl: mvebu: fix checking for SoC specific controls
  pinctrl: generic: Fix compilation error
  pinctrl: Print the correct information in debugfs pinconf-state file
  pinctrl: abx500: Fix checking if pin use AlternateFunction register
  gpio: fix wrong checking condition for gpio range

11 years agoMerge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Linus Torvalds [Sun, 24 Mar 2013 17:10:34 +0000 (10:10 -0700)] 
Merge branch 'x86/urgent' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin:
 "A collection of minor fixes, more EFI variables paranoia
  (anti-bricking) plus the ability to disable the pstore either as a
  runtime default or completely, due to bricking concerns."

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efivars: Fix check for CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE
  x86, microcode_intel_early: Mark apply_microcode_early() as cpuinit
  efivars: Handle duplicate names from get_next_variable()
  efivars: explicitly calculate length of VariableName
  efivars: Add module parameter to disable use as a pstore backend
  efivars: Allow disabling use as a pstore backend
  x86-32, microcode_intel_early: Fix crash with CONFIG_DEBUG_VIRTUAL
  x86-64: Fix the failure case in copy_user_handle_tail()

11 years agoMerge tag 'efi-for-3.9-rc4' into x86/urgent
H. Peter Anvin [Sun, 24 Mar 2013 04:49:51 +0000 (21:49 -0700)] 
Merge tag 'efi-for-3.9-rc4' into x86/urgent

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
11 years agoLinux 3.9-rc4
Linus Torvalds [Sat, 23 Mar 2013 23:52:44 +0000 (16:52 -0700)] 
Linux 3.9-rc4

11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Linus Torvalds [Sat, 23 Mar 2013 23:51:55 +0000 (16:51 -0700)] 
Merge git://git./linux/kernel/git/nab/target-pending

Pull SCSI target fixes from Nicholas Bellinger:
 "These are mostly minor fixes this time around.  The iscsi-target CHAP
  big-endian bugfix and bump FD_MAX_SECTORS=2048 default patch to allow
  1MB sized I/Os for FILEIO backends on >= v3.5 code are both CC'ed to
  stable.

  Also, there is a persistent reservations regression that has recently
  been reported for >= v3.8.x code, that is currently being tracked down
  for v3.9."

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target/pscsi: Reject cross page boundary case in pscsi_map_sg
  target/file: Bump FD_MAX_SECTORS to 2048 to handle 1M sized I/Os
  tcm_vhost: Flush vhost_work in vhost_scsi_flush()
  tcm_vhost: Add missed lock in vhost_scsi_clear_endpoint()
  target: fix possible memory leak in core_tpg_register()
  target/iscsi: Fix mutual CHAP auth on big-endian arches
  target_core_sbc: use noop for SYNCHRONIZE_CACHE

11 years agoMerge tag 'md-3.9-fixes' of git://neil.brown.name/md
Linus Torvalds [Sat, 23 Mar 2013 22:49:49 +0000 (15:49 -0700)] 
Merge tag 'md-3.9-fixes' of git://neil.brown.name/md

Pull md fixes from NeilBrown:
 "A few bugfixes for md

   - recent regressions in raid5
   - recent regressions in dmraid
   - a few instances of CONFIG_MULTICORE_RAID456 linger

  Several tagged for -stable"

* tag 'md-3.9-fixes' of git://neil.brown.name/md:
  md: remove CONFIG_MULTICORE_RAID456 entirely
  md/raid5: ensure sync and DISCARD don't happen at the same time.
  MD: Prevent sysfs operations on uninitialized kobjects
  MD RAID5: Avoid accessing gendisk or queue structs when not available
  md/raid5: schedule_construction should abort if nothing to do.

11 years agoMerge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...
Linus Torvalds [Sat, 23 Mar 2013 19:33:36 +0000 (12:33 -0700)] 
Merge tag 'upstream-linus' of git://git./linux/kernel/git/jgarzik/libata-dev

Pull libata updates from Jeff Garzik:
 "Simple stuff.  See one-line summaries."

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_samsung_cf: use module_platform_driver_probe()
  [libata] Avoid specialized TLA's in ZPODD's Kconfig
  libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
  sata_fsl: Remove redundant NULL check before kfree
  ahci: Add Device IDs for Intel Wellsburg PCH
  ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv

11 years agoMerge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
Linus Torvalds [Sat, 23 Mar 2013 19:32:14 +0000 (12:32 -0700)] 
Merge branch 'i2c/for-current' of git://git./linux/kernel/git/wsa/linux

Pull i2c fixes from Wolfram Sang:
 "One bugfix for the tegra driver.  Two updates regarding email
  addresses and MAINTAINERS which I like to have up-to-date so people
  can be reached immediately.  While we are here, there is on PCI_ID
  addition."

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: add maintainer entry for atmel i2c driver
  i2c: Fix my e-mail address in drivers and documentation
  i2c: iSMT: add Intel Avoton DeviceIDs
  i2c: tegra: check the clk_prepare_enable() return value

11 years agoMerge git://www.linux-watchdog.org/linux-watchdog
Linus Torvalds [Sat, 23 Mar 2013 19:30:39 +0000 (12:30 -0700)] 
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "Fix a boot issues and correct the AcpiMmioSel bitmask in the
  sp5100_tco watchdog device driver"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2
  watchdog: sp5100_tco: Remove code that may cause a boot failure

11 years agoKMS: fix EDID detailed timing frame rate
Torsten Duwe [Sat, 23 Mar 2013 14:39:34 +0000 (15:39 +0100)] 
KMS: fix EDID detailed timing frame rate

When KMS has parsed an EDID "detailed timing", it leaves the frame rate
zeroed.  Consecutive (debug-) output of that mode thus yields 0 for
vsync.  This simple fix also speeds up future invocations of
drm_mode_vrefresh().

While it is debatable whether this qualifies as a -stable fix I'd apply
it for consistency's sake; drm_helper_probe_single_connector_modes()
does the same thing already for all probed modes.

Cc: stable@vger.kernel.org
Signed-off-by: Torsten Duwe <duwe@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoKMS: fix EDID detailed timing vsync parsing
Torsten Duwe [Sat, 23 Mar 2013 14:38:22 +0000 (15:38 +0100)] 
KMS: fix EDID detailed timing vsync parsing

EDID spreads some values across multiple bytes; bit-fiddling is needed
to retrieve these.  The current code to parse "detailed timings" has a
cut&paste error that results in a vsync offset of at most 15 lines
instead of 63.

See

   http://en.wikipedia.org/wiki/EDID

and in the "EDID Detailed Timing Descriptor" see bytes 10+11 show why
that needs to be a left shift.

Cc: stable@vger.kernel.org
Signed-off-by: Torsten Duwe <duwe@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoMerge git://git.infradead.org/users/willy/linux-nvme
Linus Torvalds [Fri, 22 Mar 2013 23:43:53 +0000 (16:43 -0700)] 
Merge git://git.infradead.org/users/willy/linux-nvme

Pull NVMe driver update from Matthew Wilcox:
 "These patches have mostly been baking for a few months; sorry I didn't
  get them in during the merge window.  They're all bug fixes, except
  for the addition of the SMART log and the addition to MAINTAINERS."

* git://git.infradead.org/users/willy/linux-nvme:
  NVMe: Add namespaces with no LBA range feature
  MAINTAINERS: Add entry for the NVMe driver
  NVMe: Initialize iod nents to 0
  NVMe: Define SMART log
  NVMe: Add result to nvme_get_features
  NVMe: Set result from user admin command
  NVMe: End queued bio requests when freeing queue
  NVMe: Free cmdid on nvme_submit_bio error

11 years agoMerge branch 'akpm' (fixes from Andrew)
Linus Torvalds [Fri, 22 Mar 2013 23:41:44 +0000 (16:41 -0700)] 
Merge branch 'akpm' (fixes from Andrew)

Merge misc fixes from Andrew Morton.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mqueue: sys_mq_open: do not call mnt_drop_write() if read-only
  mm/hotplug: only free wait_table if it's allocated by vmalloc
  dma-debug: update DMA debug API to better handle multiple mappings of a buffer
  dma-debug: fix locking bug in check_unmap()
  drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR
  drivers/video/ep93xx-fb.c: include <linux/io.h> for devm_ioremap()
  drivers/rtc/rtc-da9052.c: fix for rtc device registration
  mm: zone_end_pfn is too small
  poweroff: change orderly_poweroff() to use schedule_work()
  mm/hugetlb: fix total hugetlbfs pages count when using memory overcommit accouting
  printk: Provide a wake_up_klogd() off-case
  irq_work.h: fix warning when CONFIG_IRQ_WORK=n

11 years agomqueue: sys_mq_open: do not call mnt_drop_write() if read-only
Vladimir Davydov [Fri, 22 Mar 2013 22:04:51 +0000 (15:04 -0700)] 
mqueue: sys_mq_open: do not call mnt_drop_write() if read-only

mnt_drop_write() must be called only if mnt_want_write() succeeded,
otherwise the mnt_writers counter will diverge.

mnt_writers counters are used to check if remounting FS as read-only is
OK, so after an extra mnt_drop_write() call, it would be impossible to
remount mqueue FS as read-only.  Besides, on umount a warning would be
printed like this one:

  =====================================
  [ BUG: bad unlock balance detected! ]
  3.9.0-rc3 #5 Not tainted
  -------------------------------------
  a.out/12486 is trying to release lock (sb_writers) at:
  mnt_drop_write+0x1f/0x30
  but there are no more locks to release!

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Doug Ledford <dledford@redhat.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agomm/hotplug: only free wait_table if it's allocated by vmalloc
Jianguo Wu [Fri, 22 Mar 2013 22:04:50 +0000 (15:04 -0700)] 
mm/hotplug: only free wait_table if it's allocated by vmalloc

zone->wait_table may be allocated from bootmem, it can not be freed.

Signed-off-by: Jianguo Wu <wujianguo@huawei.com>
Reviewed-by: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agodma-debug: update DMA debug API to better handle multiple mappings of a buffer
Alexander Duyck [Fri, 22 Mar 2013 22:04:49 +0000 (15:04 -0700)] 
dma-debug: update DMA debug API to better handle multiple mappings of a buffer

There were reports of the igb driver unmapping buffers without calling
dma_mapping_error.  On closer inspection issues were found in the DMA
debug API and how it handled multiple mappings of the same buffer.

The issue I found is the fact that the debug_dma_mapping_error would
only set the map_err_type to MAP_ERR_CHECKED in the case that the was
only one match for device and device address.  However in the case of
non-IOMMU, multiple addresses existed and as a result it was not setting
this field once a second mapping was instantiated.  I have resolved this
by changing the search so that it instead will now set MAP_ERR_CHECKED
on the first buffer that matches the device and DMA address that is
currently in the state MAP_ERR_NOT_CHECKED.

A secondary side effect of this patch is that in the case of multiple
buffers using the same address only the last mapping will have a valid
map_err_type.  The previous mappings will all end up with map_err_type
set to MAP_ERR_CHECKED because of the dma_mapping_error call in
debug_dma_map_page.  However this behavior may be preferable as it means
you will likely only see one real error per multi-mapped buffer, versus
the current behavior of multiple false errors mer multi-mapped buffer.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Reviewed-by: Shuah Khan <shuah.khan@hp.com>
Tested-by: Shuah Khan <shuah.khan@hp.com>
Cc: Jakub Kicinski <kubakici@wp.pl>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agodma-debug: fix locking bug in check_unmap()
Alexander Duyck [Fri, 22 Mar 2013 22:04:48 +0000 (15:04 -0700)] 
dma-debug: fix locking bug in check_unmap()

In check_unmap() it is possible to get into a dead-locked state if
dma_mapping_error is called.  The problem is that the bucket is locked in
check_unmap, and locked again by debug_dma_mapping_error which is called
by dma_mapping_error.  To resolve that we must release the lock on the
bucket before making the call to dma_mapping_error.

[akpm@linux-foundation.org: restore 80-col trickery to be consistent with the rest of the file]
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Reviewed-by: Shuah Khan <shuah.khan@hp.com>
Tested-by: Shuah Khan <shuah.khan@hp.com>
Cc: Jakub Kicinski <kubakici@wp.pl>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agodrivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR
Nicolas Ferre [Fri, 22 Mar 2013 22:04:47 +0000 (15:04 -0700)] 
drivers/rtc/rtc-at91rm9200.c: use a variable for storing IMR

On some revisions of AT91 SoCs, the RTC IMR register is not working.
Instead of elaborating a workaround for that specific SoC or IP version,
we simply use a software variable to store the Interrupt Mask Register
and modify it for each enabling/disabling of an interrupt.  The overhead
of this is negligible anyway.

The interrupt mask register (IMR) for the RTC is broken on the AT91SAM9x5
sub-family of SoCs (good overview of the members here:
http://www.eewiki.net/display/linuxonarm/AT91SAM9x5 ).  The "user visible
effect" is the RTC doesn't work.

That sub-family is less than two years old and only has devicetree (DT)
support and came online circa lk 3.7 .  The dust is yet to settle on the
DT stuff at least for AT91 SoCs (translation: lots of stuff is still
broken, so much that it is hard to know where to start).

The fix in the patch is pretty simple: just shadow the silicon IMR
register with a variable in the driver.  Some older SoCs (pre-DT) use the
the rtc-at91rm9200 driver (e.g.  obviously the AT91RM9200) and they should
not be impacted by the change.  There shouldn't be a large volume of
interrupts associated with a RTC.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Reported-by: Douglas Gilbert <dgilbert@interlog.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This page took 0.044967 seconds and 5 git commands to generate.