Commit 259f7d5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control updates from Rafael Wysocki:
 "These mostly change the thermal core in a few ways allowing thermal
  drivers to be simplified, in particular in their removal and failing
  probe handling parts that are notoriously prone to errors, and
  propagate the changes to several drivers.

  Apart from that, support for a new platform is added (Intel Lunar
  Lake-M), some bugs are fixed and some code is cleaned up, as usual.

  Specifics:

   - Store zone trips table and zone operations directly in struct
     thermal_zone_device (Rafael Wysocki)

   - Fix up flex array initialization during thermal zone device
     registration (Nathan Chancellor)

   - Rework writable trip points handling in the thermal core and
     several drivers (Rafael Wysocki)

   - Thermal core code cleanups (Dan Carpenter, Flavio Suligoi)

   - Use thermal zone accessor functions in the int340x Intel thermal
     driver (Rafael Wysocki)

   - Add Lunar Lake-M PCI ID to the int340x Intel thermal driver
     (Srinivas Pandruvada)

   - Minor fixes for thermal governors (Rafael Wysocki, Di Shen)

   - Trip point handling fixes for the iwlwifi wireless driver (Rafael
     Wysocki)

   - Code cleanups (Rafael J. Wysocki, AngeloGioacchino Del Regno)"

* tag 'thermal-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (29 commits)
  thermal: core: remove unnecessary check in trip_point_hyst_store()
  thermal: intel: int340x_thermal: Use thermal zone accessor functions
  thermal: core: Remove excess empty line from a comment
  thermal: int340x: processor_thermal: Add Lunar Lake-M PCI ID
  thermal: core: Eliminate writable trip points masks
  thermal: of: Set THERMAL_TRIP_FLAG_RW_TEMP directly
  thermal: imx: Set THERMAL_TRIP_FLAG_RW_TEMP directly
  wifi: iwlwifi: mvm: Set THERMAL_TRIP_FLAG_RW_TEMP directly
  mlxsw: core_thermal: Set THERMAL_TRIP_FLAG_RW_TEMP directly
  thermal: intel: Set THERMAL_TRIP_FLAG_RW_TEMP directly
  thermal: core: Drop the .set_trip_hyst() thermal zone operation
  thermal: core: Add flags to struct thermal_trip
  thermal: core: Move initial num_trips assignment before memcpy()
  thermal: Get rid of CONFIG_THERMAL_WRITABLE_TRIPS
  thermal: intel: Adjust ops handling during thermal zone registration
  thermal: ACPI: Constify acpi_thermal_zone_ops
  thermal: core: Store zone ops in struct thermal_zone_device
  thermal: intel: Discard trip tables after zone registration
  thermal: ACPI: Discard trips table after zone registration
  thermal: core: Store zone trips table in struct thermal_zone_device
  ...
parents 94344679 dcb497ec

arch/arm/configs/imx_v6_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ CONFIG_SENSORS_IIO_HWMON=y 
CONFIG_SENSORS_PWM_FAN=y

CONFIG_SENSORS_SY7636A=y

CONFIG_THERMAL_STATISTICS=y

CONFIG_THERMAL_WRITABLE_TRIPS=y

CONFIG_CPU_THERMAL=y

CONFIG_IMX_THERMAL=y

CONFIG_WATCHDOG=y

drivers/acpi/thermal.c

+22 −39
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 


#define ACPI_THERMAL_TRIP_PASSIVE	(-1)



#define ACPI_THERMAL_MAX_NR_TRIPS	(ACPI_THERMAL_MAX_ACTIVE + 3)



/*

 * This exception is thrown out in two cases:

 * 1.An invalid trip point becomes invalid or a valid trip point becomes invalid
@@ -112,7 +114,6 @@ struct acpi_thermal { 
	unsigned long polling_frequency;

	volatile u8 zombie;

	struct acpi_thermal_trips trips;

	struct thermal_trip *trip_table;

	struct thermal_zone_device *thermal_zone;

	int kelvin_offset;	/* in millidegrees */

	struct work_struct thermal_check_work;
@@ -451,26 +452,19 @@ static bool acpi_thermal_init_trip(struct acpi_thermal *tz, int index) 
	return false;

}



static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)

static void acpi_thermal_get_trip_points(struct acpi_thermal *tz)

{

	unsigned int count = 0;

	int i;



	if (acpi_thermal_init_trip(tz, ACPI_THERMAL_TRIP_PASSIVE))

		count++;

	acpi_thermal_init_trip(tz, ACPI_THERMAL_TRIP_PASSIVE);



	for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {

		if (acpi_thermal_init_trip(tz, i))

			count++;

		else

		if (!acpi_thermal_init_trip(tz, i))

			break;



	}



	while (++i < ACPI_THERMAL_MAX_ACTIVE)

		tz->trips.active[i].trip.temp_dk = THERMAL_TEMP_INVALID;



	return count;

}



