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

Commit 3f551e3c 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:

 - fix a race condition issue in power allocator governor (Yi Zeng).

 - add support for AP806 and CP110 in armada thermal driver, together
   with several improvements (Baruch Siach, Miquel Raynal)

 - add support for r8z7743 in rcar thermal driver (Biju Das)

 - convert thermal core to use new hwmon API to avoid warning (Fabio
   Estevam)

 - small fixes and cleanups in thermal core and x86_pkg_thermal,
   int3400_thermal, hisi_thermal, mtk_thermal and imx_thermal drivers
   (Pravin Shedge, Geert Uytterhoeven, Alexey Khoroshilov, Brian Bian,
   Matthias Brugger, Nicolin Chen, Uwe Kleine-König)

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (25 commits)
  thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()
  thermal/x86 pkg temp: Remove debugfs_create_u32() casts
  thermal: int3400_thermal: fix error handling in int3400_thermal_probe()
  thermal/drivers/hisi: Remove bogus const from function return type
  thermal: armada: Give meaningful names to the thermal zones
  thermal: armada: Wait sensors validity before exiting the init callback
  thermal: armada: Change sensors trim default value
  thermal: armada: Update Kconfig and module description
  thermal: armada: Add support for Armada CP110
  thermal: armada: Add support for Armada AP806
  thermal: armada: Use real status register name
  thermal: armada: Clarify control registers accesses
  thermal: armada: Simplify the check of the validity bit
  thermal: armada: Use msleep for long delays
  dt-bindings: thermal: Describe Armada AP806 and CP110
  dt-bindings: thermal: rcar: Add device tree support for r8a7743
  thermal: mtk: Cleanup unused defines
  thermal: imx: update to new formula according to NXP AN5215
  thermal: imx: use consistent style to write temperatures
  thermal: imx: improve comments describing algorithm for temp calculation
  ...
parents b46dc8ae 134f4010

Documentation/devicetree/bindings/thermal/armada-thermal.txt

+25 −12
Original line number Diff line number Diff line
@@ -3,21 +3,34 @@ 
Required properties:



- compatible: Should be set to one of the following:

		marvell,armada370-thermal

		marvell,armada375-thermal

		marvell,armada380-thermal

		marvell,armadaxp-thermal

    * marvell,armada370-thermal

    * marvell,armada375-thermal

    * marvell,armada380-thermal

    * marvell,armadaxp-thermal

    * marvell,armada-ap806-thermal

    * marvell,armada-cp110-thermal



- reg: Device's register space.

		Two entries are expected, see the examples below.

		The first one is required for the sensor register;

		the second one is required for the control register

		to be used for sensor initialization (a.k.a. calibration).

  Two entries are expected, see the examples below. The first one points

  to the status register (4B). The second one points to the control

  registers (8B).

  Note: The compatibles marvell,armada370-thermal,

  marvell,armada380-thermal, and marvell,armadaxp-thermal must point to

  "control MSB/control 1", with size of 4 (deprecated binding), or point

  to "control LSB/control 0" with size of 8 (current binding). All other

  compatibles must point to "control LSB/control 0" with size of 8.



Example:

Examples:



	/* Legacy bindings */

	thermal@d0018300 {

		compatible = "marvell,armada370-thermal";

		reg = <0xd0018300 0x4

		       0xd0018304 0x4>;

	};



	ap_thermal: thermal@6f8084 {

		compatible = "marvell,armada-ap806-thermal";

		reg = <0x6f808C 0x4>,

		      <0x6f8084 0x8>;

	};

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
			   "renesas,rcar-thermal" (without thermal-zone) as fallback.

			  Examples with soctypes are:

			    - "renesas,thermal-r8a73a4" (R-Mobile APE6)

			    - "renesas,thermal-r8a7743" (RZ/G1M)

			    - "renesas,thermal-r8a7779" (R-Car H1)

			    - "renesas,thermal-r8a7790" (R-Car H2)

			    - "renesas,thermal-r8a7791" (R-Car M2-W)

drivers/thermal/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -301,13 +301,13 @@ config DB8500_THERMAL 
	  thermal zone if trip points reached.



config ARMADA_THERMAL

	tristate "Armada 370/XP thermal management"

	tristate "Marvell EBU Armada SoCs thermal management"

	depends on ARCH_MVEBU || COMPILE_TEST

	depends on HAS_IOMEM

	depends on OF

	help

	  Enable this option if you want to have support for thermal management

	  controller present in Armada 370 and Armada XP SoC.

	  controller present in Marvell EBU Armada SoCs (370,375,XP,38x,7K,8K).



config DA9062_THERMAL

	tristate "DA9062/DA9061 Dialog Semiconductor thermal driver"

drivers/thermal/armada_thermal.c

+187 −66
Original line number Diff line number Diff line 
/*

 * Marvell Armada 370/XP thermal sensor driver

 * Marvell EBU Armada SoCs thermal sensor driver

 *

 * Copyright (C) 2013 Marvell

 *
@@ -23,8 +23,7 @@ 
#include <linux/platform_device.h>

#include <linux/of_device.h>

#include <linux/thermal.h>



#define THERMAL_VALID_MASK		0x1

#include <linux/iopoll.h>



/* Thermal Manager Control and Status Register */

#define PMU_TDC0_SW_RST_MASK		(0x1 << 1)
@@ -39,14 +38,38 @@ 
#define A375_UNIT_CONTROL_MASK		0x7

#define A375_READOUT_INVERT		BIT(15)

#define A375_HW_RESETn			BIT(8)

#define A380_HW_RESET			BIT(8)



/* Legacy bindings */

#define LEGACY_CONTROL_MEM_LEN		0x4



/* Current bindings with the 2 control registers under the same memory area */

#define LEGACY_CONTROL1_OFFSET		0x0

#define CONTROL0_OFFSET			0x0

#define CONTROL1_OFFSET			0x4



/* Errata fields */

#define CONTROL0_TSEN_TC_TRIM_MASK	0x7

#define CONTROL0_TSEN_TC_TRIM_VAL	0x3



/* TSEN refers to the temperature sensors within the AP */

#define CONTROL0_TSEN_START		BIT(0)

#define CONTROL0_TSEN_RESET		BIT(1)

#define CONTROL0_TSEN_ENABLE		BIT(2)



/* EXT_TSEN refers to the external temperature sensors, out of the AP */

#define CONTROL1_EXT_TSEN_SW_RESET	BIT(7)

#define CONTROL1_EXT_TSEN_HW_RESETn	BIT(8)



#define STATUS_POLL_PERIOD_US		1000

#define STATUS_POLL_TIMEOUT_US		100000



struct armada_thermal_data;



/* Marvell EBU Thermal Sensor Dev Structure */

struct armada_thermal_priv {

	void __iomem *sensor;

	void __iomem *control;

	void __iomem *status;

	void __iomem *control0;

	void __iomem *control1;

	struct armada_thermal_data *data;

};
@@ -59,107 +82,142 @@ struct armada_thermal_data { 
	bool (*is_valid)(struct armada_thermal_priv *);



	/* Formula coeficients: temp = (b - m * reg) / div */

	unsigned long coef_b;

	unsigned long coef_m;

	unsigned long coef_div;

	s64 coef_b;

	s64 coef_m;

	u32 coef_div;

	bool inverted;

	bool signed_sample;



	/* Register shift and mask to access the sensor temperature */

	unsigned int temp_shift;

	unsigned int temp_mask;

	unsigned int is_valid_shift;

	u32 is_valid_bit;

	bool needs_control0;

};



static void armadaxp_init_sensor(struct platform_device *pdev,

				 struct armada_thermal_priv *priv)

{

	unsigned long reg;

	u32 reg;



	reg = readl_relaxed(priv->control);

	reg = readl_relaxed(priv->control1);

	reg |= PMU_TDC0_OTF_CAL_MASK;

	writel(reg, priv->control);

	writel(reg, priv->control1);



	/* Reference calibration value */