/* sys I/F for generic thermal sysfs support */
@@ -626,7 +620,7 @@ acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal, 
	return acpi_thermal_bind_unbind_cdev(thermal, cdev, false);

}



static struct thermal_zone_device_ops acpi_thermal_zone_ops = {

static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {

	.bind = acpi_thermal_bind_cooling_device,

	.unbind	= acpi_thermal_unbind_cooling_device,

	.get_temp = thermal_get_temp,
@@ -662,15 +656,16 @@ static void acpi_thermal_zone_sysfs_remove(struct acpi_thermal *tz) 
}



static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz,

					      const struct thermal_trip *trip_table,

					      unsigned int trip_count,

					      int passive_delay)

{

	int result;



	tz->thermal_zone = thermal_zone_device_register_with_trips("acpitz",

								   tz->trip_table,

								   trip_table,

								   trip_count,

								   0, tz,

								   tz,

								   &acpi_thermal_zone_ops,

								   NULL,

								   passive_delay,
@@ -823,10 +818,10 @@ static void acpi_thermal_free_thermal_zone(struct acpi_thermal *tz) 


static int acpi_thermal_add(struct acpi_device *device)

{

	struct thermal_trip trip_table[ACPI_THERMAL_MAX_NR_TRIPS] = { 0 };

	struct acpi_thermal_trip *acpi_trip;

	struct thermal_trip *trip;

	struct acpi_thermal *tz;

	unsigned int trip_count;

	int crit_temp, hot_temp;

	int passive_delay = 0;

	int result;
@@ -848,21 +843,10 @@ static int acpi_thermal_add(struct acpi_device *device) 
	acpi_thermal_aml_dependency_fix(tz);



	/* Get trip points [_CRT, _PSV, etc.] (required). */

	trip_count = acpi_thermal_get_trip_points(tz);

	acpi_thermal_get_trip_points(tz);



	crit_temp = acpi_thermal_get_critical_trip(tz);

	if (crit_temp != THERMAL_TEMP_INVALID)

		trip_count++;



	hot_temp = acpi_thermal_get_hot_trip(tz);

	if (hot_temp != THERMAL_TEMP_INVALID)

		trip_count++;



	if (!trip_count) {

		pr_warn(FW_BUG "No valid trip points!\n");

		result = -ENODEV;

		goto free_memory;

	}



	/* Get temperature [_TMP] (required). */

	result = acpi_thermal_get_temperature(tz);
@@ -881,13 +865,7 @@ static int acpi_thermal_add(struct acpi_device *device) 


	acpi_thermal_guess_offset(tz, crit_temp);



	trip = kcalloc(trip_count, sizeof(*trip), GFP_KERNEL);

	if (!trip) {

		result = -ENOMEM;

		goto free_memory;

	}



	tz->trip_table = trip;

	trip = trip_table;



	if (crit_temp != THERMAL_TEMP_INVALID) {

		trip->type = THERMAL_TRIP_CRITICAL;
@@ -923,9 +901,17 @@ static int acpi_thermal_add(struct acpi_device *device) 
		trip++;

	}



	result = acpi_thermal_register_thermal_zone(tz, trip_count, passive_delay);

	if (trip == trip_table) {

		pr_warn(FW_BUG "No valid trip points!\n");

		result = -ENODEV;

		goto free_memory;

	}



	result = acpi_thermal_register_thermal_zone(tz, trip_table,

						    trip - trip_table,

						    passive_delay);

	if (result)

		goto free_trips;

		goto free_memory;



	refcount_set(&tz->thermal_check_count, 3);

	mutex_init(&tz->thermal_check_lock);
@@ -944,8 +930,6 @@ static int acpi_thermal_add(struct acpi_device *device) 
flush_wq:

	flush_workqueue(acpi_thermal_pm_queue);

	acpi_thermal_unregister_thermal_zone(tz);

free_trips:

	kfree(tz->trip_table);

free_memory:

	acpi_thermal_free_thermal_zone(tz);
@@ -966,7 +950,6 @@ static void acpi_thermal_remove(struct acpi_device *device) 


	flush_workqueue(acpi_thermal_pm_queue);

	acpi_thermal_unregister_thermal_zone(tz);

	kfree(tz->trip_table);

	acpi_thermal_free_thermal_zone(tz);

}

drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int cxgb4_thermal_init(struct adapter *adap) 


	snprintf(ch_tz_name, sizeof(ch_tz_name), "cxgb4_%s", adap->name);

	ch_thermal->tzdev = thermal_zone_device_register_with_trips(ch_tz_name, &trip, num_trip,

								    0, adap,

								    adap,

								    &cxgb4_thermal_ops,

								    NULL, 0, 0);

	if (IS_ERR(ch_thermal->tzdev)) {

drivers/net/ethernet/mellanox/mlxsw/core_thermal.c

+6 −6
Original line number Diff line number Diff line
@@ -44,16 +44,19 @@ static const struct thermal_trip default_thermal_trips[] = { 
		.type		= THERMAL_TRIP_ACTIVE,

		.temperature	= MLXSW_THERMAL_ASIC_TEMP_NORM,

		.hysteresis	= MLXSW_THERMAL_HYSTERESIS_TEMP,

		.flags		= THERMAL_TRIP_FLAG_RW_TEMP,

	},

	{

		/* In range - 40-100% PWM */

		.type		= THERMAL_TRIP_ACTIVE,

		.temperature	= MLXSW_THERMAL_ASIC_TEMP_HIGH,

		.hysteresis	= MLXSW_THERMAL_HYSTERESIS_TEMP,

		.flags		= THERMAL_TRIP_FLAG_RW_TEMP,

	},

	{	/* Warning */

		.type		= THERMAL_TRIP_HOT,

		.temperature	= MLXSW_THERMAL_ASIC_TEMP_HOT,

		.flags		= THERMAL_TRIP_FLAG_RW_TEMP,

	},

};
@@ -62,16 +65,19 @@ static const struct thermal_trip default_thermal_module_trips[] = { 
		.type		= THERMAL_TRIP_ACTIVE,

		.temperature	= MLXSW_THERMAL_MODULE_TEMP_NORM,

		.hysteresis	= MLXSW_THERMAL_HYSTERESIS_TEMP,

		.flags		= THERMAL_TRIP_FLAG_RW_TEMP,

	},

	{

		/* In range - 40-100% PWM */

		.type		= THERMAL_TRIP_ACTIVE,

		.temperature	= MLXSW_THERMAL_MODULE_TEMP_HIGH,

		.hysteresis	= MLXSW_THERMAL_HYSTERESIS_TEMP,

		.flags		= THERMAL_TRIP_FLAG_RW_TEMP,

	},

	{	/* Warning */

		.type		= THERMAL_TRIP_HOT,

		.temperature	= MLXSW_THERMAL_MODULE_TEMP_HOT,

		.flags		= THERMAL_TRIP_FLAG_RW_TEMP,

	},

};
@@ -92,9 +98,6 @@ static const struct mlxsw_cooling_states default_cooling_states[] = { 


#define MLXSW_THERMAL_NUM_TRIPS	ARRAY_SIZE(default_thermal_trips)



/* Make sure all trips are writable */

#define MLXSW_THERMAL_TRIP_MASK	(BIT(MLXSW_THERMAL_NUM_TRIPS) - 1)



struct mlxsw_thermal;



struct mlxsw_thermal_module {
@@ -420,7 +423,6 @@ mlxsw_thermal_module_tz_init(struct mlxsw_thermal_module *module_tz) 
	module_tz->tzdev = thermal_zone_device_register_with_trips(tz_name,

							module_tz->trips,

							MLXSW_THERMAL_NUM_TRIPS,

							MLXSW_THERMAL_TRIP_MASK,

							module_tz,

							&mlxsw_thermal_module_ops,

							&mlxsw_thermal_params,
@@ -548,7 +550,6 @@ mlxsw_thermal_gearbox_tz_init(struct mlxsw_thermal_module *gearbox_tz) 
	gearbox_tz->tzdev = thermal_zone_device_register_with_trips(tz_name,

						gearbox_tz->trips,

						MLXSW_THERMAL_NUM_TRIPS,

						MLXSW_THERMAL_TRIP_MASK,

						gearbox_tz,

						&mlxsw_thermal_gearbox_ops,

						&mlxsw_thermal_params, 0,
@@ -773,7 +774,6 @@ int mlxsw_thermal_init(struct mlxsw_core *core, 
	thermal->tzdev = thermal_zone_device_register_with_trips("mlxsw",

						      thermal->trips,

						      MLXSW_THERMAL_NUM_TRIPS,

						      MLXSW_THERMAL_TRIP_MASK,

						      thermal,

						      &mlxsw_thermal_ops,

						      &mlxsw_thermal_params, 0,

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −2
Original line number Diff line number Diff line
@@ -543,12 +543,10 @@ struct iwl_mvm_tt_mgmt { 
/**

 * struct iwl_mvm_thermal_device - thermal zone related data

 * @trips: temperature thresholds for report

 * @fw_trips_index: keep indexes to original array - temp_trips

 * @tzone: thermal zone device data

*/

struct iwl_mvm_thermal_device {

	struct thermal_trip trips[IWL_MAX_DTS_TRIPS];

	u8 fw_trips_index[IWL_MAX_DTS_TRIPS];

	struct thermal_zone_device *tzone;

};