	reg &= ~PMU_TDC0_REF_CAL_CNT_MASK;

	reg |= (0xf1 << PMU_TDC0_REF_CAL_CNT_OFFS);

	writel(reg, priv->control);

	writel(reg, priv->control1);



	/* Reset the sensor */

	reg = readl_relaxed(priv->control);

	writel((reg | PMU_TDC0_SW_RST_MASK), priv->control);

	reg = readl_relaxed(priv->control1);

	writel((reg | PMU_TDC0_SW_RST_MASK), priv->control1);



	writel(reg, priv->control);

	writel(reg, priv->control1);



	/* Enable the sensor */

	reg = readl_relaxed(priv->sensor);

	reg = readl_relaxed(priv->status);

	reg &= ~PMU_TM_DISABLE_MASK;

	writel(reg, priv->sensor);

	writel(reg, priv->status);

}



static void armada370_init_sensor(struct platform_device *pdev,

				  struct armada_thermal_priv *priv)

{

	unsigned long reg;

	u32 reg;



	reg = readl_relaxed(priv->control);

	reg = readl_relaxed(priv->control1);

	reg |= PMU_TDC0_OTF_CAL_MASK;

	writel(reg, priv->control);

	writel(reg, priv->control1);



	/* Reference calibration value */

	reg &= ~PMU_TDC0_REF_CAL_CNT_MASK;

	reg |= (0xf1 << PMU_TDC0_REF_CAL_CNT_OFFS);

	writel(reg, priv->control);

	writel(reg, priv->control1);



	reg &= ~PMU_TDC0_START_CAL_MASK;

	writel(reg, priv->control);

	writel(reg, priv->control1);



	mdelay(10);

	msleep(10);

}



static void armada375_init_sensor(struct platform_device *pdev,

				  struct armada_thermal_priv *priv)

{

	unsigned long reg;

	u32 reg;



	reg = readl(priv->control + 4);

	reg = readl(priv->control1);

	reg &= ~(A375_UNIT_CONTROL_MASK << A375_UNIT_CONTROL_SHIFT);

	reg &= ~A375_READOUT_INVERT;

	reg &= ~A375_HW_RESETn;



	writel(reg, priv->control + 4);

	mdelay(20);

	writel(reg, priv->control1);

	msleep(20);



	reg |= A375_HW_RESETn;

	writel(reg, priv->control + 4);

	mdelay(50);

	writel(reg, priv->control1);

	msleep(50);

}



static void armada_wait_sensor_validity(struct armada_thermal_priv *priv)

{

	u32 reg;



	readl_relaxed_poll_timeout(priv->status, reg,

				   reg & priv->data->is_valid_bit,

				   STATUS_POLL_PERIOD_US,

				   STATUS_POLL_TIMEOUT_US);

}



static void armada380_init_sensor(struct platform_device *pdev,

				  struct armada_thermal_priv *priv)

{

	unsigned long reg = readl_relaxed(priv->control);

	u32 reg = readl_relaxed(priv->control1);



	/* Disable the HW/SW reset */

	reg |= CONTROL1_EXT_TSEN_HW_RESETn;

	reg &= ~CONTROL1_EXT_TSEN_SW_RESET;

	writel(reg, priv->control1);



	/* Set Tsen Tc Trim to correct default value (errata #132698) */

	if (priv->control0) {

		reg = readl_relaxed(priv->control0);

		reg &= ~CONTROL0_TSEN_TC_TRIM_MASK;

		reg |= CONTROL0_TSEN_TC_TRIM_VAL;

		writel(reg, priv->control0);

	}



	/* Reset hardware once */

	if (!(reg & A380_HW_RESET)) {

		reg |= A380_HW_RESET;

		writel(reg, priv->control);

		mdelay(10);

	/* Wait the sensors to be valid or the core will warn the user */

	armada_wait_sensor_validity(priv);

}



static void armada_ap806_init_sensor(struct platform_device *pdev,

				     struct armada_thermal_priv *priv)

{

	u32 reg;



	reg = readl_relaxed(priv->control0);

	reg &= ~CONTROL0_TSEN_RESET;

	reg |= CONTROL0_TSEN_START | CONTROL0_TSEN_ENABLE;

	writel(reg, priv->control0);



	/* Wait the sensors to be valid or the core will warn the user */

	armada_wait_sensor_validity(priv);

}



static bool armada_is_valid(struct armada_thermal_priv *priv)

{

	unsigned long reg = readl_relaxed(priv->sensor);

	u32 reg = readl_relaxed(priv->status);



	return (reg >> priv->data->is_valid_shift) & THERMAL_VALID_MASK;

	return reg & priv->data->is_valid_bit;

}



static int armada_get_temp(struct thermal_zone_device *thermal,

			   int *temp)

{

	struct armada_thermal_priv *priv = thermal->devdata;

	unsigned long reg;

	unsigned long m, b, div;

	u32 reg, div;

	s64 sample, b, m;



	/* Valid check */

	if (priv->data->is_valid && !priv->data->is_valid(priv)) {
@@ -168,8 +226,13 @@ static int armada_get_temp(struct thermal_zone_device *thermal, 
		return -EIO;

	}



	reg = readl_relaxed(priv->sensor);

	reg = readl_relaxed(priv->status);

	reg = (reg >> priv->data->temp_shift) & priv->data->temp_mask;

	if (priv->data->signed_sample)

		/* The most significant bit is the sign bit */

		sample = sign_extend32(reg, fls(priv->data->temp_mask) - 1);

	else

		sample = reg;



	/* Get formula coeficients */

	b = priv->data->coef_b;
@@ -177,9 +240,10 @@ static int armada_get_temp(struct thermal_zone_device *thermal, 
	div = priv->data->coef_div;



	if (priv->data->inverted)

		*temp = ((m * reg) - b) / div;

		*temp = div_s64((m * sample) - b, div);

	else

		*temp = (b - (m * reg)) / div;

		*temp = div_s64(b - (m * sample), div);



	return 0;

}
@@ -191,43 +255,71 @@ static const struct armada_thermal_data armadaxp_data = { 
	.init_sensor = armadaxp_init_sensor,

	.temp_shift = 10,

	.temp_mask = 0x1ff,

	.coef_b = 3153000000UL,

	.coef_m = 10000000UL,

	.coef_b = 3153000000ULL,

	.coef_m = 10000000ULL,

	.coef_div = 13825,

};



static const struct armada_thermal_data armada370_data = {

	.is_valid = armada_is_valid,

	.init_sensor = armada370_init_sensor,

	.is_valid_shift = 9,

	.is_valid_bit = BIT(9),

	.temp_shift = 10,

	.temp_mask = 0x1ff,

	.coef_b = 3153000000UL,

	.coef_m = 10000000UL,

	.coef_b = 3153000000ULL,

	.coef_m = 10000000ULL,

	.coef_div = 13825,

};



static const struct armada_thermal_data armada375_data = {

	.is_valid = armada_is_valid,

	.init_sensor = armada375_init_sensor,

	.is_valid_shift = 10,

	.is_valid_bit = BIT(10),

	.temp_shift = 0,

	.temp_mask = 0x1ff,

	.coef_b = 3171900000UL,

	.coef_m = 10000000UL,

	.coef_b = 3171900000ULL,

	.coef_m = 10000000ULL,

	.coef_div = 13616,

	.needs_control0 = true,

};



static const struct armada_thermal_data armada380_data = {

	.is_valid = armada_is_valid,

	.init_sensor = armada380_init_sensor,

	.is_valid_shift = 10,

	.is_valid_bit = BIT(10),

	.temp_shift = 0,

	.temp_mask = 0x3ff,

	.coef_b = 1172499100ULL,

	.coef_m = 2000096ULL,

	.coef_div = 4201,

	.inverted = true,

};



static const struct armada_thermal_data armada_ap806_data = {

	.is_valid = armada_is_valid,

	.init_sensor = armada_ap806_init_sensor,

	.is_valid_bit = BIT(16),

	.temp_shift = 0,

	.temp_mask = 0x3ff,

	.coef_b = -150000LL,

	.coef_m = 423ULL,

	.coef_div = 1,

	.inverted = true,

	.signed_sample = true,

	.needs_control0 = true,

};



static const struct armada_thermal_data armada_cp110_data = {

	.is_valid = armada_is_valid,

	.init_sensor = armada380_init_sensor,

	.is_valid_bit = BIT(10),

	.temp_shift = 0,

	.temp_mask = 0x3ff,

	.coef_b = 1172499100UL,

	.coef_m = 2000096UL,

	.coef_b = 1172499100ULL,

	.coef_m = 2000096ULL,

	.coef_div = 4201,

	.inverted = true,

	.needs_control0 = true,

};



static const struct of_device_id armada_thermal_id_table[] = {
@@ -247,6 +339,14 @@ static const struct of_device_id armada_thermal_id_table[] = { 
		.compatible = "marvell,armada380-thermal",

		.data       = &armada380_data,

	},

	{

		.compatible = "marvell,armada-ap806-thermal",

		.data       = &armada_ap806_data,

	},

	{

		.compatible = "marvell,armada-cp110-thermal",

		.data       = &armada_cp110_data,

	},

	{

		/* sentinel */

	},
@@ -255,6 +355,7 @@ MODULE_DEVICE_TABLE(of, armada_thermal_id_table); 


static int armada_thermal_probe(struct platform_device *pdev)

{

	void __iomem *control = NULL;

	struct thermal_zone_device *thermal;

	const struct of_device_id *match;

	struct armada_thermal_priv *priv;
@@ -269,20 +370,40 @@ static int armada_thermal_probe(struct platform_device *pdev) 
		return -ENOMEM;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->sensor = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->sensor))

		return PTR_ERR(priv->sensor);

	priv->status = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->status))

		return PTR_ERR(priv->status);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	priv->control = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->control))

		return PTR_ERR(priv->control);

	control = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(control))

		return PTR_ERR(control);



	priv->data = (struct armada_thermal_data *)match->data;



	/*

	 * Legacy DT bindings only described "control1" register (also referred

	 * as "control MSB" on old documentation). New bindings cover

	 * "control0/control LSB" and "control1/control MSB" registers within

	 * the same resource, which is then of size 8 instead of 4.

	 */

	if (resource_size(res) == LEGACY_CONTROL_MEM_LEN) {

		/* ->control0 unavailable in this configuration */

		if (priv->data->needs_control0) {

			dev_err(&pdev->dev, "No access to control0 register\n");

			return -EINVAL;

		}



		priv->control1 = control + LEGACY_CONTROL1_OFFSET;

	} else {

		priv->control0 = control + CONTROL0_OFFSET;

		priv->control1 = control + CONTROL1_OFFSET;

	}



	priv->data->init_sensor(pdev, priv);



	thermal = thermal_zone_device_register("armada_thermal", 0, 0,

					       priv, &ops, NULL, 0, 0);

	thermal = thermal_zone_device_register(dev_name(&pdev->dev), 0, 0, priv,

					       &ops, NULL, 0, 0);

	if (IS_ERR(thermal)) {

		dev_err(&pdev->dev,

			"Failed to register thermal zone device\n");
@@ -316,5 +437,5 @@ static struct platform_driver armada_thermal_driver = { 
module_platform_driver(armada_thermal_driver);



MODULE_AUTHOR("Ezequiel Garcia <ezequiel.garcia@free-electrons.com>");

MODULE_DESCRIPTION("Armada 370/XP thermal driver");

MODULE_DESCRIPTION("Marvell EBU Armada SoCs thermal driver");

MODULE_LICENSE("GPL v2");

drivers/thermal/hisi_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor, 
static int hisi_thermal_probe(struct platform_device *pdev)

{

	struct hisi_thermal_data *data;

	int const (*platform_probe)(struct hisi_thermal_data *);

	int (*platform_probe)(struct hisi_thermal_data *);

	struct device *dev = &pdev->dev;

	int ret;